Eileen McNaughton [Mon, 11 Sep 2017 21:41:01 +0000 (09:41 +1200)]
Merge pull request #10973 from civicrm/4.7.25-rc
4.7.25 rc
Tim Otten [Mon, 11 Sep 2017 21:35:39 +0000 (14:35 -0700)]
Merge pull request #10963 from eileenmcnaughton/cleanup
[NFC] comments clean up in test classes.
Eileen McNaughton [Mon, 11 Sep 2017 21:27:42 +0000 (09:27 +1200)]
Merge pull request #10972 from totten/4.7.25-rc-tpl
CRM-18231 - Cleanup `environment` example in `civicrm.settings.php.template`
Tim Otten [Mon, 11 Sep 2017 18:45:35 +0000 (11:45 -0700)]
CRM-18231 - civicrm.settings.php.template - Remove extra whitespace
Tim Otten [Mon, 11 Sep 2017 18:42:34 +0000 (11:42 -0700)]
CRM-18231 - civicrm.settings.php.template - Move `global` declaration
When using the example snippets in the settings file, it's easy to
accidentally leave `global $civicrm_setting` commented out -- which is
fairly confusing/mysterious way to have your settings ignored.
There's no cost to declaring `global $civicrm_setting` by default in new
config files.
Tim Otten [Mon, 11 Sep 2017 18:40:26 +0000 (11:40 -0700)]
CRM-18231 - civicrm.settings.php.template - Fix broken `environment` example
The expression `CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME` does not
work within `civicrm.settings.php` because the classloader has not been
initialized yet. This file is just supposed to store the data needed for
bootstrap.
Monish Deb [Mon, 11 Sep 2017 12:57:08 +0000 (18:27 +0530)]
Merge pull request #10922 from eileenmcnaughton/tpl
CRM-21125 allow class assignment on report row links
Monish Deb [Mon, 11 Sep 2017 12:40:27 +0000 (18:10 +0530)]
Merge pull request #10969 from yashodha/CRM-21172
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
yashodha [Mon, 11 Sep 2017 09:32:11 +0000 (15:02 +0530)]
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
Eileen McNaughton [Mon, 11 Sep 2017 09:11:24 +0000 (21:11 +1200)]
Merge pull request #10968 from civicrm/4.7.25-rc
4.7.25 rc
Monish Deb [Mon, 11 Sep 2017 09:08:29 +0000 (14:38 +0530)]
Merge pull request #10936 from seamuslee001/CRM-18231
CRM-18231 Remove need for define statement and replace with new setti…
Seamus Lee [Mon, 4 Sep 2017 01:31:10 +0000 (11:31 +1000)]
CRM-18231 Remove need for define statement and replace with new setting not settable in UI and always use settings to get information
Switch to getMandatory function as per Tim's comment
Eileen McNaughton [Mon, 11 Sep 2017 07:35:42 +0000 (19:35 +1200)]
Merge pull request #10953 from seamuslee001/CRM-20892
CRM-20892 Add in modified_date column to civicrm_mailing to assist in…
Seamus Lee [Mon, 11 Sep 2017 05:43:57 +0000 (15:43 +1000)]
CRM-20892 Fix issue where saving to the database wasn't creating a new modified_date
Seamus Lee [Sun, 10 Sep 2017 03:50:42 +0000 (13:50 +1000)]
CRM-20892 Convert Created_date to default NULL and add in trigger to set it
Remove duplicate was
Move field around in table definition as per Eileen's comment
Seamus Lee [Wed, 6 Sep 2017 21:04:38 +0000 (07:04 +1000)]
CRM-20892 Add in modified_date column to civicrm_mailing to assist in preventing cross edit of mailings
Eileen McNaughton [Sun, 10 Sep 2017 22:59:17 +0000 (10:59 +1200)]
Merge pull request #10954 from seamuslee001/CRM-21157
CRM-21157 Convert civicrm_subscription_history.date column to be time…
eileen [Sun, 10 Sep 2017 22:47:30 +0000 (10:47 +1200)]
[NFC] comments clean up in test classes.
Also remove a few unused variables
Eileen McNaughton [Sun, 10 Sep 2017 21:48:32 +0000 (09:48 +1200)]
Merge pull request #10947 from JMAConsulting/CRM-21133
CRM-21133: Price set error with NULL financial types
colemanw [Sun, 10 Sep 2017 01:29:30 +0000 (21:29 -0400)]
Merge pull request #10957 from coldrunKacper/CRM-20630-change-activity-form-to-accept-url-search-parameters
CRM-20630: Modifying CRM_Activity_Form_Search to use URL parameters as search form values when passing force=1.
Mathieu Lu [Sat, 9 Sep 2017 21:31:27 +0000 (17:31 -0400)]
Merge pull request #10959 from mlutfy/cleanup-pcp
templates/CRM/PCP/Form/Campaign.tpl: remove comment (not relevant).
Mathieu Lutfy [Sat, 9 Sep 2017 20:43:17 +0000 (16:43 -0400)]
templates/CRM/PCP/Form/Campaign.tpl: remove comment (not relevant).
coldrunKacper [Fri, 8 Sep 2017 15:25:26 +0000 (17:25 +0200)]
CRM-20630: Fixing indentations.
coldrunKacper [Fri, 8 Sep 2017 14:55:45 +0000 (16:55 +0200)]
CRM-20630: Modifying CRM_Activity_Form_Search to use URL parameters as search form values when passing force=1.
Eileen McNaughton [Fri, 8 Sep 2017 02:53:36 +0000 (14:53 +1200)]
Merge pull request #10826 from jitendrapurohit/CRM-21038
CRM-21038 - select default processor if displayed by amount selection.
Seamus Lee [Thu, 7 Sep 2017 20:38:34 +0000 (06:38 +1000)]
CRM-21157 date column information into array of converted columns in System Check
Seamus Lee [Thu, 7 Sep 2017 01:03:28 +0000 (11:03 +1000)]
CRM-21157 Convert civicrm_subscription_history.date column to be timestamp rather than datetime to help with timezone issues
Monish Deb [Thu, 7 Sep 2017 13:29:10 +0000 (18:59 +0530)]
Merge pull request #10883 from mickadoo/CRM-21086-allow-inline-file-view
CRM-21086: Allow Inline Download of Files
Monish Deb [Thu, 7 Sep 2017 13:05:58 +0000 (18:35 +0530)]
Merge pull request #10911 from lcdservices/CRM-21113
CRM-21113: find case - search by id, subject
Eileen McNaughton [Thu, 7 Sep 2017 06:01:42 +0000 (18:01 +1200)]
Merge pull request #10904 from seamuslee001/CRM-21106
CRM-21106 Add Warnings about new required extension to support Financ…
Eileen McNaughton [Thu, 7 Sep 2017 05:58:26 +0000 (17:58 +1200)]
Merge pull request #10955 from fuzionnz/typofix_in_deprecation
Correct spelling.
CiviCRM [Thu, 7 Sep 2017 05:35:30 +0000 (05:35 +0000)]
Set version to 4.7.26
Tim Otten [Thu, 7 Sep 2017 03:59:20 +0000 (20:59 -0700)]
Merge pull request #10956 from civicrm/4.7.24-rc
4.7.24 rc
Tim Otten [Thu, 7 Sep 2017 03:11:08 +0000 (20:11 -0700)]
Merge pull request #10897 from agh1/4.7.24-releasenotes
4.7.24 release notes
Chris Burgess [Thu, 7 Sep 2017 02:24:55 +0000 (14:24 +1200)]
Correct spelling.
Andrew Hunt [Wed, 6 Sep 2017 23:25:33 +0000 (19:25 -0400)]
4.7.24 Release notes: contributors
Andrew Hunt [Wed, 6 Sep 2017 23:09:18 +0000 (19:09 -0400)]
Release notes 4.7.24: edits and reorganization
Coleman Watts [Wed, 6 Sep 2017 22:24:37 +0000 (18:24 -0400)]
Remove unnecessary line
Andrew Hunt [Wed, 6 Sep 2017 22:01:09 +0000 (18:01 -0400)]
Merge pull request #3 from alifrumin/4.7.24-releasenotes
4.7.24 releasenotes edits
Seamus Lee [Sun, 27 Aug 2017 08:29:38 +0000 (18:29 +1000)]
CRM-21106 Add Warnings about new required extension to support Financial Type ACLs in reports
CRM-21106 Make language less urgent indicating it will in the futre need the extension
Alice Frumin [Wed, 6 Sep 2017 21:24:39 +0000 (17:24 -0400)]
cleaning up and dealing with documentation of bigger changes
Alice Frumin [Wed, 6 Sep 2017 20:04:50 +0000 (16:04 -0400)]
moving around issues between bugs and features
colemanw [Wed, 6 Sep 2017 18:35:55 +0000 (14:35 -0400)]
Merge pull request #10754 from totten/master-actcase-ts
CRM-20958 - Track creation+modification times for activities+cases
Tim Otten [Thu, 3 Aug 2017 22:15:28 +0000 (15:15 -0700)]
CRM-20958 - api_v3_CaseTest::testCaseUpdate - Style tweak
Tim Otten [Wed, 2 Aug 2017 21:19:00 +0000 (14:19 -0700)]
CRM-20958 - TimestampTriggers - Update docblock
Tim Otten [Tue, 1 Aug 2017 02:55:18 +0000 (19:55 -0700)]
CRM-20958 - api_v3_CaseTest::testCaseUpdate - Ignore creation/modification date.
Checking the `modified_date` is a bit racy -- depending on sub-second
performance/alignment, the original `Case` creation and the subsequent
`Case` update may have the same `modified_date` or may have different
`modified_date`.
Tim Otten [Fri, 18 Aug 2017 04:45:57 +0000 (21:45 -0700)]
CRM-20958 - Health check - If NULL timestamps are still around, show link to DoctorWhen
Tim Otten [Fri, 28 Jul 2017 04:10:30 +0000 (21:10 -0700)]
CRM-20958 - Case, Activity BAOs - Watch out for saving stale timestamps
There appears to be some application logic which follows a process like this:
1. Read the case
2. Tweak the data
3. Save updated case
The problem is comes if step #4 resaves a timestamp loaded in step #1, which
is fairly likely to happen if you read+save the same record.
This was specifically observed on the "Manage Case" screen when editing
activities, but the data-flow is pretty common, so make a general fix to the
BAO.
Tim Otten [Fri, 28 Jul 2017 04:09:26 +0000 (21:09 -0700)]
CRM-20958 - api_v3_CaseTest - Add test for timestamp management
Tim Otten [Thu, 27 Jul 2017 01:58:43 +0000 (18:58 -0700)]
CRM-20958 - api_v3_ActivityTest::testActivityCreateExample - Ignore creation/modification date.
The technique of using hard-coded example record doesn't work with this data.
Tim Otten [Thu, 27 Jul 2017 03:40:26 +0000 (20:40 -0700)]
CRM-20958 - Create case-activity triggers (to update case when activity changes)
Tim Otten [Thu, 27 Jul 2017 01:42:54 +0000 (18:42 -0700)]
CRM-20958 - Create activity and case triggers
Tim Otten [Thu, 27 Jul 2017 03:40:02 +0000 (20:40 -0700)]
CRM-20958 - Add helper Civi\Core\SqlTrigger\StaticTriggers
Tim Otten [Thu, 27 Jul 2017 01:08:20 +0000 (18:08 -0700)]
CRM-20958 - Extract helper Civi\Core\SqlTrigger\TimestampTriggers
== Before ==
* SQL triggers to populate `civicrm_contact.created_date` and `civicrm_contact.modified_date` are
generate via `CRM_Contact_BAO_Contact::triggerInfo($info, $tableName)`
== After ==
* `CRM_Contact_BAO_Contact::triggerInfo` calls a helper `TimestampTriggers`
* The helper `TimestampTriggers` accepts arguments describing the names of the tables/columns
which needed for the timestamp triggers.
== Comments ==
To test, I used this command to update and dump the schema:
```
cv api system.flush triggers=1 && mysqldump --triggers ...
```
The schema was identical before and after. (Notably, by alternately hacking
the code, I was able to validate the test was capable of revealing
discrepencies.)
Tim Otten [Tue, 25 Jul 2017 06:13:15 +0000 (23:13 -0700)]
CRM-20958 - On upgrade, declare created/modified timestamps for case+activity
Tim Otten [Tue, 25 Jul 2017 06:10:12 +0000 (23:10 -0700)]
CRM-20958 - Declare created/modified timestamps for case+activity
Brian Shaughnessy [Wed, 6 Sep 2017 15:39:53 +0000 (11:39 -0400)]
CRM-21113: find cases -- use tag multi-select widget
Andrew Hunt [Thu, 24 Aug 2017 02:57:21 +0000 (22:57 -0400)]
4.7.24 release notes: boilerplate added
Andrew Hunt [Wed, 6 Sep 2017 14:22:57 +0000 (10:22 -0400)]
4.7.24 release notes: raw from script
deb.monish [Wed, 6 Sep 2017 10:16:22 +0000 (15:46 +0530)]
additional fix
deb.monish [Tue, 5 Sep 2017 19:28:30 +0000 (00:58 +0530)]
CRM-21133: Price set error with NULL financial types
Eileen McNaughton [Wed, 6 Sep 2017 04:16:02 +0000 (16:16 +1200)]
Merge pull request #10908 from jitendrapurohit/CRM-20533
CRM-20533 - Drop false indices directly from update indices button
Eileen McNaughton [Wed, 6 Sep 2017 04:13:59 +0000 (16:13 +1200)]
Merge pull request #10950 from totten/master-setstk-doc
(NFC) SettingsStack - Finish incomplete docblock
Tim Otten [Wed, 6 Sep 2017 03:19:48 +0000 (20:19 -0700)]
(NFC) SettingsStack - Finish incomplete docblock
Eileen McNaughton [Wed, 6 Sep 2017 02:43:06 +0000 (14:43 +1200)]
Merge pull request #10949 from civicrm/4.7.24-rc
4.7.24 rc merge
Eileen McNaughton [Wed, 6 Sep 2017 02:01:37 +0000 (14:01 +1200)]
Merge pull request #10948 from colemanw/CRM-20941
CRM-20941 - Display correct version number in upgrade message
Coleman Watts [Wed, 6 Sep 2017 01:08:43 +0000 (21:08 -0400)]
CRM-20941 - Add punctuation to the end of sentences.
Coleman Watts [Wed, 6 Sep 2017 01:05:10 +0000 (21:05 -0400)]
CRM-20941 - Display correct version number in upgrade message
Eileen McNaughton [Wed, 6 Sep 2017 00:55:08 +0000 (12:55 +1200)]
Merge pull request #10907 from seamuslee001/CRM-21110
CRM-21110 Do not run same/similar query twice when generating Relatio…
Eileen McNaughton [Tue, 5 Sep 2017 22:10:31 +0000 (10:10 +1200)]
Merge pull request #10944 from mattwire/CRM-21152_membership_status_spec
CRM-21152 Add spec for MembershipStatus.calc API function
Eileen McNaughton [Tue, 5 Sep 2017 22:08:57 +0000 (10:08 +1200)]
Merge pull request #9783 from mattwire/back_to_single_lang
CRM-19968 SQL tweaks to make it more likely that reverting to single language w…
Tim Otten [Tue, 5 Sep 2017 16:22:09 +0000 (09:22 -0700)]
Merge pull request #10945 from mattwire/nfc_changes
CRM-21153 NFC Fix mispelled variable
Matthew Wire [Thu, 17 Aug 2017 20:00:43 +0000 (21:00 +0100)]
Fix mispelled variable
Matthew Wire [Tue, 5 Sep 2017 14:04:09 +0000 (15:04 +0100)]
Add spec for MembershipStatus.calc API function
Eileen McNaughton [Tue, 5 Sep 2017 02:32:44 +0000 (14:32 +1200)]
Merge pull request #10940 from seamuslee001/CRM-20769-fields
CRM-20769 Add in columns to support customising profile buttons
Seamus Lee [Tue, 5 Sep 2017 00:41:32 +0000 (10:41 +1000)]
CRM-20769 Add in columns to support customising profile buttons
Eileen McNaughton [Tue, 5 Sep 2017 01:11:50 +0000 (13:11 +1200)]
Merge pull request #10926 from MegaphoneJon/CRM-21121
CRM-21121 - Fix crash with sql_mode is only_full_group_by
Tim Otten [Mon, 4 Sep 2017 22:17:05 +0000 (15:17 -0700)]
Merge pull request #10938 from eileenmcnaughton/deltest
Reinstate accidentally deleted test.
Eileen McNaughton [Mon, 4 Sep 2017 21:26:07 +0000 (09:26 +1200)]
Merge pull request #10939 from MegaphoneJon/xml-install
CRM-21142 - CiviCRM installer - Check for XML module before install
Jon goldberg [Mon, 4 Sep 2017 19:02:33 +0000 (15:02 -0400)]
Better labeling of XML requirement
Monish Deb [Mon, 4 Sep 2017 17:41:18 +0000 (23:11 +0530)]
Merge pull request #10719 from JKingsnorth/CRM-20935
CRM-20935 Remove related profile links when event deleted
Jon goldberg [Mon, 4 Sep 2017 16:00:33 +0000 (12:00 -0400)]
Check for XML module before install
JKingsnorth [Mon, 4 Sep 2017 13:20:10 +0000 (14:20 +0100)]
CRM-20935 Remove related profile links when event deleted
eileen [Mon, 4 Sep 2017 13:14:52 +0000 (01:14 +1200)]
Reinstate accidentally deleted test.
This got deleted in renaming a file, re-adding
Monish Deb [Mon, 4 Sep 2017 11:38:01 +0000 (17:08 +0530)]
Merge pull request #10915 from eileenmcnaughton/primary
CRM-20855: Disabling "Search Primary Details Only" causes partial CiviMail delivery failure
deb.monish [Mon, 24 Jul 2017 20:16:38 +0000 (01:46 +0530)]
CRM-20855: Disabling "Search Primary Details Only" causes partial CiviMail delivery failure
CRM-20855: Adjust variables for clarity
I'm concerned about the use of $apiEntity to mean 'do something unconnected' so suggest
a specific paramteter.
Eileen McNaughton [Mon, 4 Sep 2017 04:57:54 +0000 (16:57 +1200)]
Merge pull request #10785 from kenwest/CRM-20982
CRM-20982 Configure the SMTP mailer to identify itself to the SMTP se…
colemanw [Mon, 4 Sep 2017 04:29:22 +0000 (00:29 -0400)]
Merge pull request #10937 from colemanw/CRM-21139
CRM-21139 - Add crm-i.css to common/fatal.tpl
Coleman Watts [Mon, 4 Sep 2017 03:45:02 +0000 (23:45 -0400)]
CRM-21139 - Add crm-i.css to common/fatal.tpl
colemanw [Mon, 4 Sep 2017 01:33:34 +0000 (21:33 -0400)]
Merge pull request #10929 from seamuslee001/CRM-20237
CRM-20237 Don't add in extra copy of ids and only use most recent id …
Eileen McNaughton [Sun, 3 Sep 2017 21:42:37 +0000 (09:42 +1200)]
Merge pull request #8724 from JMAConsulting/CRM-18231
CRM-18231 Environment variables
Eileen McNaughton [Fri, 1 Sep 2017 23:08:40 +0000 (11:08 +1200)]
Merge pull request #10933 from civicrm/4.7.24-rc
4.7.24 rc
colemanw [Fri, 1 Sep 2017 14:34:37 +0000 (10:34 -0400)]
Merge pull request #10932 from jitendrapurohit/CRM-21135-rcfix
CRM-21135 - Activity filter preference are not remembered when enable…
Jitendra Purohit [Fri, 1 Sep 2017 10:53:17 +0000 (16:23 +0530)]
CRM-21135 - Activity filter preference are not remembered when enabled in display settings
deb.monish [Tue, 29 Aug 2017 07:36:41 +0000 (13:06 +0530)]
QA fixes
Yashodha Chaku [Fri, 1 Sep 2017 03:15:07 +0000 (08:45 +0530)]
CRM-21130 - Search builder throws error if location type has space (#10928)
* CRM-21130 - Search builder throws error if location type has space
* minor fixes
Seamus Lee [Fri, 1 Sep 2017 02:05:11 +0000 (12:05 +1000)]
Update tests following changes by Eileen
eileen [Fri, 1 Sep 2017 01:34:26 +0000 (13:34 +1200)]
CRM-20237 keep some of original name in name field
Alar [Fri, 1 Sep 2017 01:56:06 +0000 (03:56 +0200)]
CRM-21128 Personal Campaign Page selection with force=1 in Find Contributions (#8997)
* Personal Campaign can now be passed in force mode
Passing pcpid=n with force=1 alloow to search on corresponding Personal
Campaign id
* Improves parameter passing
Now cope with both single value form (pcpid=n) and multivalue form
(pcpid[]=n&pcpid[]=m)
* Removed useless ++$n
* Fixed checkstyle warnings
* Operator spacing and comment indentation
Seamus Lee [Fri, 1 Sep 2017 00:43:50 +0000 (10:43 +1000)]
CRM-20237 Don't add in extra copy of ids and only use most recent id copied from in title and don't put copy of details in name for pricesets