Eileen McNaughton [Wed, 29 Mar 2017 22:42:59 +0000 (11:42 +1300)]
Merge pull request #10071 from eileenmcnaughton/dedup_4
CRM-20357 remove unused Finder::dupesOfContact function.
Eileen McNaughton [Wed, 29 Mar 2017 21:25:22 +0000 (10:25 +1300)]
Merge pull request #9985 from JMAConsulting/CRM-19715-4
CRM-19715 (IIDA-96), Removed Close Accounting Period Activity Type
Eileen McNaughton [Wed, 29 Mar 2017 20:23:02 +0000 (09:23 +1300)]
Merge pull request #10077 from JMAConsulting/CRM-19715-5
CRM-19715, fixed api test so that its not affected by any deletion of…
Eileen McNaughton [Wed, 29 Mar 2017 20:21:58 +0000 (09:21 +1300)]
Merge pull request #10078 from colemanw/Icons
Icons for attachments
Eileen McNaughton [Wed, 29 Mar 2017 20:18:30 +0000 (09:18 +1300)]
Merge pull request #10069 from eileenmcnaughton/dedup_2
Towards CRM-20328 remove another call to the duplicate code
Eileen McNaughton [Wed, 29 Mar 2017 20:17:58 +0000 (09:17 +1300)]
Merge pull request #10070 from eileenmcnaughton/dedup_3
CRM-20328 code rationalisation on calling dedupe code
Eileen McNaughton [Wed, 29 Mar 2017 20:08:58 +0000 (09:08 +1300)]
Merge pull request #10046 from JMAConsulting/CRM-20332
CRM-20332 Added support for third column of actions list to be modifi…
Eileen McNaughton [Wed, 29 Mar 2017 19:57:41 +0000 (08:57 +1300)]
Merge pull request #8525 from twomice/CRM-18251b
CRM-18251 - Domain stats and VersionCheck
Coleman Watts [Wed, 29 Mar 2017 18:11:36 +0000 (14:11 -0400)]
Icons for attachments
colemanw [Wed, 29 Mar 2017 16:28:51 +0000 (12:28 -0400)]
Merge pull request #9729 from eileenmcnaughton/cust_date
CRM-20012, CRM-19490 (now merged & closed), CRM-18387(merged& closed), CRM-20011 (in separate pr), CRM-15948(resolved by arlready-merged-part), CRM-19911 profile date fixes & code improvement
Pradeep Nayak [Wed, 15 Mar 2017 07:07:24 +0000 (12:37 +0530)]
CRM-19715, Removed Close Accounting Period Activity Type
----------------------------------------
* CRM-19715: Remove Close Accounting Period code
https://issues.civicrm.org/jira/browse/CRM-19715
CRM-19715, updated sql to delete activity type if not present
----------------------------------------
* CRM-19715: Remove Close Accounting Period code
https://issues.civicrm.org/jira/browse/CRM-19715
CRM-19715, removed cruft
----------------------------------------
* CRM-19715: Remove Close Accounting Period code
https://issues.civicrm.org/jira/browse/CRM-19715
Pradeep Nayak [Wed, 29 Mar 2017 14:53:02 +0000 (20:23 +0530)]
CRM-19715, fixed api test so that its not affected by any deletion of activity types from core
----------------------------------------
* CRM-19715: Remove Close Accounting Period code
https://issues.civicrm.org/jira/browse/CRM-19715
Eileen McNaughton [Wed, 29 Mar 2017 10:18:03 +0000 (23:18 +1300)]
Merge pull request #10064 from eileenmcnaughton/dedup_tidy
Towards CRM-20328 remove duplicate code, towards taking extension fro…
eileen [Wed, 29 Mar 2017 07:34:24 +0000 (20:34 +1300)]
CRM-20328 further fix on deprected duplicate code.
Remove parameters only passed in in unit tests. This deprecated function is called from
only one place, so reduce parameters & testing to reflect. Remove test
that duplicates other test aside from deprecated paramter
Eileen McNaughton [Wed, 29 Mar 2017 06:58:06 +0000 (19:58 +1300)]
Merge pull request #10076 from eileenmcnaughton/master
Merge to master from 4.7.18rc
eileen [Wed, 29 Mar 2017 06:55:44 +0000 (19:55 +1300)]
Merge branch '4.7.18-rc' of https://github.com/civicrm/civicrm-core
eileen [Wed, 29 Mar 2017 06:54:25 +0000 (19:54 +1300)]
Empty merge commit to mark 4.7.18-rc merged.
Somehow we lost the merged marker with a cherry pick.
Have used merge -s ours
d46d3ea to grab these as empty-but-merged
Eileen McNaughton [Wed, 29 Mar 2017 06:46:38 +0000 (19:46 +1300)]
Merge pull request #10061 from eileenmcnaughton/fatal
CRM-20347 Fatal error on delete participant record with related contr…
Eileen McNaughton [Wed, 29 Mar 2017 06:46:07 +0000 (19:46 +1300)]
Merge from 4.7.18rc to master (#10075)
* Minor test tidy up.
(this is actually because we need a commit to do a merge to master after the same commit was merged to both).
* CRM-20342: add 'view' Api action
* CRM-19385 revert changes to order by id on prevnext_cache.
After PR #10019 was merged @bhahumanists reported on #9801 that smart group ordering was broken. The
report is lacking detail and I could not replicate it, but am reverting the search changes for safety.
After this revert sites can still experiment with dropping/altering the primary key on
-civicrm_cache
-civicrm_group_contact_cache
-civicrm_acl_cache
But not civicrm_prevnext_cache.
Although I could not replicate the search issue it seems to me that our Ubuntu test suite
is failing where the other one is not on search-related items, suggesting that
for some reason Ubuntu does not default to the natural search order, due to
some config or other difference
Eileen McNaughton [Wed, 29 Mar 2017 06:31:58 +0000 (19:31 +1300)]
Merge pull request #10073 from eileenmcnaughton/4.7.18-rc
CRM-19385 revert changes to order by id on prevnext_cache.
eileen [Wed, 29 Mar 2017 06:26:56 +0000 (19:26 +1300)]
CRM-20347 fix for fatal on view records from participant
Eileen McNaughton [Wed, 29 Mar 2017 06:03:39 +0000 (19:03 +1300)]
Merge pull request #10074 from eileenmcnaughton/master
Merge from 4.7.18rc
eileen [Wed, 29 Mar 2017 05:58:08 +0000 (18:58 +1300)]
Fix merge head on master.
Master is treating some 4.7.18-rc commits as unmerged. This just marks as merged : Merge commit '
58025217985f3c8cf'
eileen [Wed, 29 Mar 2017 05:51:24 +0000 (18:51 +1300)]
CRM-19385 revert changes to order by id on prevnext_cache.
After PR #10019 was merged @bhahumanists reported on #9801 that smart group ordering was broken. The
report is lacking detail and I could not replicate it, but am reverting the search changes for safety.
After this revert sites can still experiment with dropping/altering the primary key on
-civicrm_cache
-civicrm_group_contact_cache
-civicrm_acl_cache
But not civicrm_prevnext_cache.
Although I could not replicate the search issue it seems to me that our Ubuntu test suite
is failing where the other one is not on search-related items, suggesting that
for some reason Ubuntu does not default to the natural search order, due to
some config or other difference
eileen [Wed, 29 Mar 2017 01:57:55 +0000 (14:57 +1300)]
CRM-20357 remove unused Finder::dupesOfContact function.
I can find no evidence this function is used anywhere
eileen [Tue, 28 Mar 2017 21:01:36 +0000 (10:01 +1300)]
Towards CRM-20328 remove another call to the duplicate code
eileen [Tue, 28 Mar 2017 21:28:54 +0000 (10:28 +1300)]
CRM-20328 code rationalisation on calling dedupe code
eileen [Tue, 28 Mar 2017 20:57:02 +0000 (09:57 +1300)]
Towards CRM-20328 remove over-loading from checkRegistration function
eileen [Tue, 28 Mar 2017 20:53:01 +0000 (09:53 +1300)]
Towards CRM-20328 extract dedupe code to function
eileen [Mon, 27 Mar 2017 01:06:27 +0000 (14:06 +1300)]
Towards CRM-20328 remove duplicate code, towards taking extension from core
Eileen McNaughton [Tue, 28 Mar 2017 20:17:57 +0000 (09:17 +1300)]
Merge pull request #10067 from twomice/CRM-20350_dont_escape_quotes
CRM-20350: Don't escape double-quotes in icalendar.
Eileen McNaughton [Tue, 28 Mar 2017 20:14:12 +0000 (09:14 +1300)]
Merge pull request #9987 from JMAConsulting/CRM-20273
CRM-20273 Added credit card type field for contribution details report
Allen Shaw [Tue, 28 Mar 2017 16:51:43 +0000 (11:51 -0500)]
CRM-20350: Don't escape double-quotes in icalendar.
Edsel [Mon, 27 Mar 2017 12:34:47 +0000 (18:04 +0530)]
CRM-20332 Modified function to prevent tampering with original menu
----------------------------------------
* CRM-20332: Refactor summaryActions hook to allow user-defined actions in third column
https://issues.civicrm.org/jira/browse/CRM-20332
Edsel [Fri, 24 Mar 2017 12:57:17 +0000 (18:27 +0530)]
CRM-20332 Added support for third column of actions list to be modified by hook summaryActions
----------------------------------------
* CRM-20332: Refactor summaryActions hook to allow user-defined actions in third column
https://issues.civicrm.org/jira/browse/CRM-20332
Edsel [Wed, 15 Mar 2017 12:10:02 +0000 (17:40 +0530)]
CRM-20273 Fixed report to read from card type rather than credit card type
Edsel [Wed, 15 Mar 2017 10:35:05 +0000 (16:05 +0530)]
CRM-20273 Added credit card type field for contribution details report
----------------------------------------
* CRM-20273: Add credit card type field for Contribution Details Report
https://issues.civicrm.org/jira/browse/CRM-20273
Edsel [Fri, 10 Feb 2017 13:23:22 +0000 (18:53 +0530)]
CRM-19997 Added Credit Card Type field for Contribution Details report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
Eileen McNaughton [Tue, 28 Mar 2017 07:51:19 +0000 (20:51 +1300)]
Merge pull request #10063 from eileenmcnaughton/master
Merge to Master from 4.7.18-rc
Jitendra Purohit [Tue, 28 Mar 2017 05:35:37 +0000 (11:05 +0530)]
CRM-20342: add 'view' Api action
eileen [Mon, 13 Feb 2017 02:09:23 +0000 (15:09 +1300)]
CRM-20012 alternate fix to setting null dates
This is part of the work started in CRM-19490 to switch profile dates to use the date picker,
as a solution to multiple problems
Eileen McNaughton [Tue, 28 Mar 2017 05:38:20 +0000 (18:38 +1300)]
Merge pull request #10060 from jitendrapurohit/add-api-action
CRM-20342: add 'view' Api action
Jitendra Purohit [Tue, 28 Mar 2017 05:35:37 +0000 (11:05 +0530)]
CRM-20342: add 'view' Api action
Eileen McNaughton [Tue, 28 Mar 2017 05:11:43 +0000 (18:11 +1300)]
Merge pull request #10059 from fuzionnz/CRM-20346-remove_encryptdb
CRM-20346. Remove encryptDB.php
Chris Burgess [Tue, 28 Mar 2017 02:00:48 +0000 (15:00 +1300)]
CRM-20346. Remove encryptDB.php
Eileen McNaughton [Mon, 27 Mar 2017 20:55:38 +0000 (09:55 +1300)]
Merge pull request #10053 from eileenmcnaughton/dedup_tidy
Towards CRM-20155 remove duplicate code, towards taking extension fro…
Eileen McNaughton [Mon, 27 Mar 2017 20:38:55 +0000 (09:38 +1300)]
Merge pull request #10054 from jitendrapurohit/CRM-20311-unit-test
Add unit test to check CRM-20311
Joe Murray [Mon, 27 Mar 2017 18:24:50 +0000 (14:24 -0400)]
Merge pull request #9694 from systopia/CRM-19892
Proposed fix for CRM-19892
Jitendra Purohit [Mon, 27 Mar 2017 05:33:48 +0000 (11:03 +0530)]
Add unit test to check CRM-20311
Eileen McNaughton [Mon, 27 Mar 2017 05:45:08 +0000 (18:45 +1300)]
Merge pull request #10024 from rnao/fix-mem-cancel-activity
CRM-20311 - Membership cancelation via contribution doesn't create me…
Eileen McNaughton [Mon, 27 Mar 2017 05:22:27 +0000 (18:22 +1300)]
Merge pull request #9991 from JMAConsulting/CRM-20278
CRM-20278 Added credit card type field for top donors report
eileen [Mon, 27 Mar 2017 03:52:38 +0000 (16:52 +1300)]
Towards CRM-20155 remove duplicate code, towards taking extension from core
Eileen McNaughton [Mon, 27 Mar 2017 03:48:36 +0000 (16:48 +1300)]
Merge pull request #9989 from JMAConsulting/CRM-20275
CRM-20275 Added credit card type field for contributions by organization report
Eileen McNaughton [Mon, 27 Mar 2017 03:47:57 +0000 (16:47 +1300)]
Merge pull request #9990 from JMAConsulting/CRM-20277
CRM-20277 Added credit card type field for contributions by household report
Eileen McNaughton [Mon, 27 Mar 2017 03:46:40 +0000 (16:46 +1300)]
Merge pull request #9992 from JMAConsulting/CRM-20279
CRM-20279 Added credit card type field for SYBUNT report
Eileen McNaughton [Mon, 27 Mar 2017 03:46:09 +0000 (16:46 +1300)]
Merge pull request #9993 from JMAConsulting/CRM-20280
CRM-20280 Added credit card type field for LYBUNT report
Eileen McNaughton [Mon, 27 Mar 2017 03:45:28 +0000 (16:45 +1300)]
Merge pull request #9994 from JMAConsulting/CRM-20281
CRM-20281 Added credit card type field for Soft Credit report
Eileen McNaughton [Mon, 27 Mar 2017 03:44:40 +0000 (16:44 +1300)]
Merge pull request #9997 from JMAConsulting/CRM-20284
CRM-20284 Added credit card type field for Contribution Aggregate by Relationship Report
Eileen McNaughton [Mon, 27 Mar 2017 01:34:15 +0000 (14:34 +1300)]
Merge pull request #10048 from totten/master-gcs
(NFC) Update stale GenCode checksums
Eileen McNaughton [Mon, 27 Mar 2017 01:31:00 +0000 (14:31 +1300)]
Merge pull request #10047 from yashodha/CRM-20340
CRM-20340 - translate string
Eileen McNaughton [Sun, 26 Mar 2017 21:19:16 +0000 (10:19 +1300)]
Merge pull request #10001 from JMAConsulting/CRM-20285
CRM-20285 Added credit card type field to recurring contributions report
Eileen McNaughton [Sun, 26 Mar 2017 21:18:12 +0000 (10:18 +1300)]
Merge pull request #10003 from eileenmcnaughton/cust_date2
CRM-20011 fix loss of data for yyyy-mm custom field
Tim Otten [Fri, 24 Mar 2017 19:59:00 +0000 (12:59 -0700)]
(NFC) Update stale GenCode checksums
The checksums in `CRM/Activity/DAO/Activity.php` and `CRM/Core/DAO/AllCoreTables.data.php` are
stale (although the logic is current).
Probable explanation: there was a recent whitespace cleanup to
`xml/schema/Activity/Activity.xml` (
165a7fc03b86). This would affect the
checksum of anything derived from there -- but it wouldn't cause a
substantive change.
yashodha [Fri, 24 Mar 2017 15:13:08 +0000 (20:43 +0530)]
CRM-20340 - translate string
Yashodha Chaku [Fri, 24 Mar 2017 08:34:46 +0000 (14:04 +0530)]
Merge pull request #10025 from civicrm/JoeMurray-patch-1
CRM-20313 whitespace cleanup
Edsel [Mon, 13 Feb 2017 13:25:40 +0000 (18:55 +0530)]
CRM-20275 Added credit card type field for contributions by organization report
Edsel [Wed, 15 Feb 2017 10:33:40 +0000 (16:03 +0530)]
CRM-20277 Added credit card type field to contributions by household report
Edsel [Wed, 15 Feb 2017 10:37:48 +0000 (16:07 +0530)]
CRM-20278 Added credit card type field to top donor report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
Edsel [Wed, 15 Feb 2017 10:49:06 +0000 (16:19 +0530)]
CRM-20279 Added credit card type field to SYBUNT report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20279:
https://issues.civicrm.org/jira/browse/CRM-20279
CRM-20279 Added credit card type field for SYBUNT report
----------------------------------------
* CRM-20279: Add credit card type field for SYBUNT report
https://issues.civicrm.org/jira/browse/CRM-20279
CRM-20279 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20279: Add credit card type field for SYBUNT report
https://issues.civicrm.org/jira/browse/CRM-20279
CRM-20279 Removed line break
----------------------------------------
* CRM-20279:
https://issues.civicrm.org/jira/browse/CRM-20279
Edsel [Wed, 15 Feb 2017 10:55:39 +0000 (16:25 +0530)]
CRM-20280 Added credit card type field to LYBUNT report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20280:
https://issues.civicrm.org/jira/browse/CRM-20280
CRM-20280 Added credit card type field for LYBUNT report
----------------------------------------
* CRM-20280: Add credit card type field for LYBUNT report
https://issues.civicrm.org/jira/browse/CRM-20280
CRM-20280 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20280: Add credit card type field for LYBUNT report
https://issues.civicrm.org/jira/browse/CRM-20280
CRM-20280 Removed line break
----------------------------------------
* CRM-20280:
https://issues.civicrm.org/jira/browse/CRM-20280
Edsel [Wed, 15 Feb 2017 11:15:23 +0000 (16:45 +0530)]
CRM-20281 Added credit card type field to soft credit report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20281:
https://issues.civicrm.org/jira/browse/CRM-20281
CRM-20281 Added credit card type field for Soft Credit report
----------------------------------------
* CRM-20281: Add credit card type field for Soft Credit Report
https://issues.civicrm.org/jira/browse/CRM-20281
CRM-20281 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20281: Add credit card type field for Soft Credit Report
https://issues.civicrm.org/jira/browse/CRM-20281
CRM-20281 Removed line break
----------------------------------------
* CRM-20281:
https://issues.civicrm.org/jira/browse/CRM-20281
Edsel [Wed, 15 Feb 2017 11:29:55 +0000 (16:59 +0530)]
CRM-20284 Added credit card type field to contribute aggregate by relationship report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20284:
https://issues.civicrm.org/jira/browse/CRM-20284
CRM-20284 Added credit card type field for Contribution Aggregate by relationship report
----------------------------------------
* CRM-20284: Add credit card type field for Contribution Aggregate by Relationship report
https://issues.civicrm.org/jira/browse/CRM-20284
CRM-20284 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20284: Add credit card type field for Contribution Aggregate by Relationship report
https://issues.civicrm.org/jira/browse/CRM-20284
CRM-20284 Removed line break
----------------------------------------
* CRM-20284:
https://issues.civicrm.org/jira/browse/CRM-20284
deb.monish [Fri, 24 Mar 2017 04:48:31 +0000 (10:18 +0530)]
Qa fix
Edsel [Wed, 15 Feb 2017 11:34:47 +0000 (17:04 +0530)]
CRM-20285 Added credit card type field to recurring contributions report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20285:
https://issues.civicrm.org/jira/browse/CRM-20285
CRM-20285 Added credit card type field for recurring contributions report
----------------------------------------
* CRM-20285: Add credit card type field for Recurring Contributions report
https://issues.civicrm.org/jira/browse/CRM-20285
CRM-20285 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20285: Add credit card type field for Recurring Contributions report
https://issues.civicrm.org/jira/browse/CRM-20285
CRM-20285 Removed line break
----------------------------------------
* CRM-20285:
https://issues.civicrm.org/jira/browse/CRM-20285
Eileen McNaughton [Fri, 24 Mar 2017 01:23:51 +0000 (14:23 +1300)]
Merge pull request #10037 from JMAConsulting/CRM-20331
CRM-20331, added code to show card type and pan truncation besides pa…
Eileen McNaughton [Fri, 24 Mar 2017 01:12:11 +0000 (14:12 +1300)]
4.7.18 rc (#10045)
* CRM-20334, some times payment object is not set and is protected variable
----------------------------------------
* CRM-20334: Fatal Error on Submit Credit Card Form
https://issues.civicrm.org/jira/browse/CRM-20334
* Minor test tidy up.
(this is actually because we need a commit to do a merge to master after the same commit was merged to both).
Eileen McNaughton [Fri, 24 Mar 2017 01:08:58 +0000 (14:08 +1300)]
Merge pull request #10044 from eileenmcnaughton/4.7.18rc
Minor test tidy up.
eileen [Thu, 23 Mar 2017 22:04:36 +0000 (11:04 +1300)]
Minor test tidy up.
(this is actually because we need a commit to do a merge to master after the same commit was merged to both).
Eileen McNaughton [Thu, 23 Mar 2017 22:00:19 +0000 (11:00 +1300)]
Merge pull request #10038 from jaapjansma/CRM-20330
Fixed CRM-20330: composite primary keys
Eileen McNaughton [Thu, 23 Mar 2017 21:52:55 +0000 (10:52 +1300)]
Merge pull request #10039 from JMAConsulting/CRM-20334
CRM-20334, Fatal Error on Submit Credit Card Contribution Form
Eileen McNaughton [Thu, 23 Mar 2017 21:51:48 +0000 (10:51 +1300)]
Merge pull request #10042 from eileenmcnaughton/4.7.18rc
CRM-20334, some times payment object is not set and is protected vari…
Pradeep Nayak [Thu, 23 Mar 2017 14:24:24 +0000 (19:54 +0530)]
CRM-20334, some times payment object is not set and is protected variable
----------------------------------------
* CRM-20334: Fatal Error on Submit Credit Card Form
https://issues.civicrm.org/jira/browse/CRM-20334
Edsel Roque Lopez [Thu, 23 Mar 2017 21:44:37 +0000 (03:14 +0530)]
CRM-20283 Added credit card type field for PCP report (#9996)
* CRM-20283 Added credit card type field to PCP report
----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
https://issues.civicrm.org/jira/browse/CRM-19997
----------------------------------------
* CRM-20283:
https://issues.civicrm.org/jira/browse/CRM-20283
CRM-20283 Added credit card type field for PCP report
----------------------------------------
* CRM-20283: Add credit card type field for PCP report
https://issues.civicrm.org/jira/browse/CRM-20283
CRM-20283 Bug fixes
----------------------------------------
* CRM-20283: Add credit card type field for PCP report
https://issues.civicrm.org/jira/browse/CRM-20283
CRM-20283 Fixed report to read from card type rather than credit card type
----------------------------------------
* CRM-20283: Add credit card type field for PCP report
https://issues.civicrm.org/jira/browse/CRM-20283
CRM-20283 Removed line break
----------------------------------------
* CRM-20283:
https://issues.civicrm.org/jira/browse/CRM-20283
* QA fixes
Pradeep Nayak [Thu, 23 Mar 2017 14:24:24 +0000 (19:54 +0530)]
CRM-20334, some times payment object is not set and is protected variable
----------------------------------------
* CRM-20334: Fatal Error on Submit Credit Card Form
https://issues.civicrm.org/jira/browse/CRM-20334
Jaap Jansma [Thu, 23 Mar 2017 13:35:12 +0000 (14:35 +0100)]
Fixed CRM-20330: provided a way to generate a table with a composite primary key. Because the generation of dao functionality is changed all the DAO's had to be regenerated.
Pradeep Nayak [Thu, 23 Mar 2017 12:54:57 +0000 (18:24 +0530)]
CRM-20331, added code to show card type and pan truncation besides payment method under transaction listing for contribution
----------------------------------------
* CRM-20331: Add card type and pan truncation besides payment method
https://issues.civicrm.org/jira/browse/CRM-20331
Eileen McNaughton [Thu, 23 Mar 2017 10:53:23 +0000 (23:53 +1300)]
Merge pull request #9968 from fuzionnz/remove_crm_core_form_generateid
Remove CRM_Core_Form::generateID().
Tim Otten [Thu, 23 Mar 2017 07:56:15 +0000 (00:56 -0700)]
Set version to 4.7.19
Tim Otten [Thu, 23 Mar 2017 07:55:08 +0000 (00:55 -0700)]
Merge pull request #9869 from omarabuhussein/CRM-20140-fix-alterMailParams-hook
CRM-20140: Fix alterMailParams hook to accept custom subject tokens
Eileen McNaughton [Thu, 23 Mar 2017 06:12:17 +0000 (19:12 +1300)]
Merge pull request #10035 from eileenmcnaughton/dedup_remove
Towards CRM-19612 improve tests to allow replication of the issue
eileen [Thu, 23 Mar 2017 04:49:58 +0000 (17:49 +1300)]
Towards CRM-19612 improve tests to allow replication of the issue
Eileen McNaughton [Thu, 23 Mar 2017 04:50:31 +0000 (17:50 +1300)]
Merge pull request #10033 from colemanw/CRM-20327
CRM-20327 - API chaining - replace $value when using operators.
Eileen McNaughton [Thu, 23 Mar 2017 04:50:18 +0000 (17:50 +1300)]
Merge pull request #10034 from eileenmcnaughton/dedup_remove
Towards CRM-20155 remove duplicate calls to dedupe functions.
Coleman Watts [Wed, 22 Mar 2017 23:24:16 +0000 (19:24 -0400)]
CRM-20327 - API chaining - replace $value when using operators.
eileen [Thu, 23 Mar 2017 02:18:17 +0000 (15:18 +1300)]
Towards CRM-20155 remove duplicate calls to dedupe functions.
This is a partial commit which covers the best tested section of these & establishes the new functions.
I didn't want to make the commit too daunting. The bin file probably has not been used in years
hence all the require_once calls :-)
Eileen McNaughton [Wed, 22 Mar 2017 22:44:28 +0000 (11:44 +1300)]
Merge pull request #10032 from eileenmcnaughton/enotice
Enotice fix
eileen [Wed, 22 Mar 2017 20:51:17 +0000 (09:51 +1300)]
Enotice fix
Eileen McNaughton [Wed, 22 Mar 2017 20:49:50 +0000 (09:49 +1300)]
Merge pull request #9970 from eileenmcnaughton/front_end_recur
CRM-20251 Make it easier to overwrite front end form help text regard…
Eileen McNaughton [Wed, 22 Mar 2017 20:21:04 +0000 (09:21 +1300)]
Merge pull request #10005 from eileenmcnaughton/membership_date
CRM-20294 Update membership dates in profiles to use datepicker
eileen [Mon, 13 Mar 2017 07:57:56 +0000 (20:57 +1300)]
CRM-20251 Make it easier to overwrite front end form help text regarding recurring
projects / civicrm-core.git / log