Eileen McNaughton [Tue, 11 Apr 2017 22:36:35 +0000 (10:36 +1200)]
Merge pull request #10145 from eileenmcnaughton/test-fail
Fix test regression by correctly setting timestamp in test method
eileen [Tue, 11 Apr 2017 22:31:01 +0000 (10:31 +1200)]
Fix test regression by correctly setting timestamp in test method
Eileen McNaughton [Tue, 11 Apr 2017 20:41:58 +0000 (08:41 +1200)]
Merge pull request #10139 from JMAConsulting/CRM-20391
CRM-20391 Added pan trucation to search
Eileen McNaughton [Tue, 11 Apr 2017 20:33:06 +0000 (08:33 +1200)]
Merge pull request #10115 from jmcclelland/CRM-20388
CRM-20388 - ensure connection errors are properly reported to user.
Eileen McNaughton [Tue, 11 Apr 2017 20:10:16 +0000 (08:10 +1200)]
Merge pull request #9848 from JMAConsulting/CRM-8526
CRM-8526 [ready for core team review] Added support for contribution tokens in emails sent via search results (Find contribution results and Advanced search when results are listed as contributions)
colemanw [Tue, 11 Apr 2017 15:31:16 +0000 (11:31 -0400)]
Merge pull request #10142 from JMAConsulting/IIDA-58
CRM-20022 Minor fix to change group by label
Edsel [Thu, 16 Feb 2017 10:20:41 +0000 (15:50 +0530)]
CRM-8526 Added contribution tokens to list
----------------------------------------
* CRM-8526: Support [contribution.custom_nn] tokens in templates
https://issues.civicrm.org/jira/browse/CRM-8526
CRM-8526 Added support for contribution tokens in find contributions search results
Edsel [Tue, 11 Apr 2017 12:58:35 +0000 (18:28 +0530)]
CRM-20022 Minor fix to change group by label
----------------------------------------
* CRM-20022: Add Batch Title to Columns, Grouping tabs on Contribution Summary report
https://issues.civicrm.org/jira/browse/CRM-20022
Edsel [Tue, 11 Apr 2017 08:47:42 +0000 (14:17 +0530)]
CRM-20391 Added card number to search
----------------------------------------
* CRM-20391: Add card number field on search form
https://issues.civicrm.org/jira/browse/CRM-20391
Eileen McNaughton [Tue, 11 Apr 2017 10:37:35 +0000 (22:37 +1200)]
Merge pull request #10138 from totten/master-hook-fix
CRM-19813 - Only dispatch through EventDispatcher after booting
Monish Deb [Tue, 11 Apr 2017 09:03:04 +0000 (14:33 +0530)]
Merge pull request #10137 from eileenmcnaughton/iida2
Towards CRM-20392 fix receive_date to use date_picker
Eileen McNaughton [Tue, 11 Apr 2017 08:53:00 +0000 (20:53 +1200)]
Merge pull request #10136 from eileenmcnaughton/iida
Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code
Tim Otten [Tue, 11 Apr 2017 08:00:32 +0000 (01:00 -0700)]
CRM-19813 - Only dispatch through EventDispatcher after booting
After merging #9949, some screens (like the contact-result list or "View
Contact") reported warnings like:
```
Notice: Undefined index: in CRM_Core_BAO_Country::countryLimit() (line 90 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
Notice: Undefined index: in CRM_Core_BAO_Country::provinceLimit() (line 62 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
```
Bisecting the git history revealed that it stemmed from switching
`hook_civicrm_entityTypes` to go through EventDispatcher.
https://github.com/civicrm/civicrm-core/pull/9949/commits/
fb1d9ad2f5116245ba3488a26f8e0b065f328006#diff-8869a8f3c6318eb0580ce2aa04b713bfL1835
This hook is apparently similar to `hook_civicrm_container` in that both
fires pre-boot. If we attempt to dispatch it through the container in a
pre-boot environment, something initializes incorrectly.
This change proposes a general rule:
* If you fire a hook before the container or EventDispatcher is available...
* Then don't try to use the container or EventDispatcher.
Pradeep Nayak [Mon, 3 Apr 2017 22:16:45 +0000 (10:16 +1200)]
Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code
eileen [Tue, 11 Apr 2017 06:24:15 +0000 (18:24 +1200)]
Towards CRM-20392 fix receive_date to use date_picker
This might not have been necessary in the end - https://github.com/civicrm/civicrm-packages/pull/178
seems like the fix for the breakage, but we should be making this change on
every form we touch in order to get rid of code complexity.
Eileen McNaughton [Tue, 11 Apr 2017 02:06:25 +0000 (14:06 +1200)]
Merge pull request #9949 from totten/master-hook-ev2
CRM-19813 - Unify Symfony Events and hooks
Eileen McNaughton [Tue, 11 Apr 2017 00:45:47 +0000 (12:45 +1200)]
Merge pull request #9796 from seamuslee001/CRM-19961
CRM-19961 Make civicrm_sms_provider able to be domain specific
Eileen McNaughton [Mon, 10 Apr 2017 23:58:24 +0000 (11:58 +1200)]
Merge pull request #10132 from seamuslee001/CRM-20402
CRM-20402 Improve handling of spam bounces that get classified as syntax bounces
Seamus Lee [Mon, 10 Apr 2017 22:08:17 +0000 (08:08 +1000)]
CRM-19961 Add in tests to prove logic and fix logic
remove changes to update function
Fix style
Seamus Lee [Sun, 9 Apr 2017 06:47:21 +0000 (16:47 +1000)]
Add in Upgrade script for CRM-20402
Greg Rundlett [Fri, 3 Feb 2017 13:56:33 +0000 (08:56 -0500)]
improve "spam" pattern match for bounces which otherwise get classified as syntax bounces
Seamus Lee [Fri, 3 Feb 2017 05:37:13 +0000 (16:37 +1100)]
Add in Domain id handling into SMS provider BAO
Add in domain id filtering to delete function
CRM-19961 Treat NULL domain_id values as ok when retriving SMS providers
Ensure domain id only gets set if its not already set
Treat NULL domain_id as valid and also allow for any domain to delete providers that have domain_id which is NULL
Add in API default for domain_id for sms provider
Use value from database if provided even if null otherwise fall back to current domain as default but use the value submitted first
Fix null test on update
Eileen McNaughton [Mon, 10 Apr 2017 20:08:58 +0000 (08:08 +1200)]
Merge pull request #10080 from agileware/CRM-20360
CRM-20360: Remove superfluous showing of payment options header on pa…
Eileen McNaughton [Mon, 10 Apr 2017 20:02:30 +0000 (08:02 +1200)]
Merge pull request #10114 from JMAConsulting/CRM-20385
CRM-20385 (IIDA-72), fixed deferred revenue account validation
colemanw [Mon, 10 Apr 2017 14:49:12 +0000 (10:49 -0400)]
Merge pull request #10128 from JMAConsulting/CRM-20400
CRM-20400, fixed payment receipt
colemanw [Sat, 8 Apr 2017 19:38:46 +0000 (15:38 -0400)]
Merge pull request #10131 from colemanw/CRM-20367
CRM-20367 - Allow addIndex $column to be an array
Coleman Watts [Sat, 8 Apr 2017 02:52:00 +0000 (22:52 -0400)]
CRM-20367 - Allow addIndex $column to be an array
colemanw [Fri, 7 Apr 2017 23:37:44 +0000 (19:37 -0400)]
Merge pull request #10123 from colemanw/CRM-16633
CRM-16633 - Allow user to change case subject
Pradeep Nayak [Fri, 7 Apr 2017 22:48:22 +0000 (04:18 +0530)]
CRM-20400, Updated completed Text, Added upgrade code
----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
https://issues.civicrm.org/jira/browse/CRM-20400
Pradeep Nayak [Fri, 7 Apr 2017 19:47:45 +0000 (01:17 +0530)]
CRM-20400, fixed payment receipt
----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
https://issues.civicrm.org/jira/browse/CRM-20400
Pradeep Nayak [Tue, 21 Feb 2017 13:19:53 +0000 (18:49 +0530)]
CRM-20385 : IIDA-72 oversensitive deferred revenue account validation
Monish Deb [Fri, 7 Apr 2017 07:18:53 +0000 (12:48 +0530)]
Merge pull request #9773 from monishdeb/CRM-19663
CRM-19663: A scheduled reminder set to use an absolute date does not allow repeats
Coleman Watts [Thu, 6 Apr 2017 18:14:06 +0000 (14:14 -0400)]
CRM-16633 - Allow user to change case subject
Coleman Watts [Thu, 6 Apr 2017 18:12:55 +0000 (14:12 -0400)]
CRM-16633 - Return data with crmEditable formSuccess event
Coleman Watts [Thu, 6 Apr 2017 18:12:13 +0000 (14:12 -0400)]
Fix script loading race condition
Monish Deb [Thu, 6 Apr 2017 12:23:33 +0000 (17:53 +0530)]
Merge pull request #10113 from JMAConsulting/IIDA-116
IIDA-116 Refactored Deferred Revenue report to follow more standardized approach.
Edsel [Thu, 6 Apr 2017 10:30:03 +0000 (16:00 +0530)]
IIDA-116 Fixed batch labels
Edsel [Fri, 17 Mar 2017 11:55:26 +0000 (17:25 +0530)]
IIDA-116 Added extra columns and made existing columns selectable
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
IIDA-116 Indentation for better readability
IIDA-116 Refactored deferred revenue report
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
IIDA-119 Used API rather than query
Conflicts:
CRM/Financial/BAO/FinancialAccount.php
IIDA-116 Added Revenue Recognition date toggle filter
IIDA-116 Added hotlinks
IIDA-116 Fixed jenkins errors
Eileen McNaughton [Thu, 6 Apr 2017 10:25:21 +0000 (22:25 +1200)]
Merge pull request #10122 from seamuslee001/CRM-20308
CRM-20308 CRM-19657 Toward CRM-20308 & support CRM-19657 Extract using domain from and lo…
Seamus Lee [Thu, 6 Apr 2017 08:56:23 +0000 (18:56 +1000)]
Toward CRM-20308 & support CRM-19657 Extract using domain from and logged in user from email details into separate function for re-use
Monish Deb [Thu, 6 Apr 2017 07:17:29 +0000 (12:47 +0530)]
Merge pull request #10028 from jitendrapurohit/is_public_group_fix
CRM-20318: Add is_public setting on Custom groups
Eileen McNaughton [Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)]
Merge pull request #10120 from seamuslee001/CRM-19741
CRM-19741 Add back in fix and add in unit tests to lock in fix
Jitendra Purohit [Thu, 6 Apr 2017 04:45:26 +0000 (10:15 +0530)]
Fix additional issues
Seamus Lee [Thu, 6 Apr 2017 00:58:29 +0000 (10:58 +1000)]
CRM-19741 Add back in fix and add in unit tests to lock in fix
Eileen McNaughton [Thu, 6 Apr 2017 01:13:40 +0000 (13:13 +1200)]
Merge pull request #10084 from jitendrapurohit/CRM-19243
CRM-19243: Free membership results in two email receipts
Eileen McNaughton [Thu, 6 Apr 2017 00:24:53 +0000 (12:24 +1200)]
Merge pull request #10116 from colemanw/CRM-20390
CRM-20390 - Fix select2 data type mismatch
Eileen McNaughton [Thu, 6 Apr 2017 00:02:15 +0000 (12:02 +1200)]
Merge pull request #10119 from eileenmcnaughton/deprecated
Add deprecation comments, CRM-19987
Eileen McNaughton [Wed, 5 Apr 2017 23:44:45 +0000 (11:44 +1200)]
Merge pull request #10021 from jitendrapurohit/CRM-20246
CRM-20246: maxfilesize on import should respect 0 as meaning 'no limit'
Eileen McNaughton [Wed, 5 Apr 2017 23:39:39 +0000 (11:39 +1200)]
Merge pull request #10093 from jitendrapurohit/CRM-20343
CRM-20343: skip status calculation when form dates are not modified.
Eileen McNaughton [Wed, 5 Apr 2017 23:16:22 +0000 (11:16 +1200)]
Merge pull request #9276 from seamuslee001/CRM-19517
CRM-19517 allow price fields that use disabled financial types to sho…
eileen [Wed, 5 Apr 2017 23:05:48 +0000 (11:05 +1200)]
Add deprecation comments, CRM-19987
Eileen McNaughton [Wed, 5 Apr 2017 22:15:59 +0000 (10:15 +1200)]
Merge pull request #10095 from mattwire/membership_force_auto_renew
CRM-20375: Show message instead of checkbox when renew required. Hide checkbox w…
Tim Otten [Wed, 5 Apr 2017 21:59:49 +0000 (14:59 -0700)]
Merge pull request #10118 from civicrm/4.7.18-rc
4.7.18 rc
Eileen McNaughton [Wed, 5 Apr 2017 21:37:17 +0000 (09:37 +1200)]
Merge pull request #10096 from jmcclelland/CRM-20376
Crm 20376 - Fix field names on PDF/Print vesion of survey report
Eileen McNaughton [Wed, 5 Apr 2017 21:36:13 +0000 (09:36 +1200)]
Merge pull request #9916 from JMAConsulting/CRM-20207
CRM-20207 Added invocation for selectWhereClause hook in activity SQL
Tim Otten [Wed, 5 Apr 2017 20:09:45 +0000 (13:09 -0700)]
Merge pull request #10117 from colemanw/CRM-20179
CRM-20179 - Fix race condition on manage group page
Coleman Watts [Wed, 5 Apr 2017 18:39:06 +0000 (14:39 -0400)]
CRM-20179 - Fix race condition on manage group page
Coleman Watts [Wed, 5 Apr 2017 16:44:38 +0000 (12:44 -0400)]
CRM-20390 - Fix select2 data type mismatch
Jamie McClelland [Wed, 5 Apr 2017 15:35:54 +0000 (11:35 -0400)]
CRM-20388 - ensure connection errors are properly reported to user.
Jamie McClelland [Wed, 5 Apr 2017 14:49:32 +0000 (10:49 -0400)]
CRM-20376 - fix typo in variable name.
Eileen McNaughton [Wed, 5 Apr 2017 12:50:47 +0000 (00:50 +1200)]
Merge pull request #10110 from mattwire/contributor
Add my details
Eileen McNaughton [Wed, 5 Apr 2017 12:17:40 +0000 (00:17 +1200)]
Merge pull request #9880 from JMAConsulting/CRM-20158-4
CRM-20158, added function to update credit card details like card typ…
deb.monish [Wed, 5 Apr 2017 12:06:36 +0000 (17:36 +0530)]
minor
Jitendra Purohit [Wed, 22 Mar 2017 04:53:11 +0000 (10:23 +0530)]
Add is_public setting on Custom groups
deb.monish [Mon, 3 Apr 2017 11:05:45 +0000 (16:35 +0530)]
Additional test fixes and adding CRM unit test
deb.monish [Fri, 31 Mar 2017 10:40:14 +0000 (16:10 +0530)]
refactor activity listing using API instead of SQL
Edsel [Thu, 2 Mar 2017 11:48:08 +0000 (17:18 +0530)]
CRM-20207 Added invocation for selectWhereClause hook in activity SQL
----------------------------------------
* CRM-20207: Introduce selectWhereClause hook for activity results on activity tab contact summary page
https://issues.civicrm.org/jira/browse/CRM-20207
Pradeep Nayak [Wed, 5 Apr 2017 09:46:37 +0000 (15:16 +0530)]
CRM-20158, added comments
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
Pradeep Nayak [Wed, 22 Feb 2017 23:31:05 +0000 (05:01 +0530)]
CRM-20158, added function to update credit card details like card type and pan truncation for contribution
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
CRM-20158, added test
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
CRM-20158, changed code to use api for update to financial trxn table and to retrieve data from financial trxn table
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
CRM-20158, placed function contribution BAO to update card details
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
CRM-20158, changed function defination and params and updated function calling
----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
https://issues.civicrm.org/jira/browse/CRM-20158
Matthew Wire [Wed, 5 Apr 2017 08:06:22 +0000 (09:06 +0100)]
Add my details
Eileen McNaughton [Wed, 5 Apr 2017 04:25:04 +0000 (16:25 +1200)]
Merge pull request #10106 from eileenmcnaughton/index
CRM-20312 Add indices to DAO classes
Aidan Saunders [Wed, 5 Apr 2017 03:05:06 +0000 (15:05 +1200)]
CRM-20312 regenerated DAOS with indexes
Aidan Saunders [Tue, 4 Apr 2017 22:56:29 +0000 (10:56 +1200)]
CRM-20312 Add indices to DAO classes
Eileen McNaughton [Wed, 5 Apr 2017 02:14:17 +0000 (14:14 +1200)]
Merge pull request #10108 from eileenmcnaughton/localizable
CRM-20312 add field localisation data to DAO. …
colemanw [Wed, 5 Apr 2017 01:48:43 +0000 (21:48 -0400)]
Merge pull request #10098 from agh1/4.7.18-release-notes
Release notes 4.7.18
Andrew Hunt [Wed, 5 Apr 2017 01:40:24 +0000 (21:40 -0400)]
4.7.18 release notes: update contributors and key
Aidan Saunders [Wed, 5 Apr 2017 01:27:34 +0000 (13:27 +1200)]
CRM-20312 regenerated DAO with localisation
Aidan Saunders [Wed, 5 Apr 2017 01:19:50 +0000 (13:19 +1200)]
CRM-20312 add field localisation data to DAO.
Towards index reconciliation
Eileen McNaughton [Wed, 5 Apr 2017 00:38:24 +0000 (12:38 +1200)]
Merge pull request #10107 from eileenmcnaughton/index_tidy
Minor spelling & casing tidy ups
Aidan Saunders [Tue, 4 Apr 2017 23:09:41 +0000 (11:09 +1200)]
Minor spelling & casing tidy ups
Andrew Hunt [Tue, 4 Apr 2017 21:57:15 +0000 (17:57 -0400)]
4.7.18 release notes: finished issues, still need to fix credits
Tim Otten [Tue, 4 Apr 2017 19:05:35 +0000 (12:05 -0700)]
Merge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit
Feature/drupal boot no exit
Jamie McClelland [Mon, 3 Apr 2017 17:44:32 +0000 (13:44 -0400)]
CRM-20376 - ensure questions are labelled Q1, Q2, etc in pdf report.
Also, replace deprecated method.
Monish Deb [Tue, 4 Apr 2017 12:24:39 +0000 (17:54 +0530)]
Merge pull request #10036 from jitendrapurohit/CRM-20329
CRM-20329: Backend Membership with Payment set to Failed results in M…
Eileen McNaughton [Tue, 4 Apr 2017 06:54:09 +0000 (18:54 +1200)]
Merge pull request #10101 from eileenmcnaughton/contribution
CRM-20379 move payment details above less important info
Eileen McNaughton [Tue, 4 Apr 2017 06:02:57 +0000 (18:02 +1200)]
Merge pull request #10100 from seamuslee001/CRM-19961-schema
CRM-19961 Schema changes to make sms provider multisite aware
eileen [Tue, 4 Apr 2017 05:49:12 +0000 (17:49 +1200)]
CRM-20379 move payment details above less important info
Eileen McNaughton [Tue, 4 Apr 2017 05:23:01 +0000 (17:23 +1200)]
Merge pull request #9371 from seamuslee001/CRM-19633
CRM-19633 Allow for Contribution pages to be viewed from any domain in a multisite setup
Seamus Lee [Tue, 4 Apr 2017 04:51:31 +0000 (14:51 +1000)]
CRM-19961 Schema changes to make sms provider multisite aware
Seamus Lee [Tue, 4 Apr 2017 04:32:26 +0000 (14:32 +1000)]
Move upgrade logic to .19
Seamus Lee [Mon, 19 Dec 2016 20:42:46 +0000 (07:42 +1100)]
Move upgrade logic to .16
Seamus Lee [Mon, 17 Oct 2016 20:37:02 +0000 (07:37 +1100)]
CRM-19517 allow disabled financial types to show
Andrew Hunt [Tue, 4 Apr 2017 04:28:50 +0000 (00:28 -0400)]
4.7.18 release notes: features done, Heels won, I'll finish up tomorrow
Seamus Lee [Tue, 4 Apr 2017 04:27:48 +0000 (14:27 +1000)]
Alter var and comment as per Eileen
Seamus Lee [Thu, 10 Nov 2016 20:25:30 +0000 (07:25 +1100)]
Ensure we clear out the cache just to be sure
Fix docblock
Seamus Lee [Thu, 10 Nov 2016 20:23:36 +0000 (07:23 +1100)]
Retrieve all pamyent processors if we have had an id passed in as most likely coming from a contribution form
Eileen McNaughton [Tue, 4 Apr 2017 04:20:53 +0000 (16:20 +1200)]
Merge pull request #9724 from civicrm/michaelmcandrew-CRM-19921
CRM-19921
Eileen McNaughton [Tue, 4 Apr 2017 03:20:47 +0000 (15:20 +1200)]
Merge pull request #9960 from colemanw/CRM-20029
CRM-20029 - Copy custom files when duplicating an event
Eileen McNaughton [Tue, 4 Apr 2017 03:16:34 +0000 (15:16 +1200)]
Merge pull request #10040 from jaapjansma/CRM-20333
Fixed CRM-20333: search menu visible even when a user does not has access to any contacts.
Eileen McNaughton [Mon, 3 Apr 2017 22:21:31 +0000 (10:21 +1200)]
Merge pull request #10094 from mattwire/updatesubscription_fatal
CRM-20374 Be a bit more friendly rather than crashing with fatal when we can't …
projects / civicrm-core.git / log