colemanw [Wed, 8 Mar 2017 15:52:51 +0000 (10:52 -0500)]
Merge pull request #9951 from JKingsnorth/CRM-19993-4.7.18
CRM-19993 Fixes for ISO compliance with countries and counties
Eileen McNaughton [Wed, 8 Mar 2017 11:31:50 +0000 (00:31 +1300)]
Merge pull request #9670 from johanv/CRM-19869-pdf_table_header_issue
Closes CRM-19869 - table layout problem multiple page PDF.
JKingsnorth [Wed, 8 Mar 2017 11:19:39 +0000 (11:19 +0000)]
CRM-19993 Fixes for ISO compliance with countries and counties
Yashodha Chaku [Wed, 8 Mar 2017 10:55:25 +0000 (16:25 +0530)]
Merge pull request #9865 from lcdservices/CRM-20146
CRM-20146 dont hardcode check_number toggle in .tpl
Eileen McNaughton [Wed, 8 Mar 2017 10:33:30 +0000 (23:33 +1300)]
Merge pull request #9907 from eileenmcnaughton/dedupe_code
CRM-20157, CRM-20195 Dedupe code cleanup
Eileen McNaughton [Wed, 8 Mar 2017 10:32:36 +0000 (23:32 +1300)]
Merge pull request #9937 from eileenmcnaughton/kenya
CRM-20062 update Kenyan provinces
Yashodha Chaku [Wed, 8 Mar 2017 09:07:56 +0000 (14:37 +0530)]
Merge pull request #9850 from aydun/CRM-20039
CRM-20039 Add Supplemental Address lines to Advanced Search
Eileen McNaughton [Wed, 8 Mar 2017 08:18:29 +0000 (21:18 +1300)]
Merge pull request #9824 from sunilpawar/CRM-20001
CRM-20001 Tokens in Subject Not replaced
Eileen McNaughton [Wed, 8 Mar 2017 08:15:34 +0000 (21:15 +1300)]
Merge pull request #9072 from jeromelebleu/patch-19386
CRM-19386: Retrieve Activities custom fields in import parser
eileen [Mon, 6 Mar 2017 04:23:10 +0000 (17:23 +1300)]
CRM-20062 upgrade component of Kenyan provinces
eileen [Mon, 6 Mar 2017 04:03:27 +0000 (17:03 +1300)]
CRM-20062 update Kenyan provinces for new installs
Eileen McNaughton [Tue, 7 Mar 2017 21:53:54 +0000 (10:53 +1300)]
Merge pull request #9930 from JMAConsulting/CRM-20193
[ready-for-review]CRM-20193, Draw currency from better table on Batch Transaction form
Eileen McNaughton [Tue, 7 Mar 2017 21:29:44 +0000 (10:29 +1300)]
Merge pull request #9935 from eileenmcnaughton/activity_cust_date
CRM-20219 Update activity fields in profiles to use date picker
Eileen McNaughton [Tue, 7 Mar 2017 21:28:58 +0000 (10:28 +1300)]
Merge pull request #9631 from eileenmcnaughton/contribution_search
CRM-20199 Contribution search performance
Brian Shaughnessy [Tue, 7 Mar 2017 14:40:15 +0000 (09:40 -0500)]
CRM-20146 dont hardcode check payment instrument
Eileen McNaughton [Tue, 7 Mar 2017 11:16:08 +0000 (00:16 +1300)]
Merge pull request #9943 from totten/master-20224
CRM-20224 - Cleanup internal event names
Tim Otten [Tue, 7 Mar 2017 08:17:32 +0000 (00:17 -0800)]
CRM-20224 - Civi\ActionSchedule\Events - Rename internal events (`actionSchedule.fooBar` vs `civi.actionSchedule.fooBar`)
If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:
```
actionSchedule.getMappings
actionSchedule.prepareMailingQuery
api.authorize
api.exception
api.prepare
api.resolve
api.respond
civi.core.install
civi.token.eval
civi.token.list
civi.token.render
DAO::post-delete
DAO::post-insert
DAO::post-update
hook_civicrm_caseChange
hook_civicrm_post::Activity
hook_civicrm_post::Case
hook_civicrm_unhandled_exception
```
This patch renames events using the `actionSchedule.fooBar` convention. Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.
Tim Otten [Tue, 7 Mar 2017 08:14:55 +0000 (00:14 -0800)]
CRM-20224 - Civi\API\Events - Rename internal events (`api.foo` vs `civi.api.foo`)
If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:
```
actionSchedule.getMappings
actionSchedule.prepareMailingQuery
api.authorize
api.exception
api.prepare
api.resolve
api.respond
civi.core.install
civi.token.eval
civi.token.list
civi.token.render
DAO::post-delete
DAO::post-insert
DAO::post-update
hook_civicrm_caseChange
hook_civicrm_post::Activity
hook_civicrm_post::Case
hook_civicrm_unhandled_exception
```
This patch renames events using the `api.foo` convention. Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.
Tim Otten [Fri, 3 Mar 2017 22:43:27 +0000 (14:43 -0800)]
CRM-20224 - CRM_Core_DAO - Rename internal events (`DAO::foo-bar` vs `civi.dao.fooBar`)
If you look at the list of events emitted through the EventDispatcher, you'll
find several different formats for the names:
```
actionSchedule.getMappings
actionSchedule.prepareMailingQuery
api.authorize
api.exception
api.prepare
api.resolve
api.respond
civi.core.install
civi.token.eval
civi.token.list
civi.token.render
DAO::post-delete
DAO::post-insert
DAO::post-update
hook_civicrm_caseChange
hook_civicrm_post::Activity
hook_civicrm_post::Case
hook_civicrm_unhandled_exception
```
This patch renames events using the `DAO::foo-bar` convention. Based on
grepping universe, I don't believe any extensions rely on the `DAO::*`
events.
Eileen McNaughton [Tue, 7 Mar 2017 06:42:37 +0000 (19:42 +1300)]
Merge pull request #9941 from eileenmcnaughton/comment
Add docblock comment to help with CRM-20058
eileen [Tue, 7 Mar 2017 05:28:25 +0000 (18:28 +1300)]
Add docblock comment to help with CRM-20058
Eileen McNaughton [Mon, 6 Mar 2017 20:29:46 +0000 (09:29 +1300)]
Merge pull request #9938 from JKingsnorth/CRM-20206
[NFC] CRM-20206 - Clarify comments on html param
JKingsnorth [Mon, 6 Mar 2017 10:13:43 +0000 (10:13 +0000)]
[NFC] Clarify comments
Eileen McNaughton [Sun, 5 Mar 2017 21:49:30 +0000 (10:49 +1300)]
Merge pull request #9931 from ErichBSchulz/commentfixes
comment changes only
Eileen McNaughton [Sun, 5 Mar 2017 21:49:03 +0000 (10:49 +1300)]
Merge pull request #9934 from civicrm/4.7.17-rc
4.7.17 rc
eileen [Sun, 5 Mar 2017 21:02:14 +0000 (10:02 +1300)]
CRM-20219 Update activity fields in profiles to use date picker
Eileen McNaughton [Sun, 5 Mar 2017 20:49:42 +0000 (09:49 +1300)]
Merge pull request #9922 from eileenmcnaughton/cust_date_part
CRM-20213 Change participant_register_date to use datepicker widget
Eileen McNaughton [Sun, 5 Mar 2017 20:46:29 +0000 (09:46 +1300)]
Merge pull request #9933 from spalmstr/new
CRM-20004 Fix regression Event payment receipt sent twice
spalmstr [Sat, 4 Mar 2017 12:23:12 +0000 (12:23 +0000)]
CRM-20004 Fix regression Event payment receipt sent twice
Erich Schulz [Sun, 5 Mar 2017 07:10:12 +0000 (17:10 +1000)]
comment changes only
The magic __call method provides the ability to snoop on all hooks
Pradeep Nayak [Sun, 5 Mar 2017 07:07:52 +0000 (12:37 +0530)]
CRM-20193, moved set of code into if condition for better readability
----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
https://issues.civicrm.org/jira/browse/CRM-20193
Pradeep Nayak [Sun, 5 Mar 2017 07:02:21 +0000 (12:32 +0530)]
CRM-20193, optimized sql to use INNER JOIN with contribution table rathe LEFT JOIN
----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
https://issues.civicrm.org/jira/browse/CRM-20193
Pradeep Nayak [Sun, 5 Mar 2017 07:01:05 +0000 (12:31 +0530)]
CRM-20193, changed the table alias for Currency field to use civicrm_financial_trxn table and have name field table alias
----------------------------------------
* CRM-20193: Draw currency from better table on Batch Transaction form
https://issues.civicrm.org/jira/browse/CRM-20193
Eileen McNaughton [Sat, 4 Mar 2017 03:01:33 +0000 (16:01 +1300)]
Merge pull request #9899 from colemanw/CRM-20179
CRM-20179 - jstree upgrade and other js performance improvements
Eileen McNaughton [Fri, 3 Mar 2017 21:06:19 +0000 (10:06 +1300)]
Merge pull request #9917 from JKingsnorth/CRM-20206
CRM-20206 Fix encoding in plain text checksum links
Eileen McNaughton [Fri, 3 Mar 2017 20:16:43 +0000 (09:16 +1300)]
Merge pull request #9923 from eileenmcnaughton/acl
CRM-19773 unit test to verify acls apply
eileen [Fri, 3 Mar 2017 07:38:07 +0000 (20:38 +1300)]
CRM-19773 unit test to verify acls apply
Eileen McNaughton [Fri, 3 Mar 2017 07:36:15 +0000 (20:36 +1300)]
Merge pull request #9570 from colemanw/CRM-19773-report
CRM-19773 - Check permisions for all entities in reports
eileen [Fri, 3 Mar 2017 06:14:55 +0000 (19:14 +1300)]
CRM-20213 Change participant_register_date to use datepicker widget
Eileen McNaughton [Fri, 3 Mar 2017 06:11:38 +0000 (19:11 +1300)]
Merge pull request #9921 from civicrm/4.7.17-rc
4.7.17 rc
eileen [Thu, 2 Mar 2017 23:05:54 +0000 (12:05 +1300)]
CRM-20199 Remove poor join on option_value table when doing contribution search.
This involves setting payment instrument to exportable & remove hacks that were used in
place of doing that, and adding new logic to the order by to allow it to order without
joining the option value table (using the field() function).
I have observed one small regression which is the Qill showing 'Payment Method ID'
instead of payment method. I'm committed to fixing that but I would push
to merge this in advance of that because we are in the best place in the monthly
cycle to merge this and that is a very minor fallout.
Eileen McNaughton [Thu, 2 Mar 2017 21:09:04 +0000 (10:09 +1300)]
Merge pull request #9847 from eileenmcnaughton/cust_date_birth
CRM-19124 update birth_date to be consistent at point of hook (use da…
Eileen McNaughton [Thu, 2 Mar 2017 20:55:39 +0000 (09:55 +1300)]
Merge pull request #9919 from seamuslee001/CRM-20204-code-cleanup
CRM-20201 add in escaped curly braces to ensure nothing unusual happens
Eileen McNaughton [Thu, 2 Mar 2017 20:38:57 +0000 (09:38 +1300)]
Merge pull request #9918 from colemanw/moveTags
CRM-19943 - Add permission check and move tags button
Seamus Lee [Thu, 2 Mar 2017 20:05:17 +0000 (07:05 +1100)]
CRM-20204 add in escaped curly braces to ensure nothing unusual happens
Coleman Watts [Thu, 2 Mar 2017 16:09:17 +0000 (11:09 -0500)]
CRM-19943 - Add permission check and move tags button
JKingsnorth [Thu, 2 Mar 2017 13:49:44 +0000 (13:49 +0000)]
CRM-20206 Use existing function to replace ampersand codes
JKingsnorth [Thu, 2 Mar 2017 12:19:07 +0000 (12:19 +0000)]
CRM-20206 Fix encoding in plain text checksum links
Eileen McNaughton [Thu, 2 Mar 2017 04:17:57 +0000 (17:17 +1300)]
Merge pull request #9914 from civicrm/4.7.17-rc
4.7.17 rc
Eileen McNaughton [Wed, 1 Mar 2017 21:09:13 +0000 (10:09 +1300)]
Merge pull request #9913 from seamuslee001/CRM-20201
CRM-20201 Fix issue where manage tags page would not display properly…
Seamus Lee [Wed, 1 Mar 2017 03:45:14 +0000 (14:45 +1100)]
CRM-20201 Fix issue where manage tags page would not display properly if tag set does not have a created by set
Eileen McNaughton [Tue, 28 Feb 2017 22:35:22 +0000 (11:35 +1300)]
Merge pull request #9911 from seamuslee001/CRM-15505-test-improvement
CRM-15505 Lock in to ensure that state_province is used to mean the a…
Seamus Lee [Tue, 28 Feb 2017 20:24:45 +0000 (07:24 +1100)]
CRM-15505 Lock in to ensure that state_province is used to mean the abbreviation not full name
Eileen McNaughton [Tue, 28 Feb 2017 20:01:11 +0000 (09:01 +1300)]
Merge pull request #9905 from aydun/CRM-15505
Fix CRM-15505: Make state_province_name return the full name of the state
VasanthaKaje [Tue, 28 Feb 2017 16:49:13 +0000 (22:19 +0530)]
Crm19905 (#9749)
* CRM-19905 Drupal 8 User View and Edit pages broken when CiviCRM profiles set for User Registration
* CRM-19905 Drupal 8 User View and Edit pages broken when CiviCRM profiles set for User Registration
[moved the changes to Drupal8.php file to make it specific for D8]
* Overrode postURL function for D8 to fix CRM-19905
* CRM19905 correction for PR#9749, to remove Superflous whitespace error
* Update Drupal8.php
Remove extra whitespaces
Eileen McNaughton [Tue, 28 Feb 2017 10:30:28 +0000 (23:30 +1300)]
Merge pull request #9909 from eileenmcnaughton/membership
Additional unit test, checking membership renewal
eileen [Tue, 28 Feb 2017 07:53:30 +0000 (20:53 +1300)]
Additional unit test, checking membership renewal
Eileen McNaughton [Tue, 28 Feb 2017 04:33:25 +0000 (17:33 +1300)]
Merge pull request #9745 from jmcclelland/CRM-19937
CRM-19937 - ensure amount preceded by $ is still treated as a number
Eileen McNaughton [Tue, 28 Feb 2017 04:23:06 +0000 (17:23 +1300)]
Merge pull request #9901 from kurund/CRM-20187
fixes for CRM-20187
Eileen McNaughton [Tue, 28 Feb 2017 04:19:01 +0000 (17:19 +1300)]
Merge pull request #9521 from seamuslee001/drupal8-url-fix
CRM-19856 Fix Drupal 8 get User url
Eileen McNaughton [Tue, 28 Feb 2017 04:18:43 +0000 (17:18 +1300)]
Merge pull request #9859 from seamuslee001/CRM-20052
CRM-20052 get Billing Block js working as expeected on Drupal 8 as it…
Tim Otten [Tue, 28 Feb 2017 03:06:03 +0000 (19:06 -0800)]
Merge pull request #9908 from eileenmcnaughton/regress
Towards CRM-19815 Fix misdisplay of gender on drupal user-view page as a result of previous work on this within this release
Eileen McNaughton [Tue, 28 Feb 2017 02:59:48 +0000 (15:59 +1300)]
Merge pull request #9906 from mattwire/verp_config_warning
CRM-20196: Add a useful message when the user didn't setup bounce processing pro…
Tim Otten [Tue, 28 Feb 2017 02:25:55 +0000 (18:25 -0800)]
Merge pull request #9874 from totten/master-acttok
(Regression) CRM_Mailing_ActionTokens - Degrade gracefully
eileen [Tue, 28 Feb 2017 00:58:39 +0000 (13:58 +1300)]
CRM-19815 Fix misdisplay of gender on drupal user-view page
Note that the click-throughs still do not work but this turns out to be
a pre-existing issue so I will leave that for a follow up
eileen [Mon, 27 Feb 2017 22:43:21 +0000 (11:43 +1300)]
CRM-20195 remove deprecated fatals from dedupe merge form
Matthew Wire [Mon, 27 Feb 2017 22:41:54 +0000 (22:41 +0000)]
Add a useful message when the user didn't setup bounce processing properly
eileen [Mon, 27 Feb 2017 22:06:57 +0000 (11:06 +1300)]
CRM-20157 code cleanup, more unused variables
eileen [Mon, 27 Feb 2017 22:05:44 +0000 (11:05 +1300)]
CRM-20157 Code cleanup, remove duplicate variables.
Using a class property and a local variable for the same thing just causes confusion
eileen [Wed, 22 Feb 2017 04:30:30 +0000 (17:30 +1300)]
CRM-20157 Code cleanup - remove unused & unuseful variables in dedupe classes
Eileen McNaughton [Mon, 27 Feb 2017 21:43:22 +0000 (10:43 +1300)]
Merge pull request #9902 from JKingsnorth/CRM-19492
CRM-19492 Merging: disable location settings if the relevant checkbox isn't selected
Eileen McNaughton [Mon, 27 Feb 2017 19:37:01 +0000 (08:37 +1300)]
Merge pull request #9893 from JKingsnorth/CRM-20154
CRM-20154 Dedupe - remove unused autoflip parameter
Eileen McNaughton [Mon, 27 Feb 2017 19:34:47 +0000 (08:34 +1300)]
Merge pull request #9866 from lcdservices/CRM-20145
CRM-20145 line_item $0 entity_financial_trxn fix
Aidan Saunders [Mon, 27 Feb 2017 16:13:50 +0000 (16:13 +0000)]
Fix CRM-15505: Make state_province_name return the full name of the state, not the abbreviation
Brian Shaughnessy [Mon, 27 Feb 2017 12:11:08 +0000 (07:11 -0500)]
CRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:42:34 +0000 (06:42 -0500)]
CRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:37:33 +0000 (06:37 -0500)]
CRM-20145 fix code style issues
JKingsnorth [Mon, 27 Feb 2017 10:38:28 +0000 (10:38 +0000)]
CRM-19492 Fixes for disabling location settings when checkbox isn't selected
eileen [Thu, 10 Nov 2016 10:28:37 +0000 (23:28 +1300)]
CRM-19492 disable location settings if the relevant checkbox is not enabled
eileen [Thu, 10 Nov 2016 04:12:07 +0000 (17:12 +1300)]
(towards CRM-19492) Remove defunct vars
I could find no evidence of these being used anywhere
eileen [Thu, 10 Nov 2016 03:59:57 +0000 (16:59 +1300)]
(towards CRM-19492) Improve whitespace layout
eileen [Thu, 10 Nov 2016 03:49:24 +0000 (16:49 +1300)]
(towards CRM-19492) Do not assign variables by reference
They are not used as references & this just adds confusion.
eileen [Thu, 10 Nov 2016 03:25:00 +0000 (16:25 +1300)]
(towards CRM-19492) Extract bounce portion of code into separate function
eileen [Thu, 10 Nov 2016 03:21:34 +0000 (16:21 +1300)]
(towards CRM-19492) Minor variable simplification
Kurund Jalmi [Mon, 27 Feb 2017 09:30:26 +0000 (15:00 +0530)]
fixes for CRM-20187
JKingsnorth [Mon, 27 Feb 2017 09:16:02 +0000 (09:16 +0000)]
Fix another reference to removed autoFlip param
JKingsnorth [Fri, 24 Feb 2017 09:19:09 +0000 (09:19 +0000)]
[NFC] Fix comments for lookupValues function
JKingsnorth [Fri, 24 Feb 2017 09:15:17 +0000 (09:15 +0000)]
CRM-20154 Remove more unused autoflips
eileen [Mon, 27 Feb 2017 05:23:51 +0000 (18:23 +1300)]
Remove function I added for date handling.
In the end I opted to leave the date handling in smarty & have not unravelled our custom
version of strftime formatting
eileen [Mon, 27 Feb 2017 02:53:10 +0000 (15:53 +1300)]
CRM-19124 Profiles - update birth_date & deceased_date to use datepicker
eileen [Tue, 14 Feb 2017 12:38:59 +0000 (01:38 +1300)]
CRM-19124 update birth_date to be consistent at point of hook (use datepicker)
Eileen McNaughton [Sun, 26 Feb 2017 23:22:51 +0000 (12:22 +1300)]
Merge pull request #9900 from fuzionnz/CRM-20181-deprecate_crm_core_error_fatal
CRM-20181. Deprecate CRM_Core_Error::fatal().
Chris Burgess [Sun, 26 Feb 2017 07:20:49 +0000 (20:20 +1300)]
CRM-20181. Document why we must be rid of this troublesome function.
Chris Burgess [Sun, 26 Feb 2017 07:12:03 +0000 (20:12 +1300)]
CRM-20181. Deprecate CRM_Core_Error::fatal().
Eileen McNaughton [Sun, 26 Feb 2017 07:08:42 +0000 (20:08 +1300)]
Merge pull request #9888 from eileenmcnaughton/cust_another
CRM-19490: Profile date fields don't respect localisation on the Cont…
eileen [Sun, 26 Feb 2017 04:06:45 +0000 (17:06 +1300)]
CRM-19490 change 'view' action check to '&' to also pick up 'preview' action
eileen [Sun, 26 Feb 2017 03:56:59 +0000 (16:56 +1300)]
Enotice fix from recent merge
Eileen McNaughton [Sun, 26 Feb 2017 03:02:58 +0000 (16:02 +1300)]
Merge pull request #9890 from spalmstr/CRM-19453
CRM-19453
eileen [Thu, 23 Feb 2017 12:39:06 +0000 (01:39 +1300)]
CRM-19490 define non-updated fields in a function for easier transition.
Looking to find a way to migrate these as safely as possible. Defining them in one place seems like a good step
eileen [Thu, 23 Feb 2017 11:35:14 +0000 (00:35 +1300)]
CRM-19490: Profile date fields don't respect localisation on the Contribution Page confirmation screen