civicrm-core.git
6 years agoDo not try to write civicrm_menu.module_data if it doesn't exist yet
Noah Miller [Tue, 12 Sep 2017 03:29:53 +0000 (20:29 -0700)]
Do not try to write civicrm_menu.module_data if it doesn't exist yet

6 years agoMerge pull request #10972 from totten/4.7.25-rc-tpl
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`

6 years agoCRM-18231 - civicrm.settings.php.template - Remove extra whitespace
Tim Otten [Mon, 11 Sep 2017 18:45:35 +0000 (11:45 -0700)]
CRM-18231 - civicrm.settings.php.template - Remove extra whitespace

6 years agoCRM-18231 - civicrm.settings.php.template - Move `global` declaration
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.

6 years agoCRM-18231 - civicrm.settings.php.template - Fix broken `environment` example
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.

6 years agoMerge pull request #10936 from seamuslee001/CRM-18231
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…

6 years agoCRM-18231 Remove need for define statement and replace with new setting not settable...
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

6 years agoMerge pull request #10956 from civicrm/4.7.24-rc
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

6 years agoMerge pull request #10897 from agh1/4.7.24-releasenotes
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

6 years ago4.7.24 Release notes: contributors
Andrew Hunt [Wed, 6 Sep 2017 23:25:33 +0000 (19:25 -0400)]
4.7.24 Release notes: contributors

6 years agoRelease notes 4.7.24: edits and reorganization
Andrew Hunt [Wed, 6 Sep 2017 23:09:18 +0000 (19:09 -0400)]
Release notes 4.7.24: edits and reorganization

6 years agoRemove unnecessary line
Coleman Watts [Wed, 6 Sep 2017 22:24:37 +0000 (18:24 -0400)]
Remove unnecessary line

6 years agoMerge pull request #3 from alifrumin/4.7.24-releasenotes
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

6 years agocleaning up and dealing with documentation of bigger changes
Alice Frumin [Wed, 6 Sep 2017 21:24:39 +0000 (17:24 -0400)]
cleaning up and dealing with documentation of bigger changes

6 years agomoving around issues between bugs and features
Alice Frumin [Wed, 6 Sep 2017 20:04:50 +0000 (16:04 -0400)]
moving around issues between bugs and features

6 years agoMerge pull request #10754 from totten/master-actcase-ts
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

6 years agoCRM-20958 - api_v3_CaseTest::testCaseUpdate - Style tweak
Tim Otten [Thu, 3 Aug 2017 22:15:28 +0000 (15:15 -0700)]
CRM-20958 - api_v3_CaseTest::testCaseUpdate - Style tweak

6 years agoCRM-20958 - TimestampTriggers - Update docblock
Tim Otten [Wed, 2 Aug 2017 21:19:00 +0000 (14:19 -0700)]
CRM-20958 - TimestampTriggers - Update docblock

6 years agoCRM-20958 - api_v3_CaseTest::testCaseUpdate - Ignore creation/modification date.
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`.

6 years agoCRM-20958 - Health check - If NULL timestamps are still around, show link to DoctorWhen
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

6 years agoCRM-20958 - Case, Activity BAOs - Watch out for saving stale timestamps
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.

6 years agoCRM-20958 - api_v3_CaseTest - Add test for timestamp management
Tim Otten [Fri, 28 Jul 2017 04:09:26 +0000 (21:09 -0700)]
CRM-20958 - api_v3_CaseTest - Add test for timestamp management

6 years agoCRM-20958 - api_v3_ActivityTest::testActivityCreateExample - Ignore creation/modifica...
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.

6 years agoCRM-20958 - Create case-activity triggers (to update case when activity changes)
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)

6 years agoCRM-20958 - Create activity and case triggers
Tim Otten [Thu, 27 Jul 2017 01:42:54 +0000 (18:42 -0700)]
CRM-20958 - Create activity and case triggers

6 years agoCRM-20958 - Add helper Civi\Core\SqlTrigger\StaticTriggers
Tim Otten [Thu, 27 Jul 2017 03:40:02 +0000 (20:40 -0700)]
CRM-20958 - Add helper Civi\Core\SqlTrigger\StaticTriggers

6 years agoCRM-20958 - Extract helper Civi\Core\SqlTrigger\TimestampTriggers
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.)

6 years agoCRM-20958 - On upgrade, declare created/modified timestamps for case+activity
Tim Otten [Tue, 25 Jul 2017 06:13:15 +0000 (23:13 -0700)]
CRM-20958 - On upgrade, declare created/modified timestamps for case+activity

6 years agoCRM-20958 - 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

6 years ago4.7.24 release notes: boilerplate added
Andrew Hunt [Thu, 24 Aug 2017 02:57:21 +0000 (22:57 -0400)]
4.7.24 release notes: boilerplate added

6 years ago4.7.24 release notes: raw from script
Andrew Hunt [Wed, 6 Sep 2017 14:22:57 +0000 (10:22 -0400)]
4.7.24 release notes: raw from script

6 years agoMerge pull request #10908 from jitendrapurohit/CRM-20533
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

6 years agoMerge pull request #10950 from totten/master-setstk-doc
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

6 years ago(NFC) SettingsStack - Finish incomplete docblock
Tim Otten [Wed, 6 Sep 2017 03:19:48 +0000 (20:19 -0700)]
(NFC) SettingsStack - Finish incomplete docblock

6 years agoMerge pull request #10949 from civicrm/4.7.24-rc
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

6 years agoMerge pull request #10948 from colemanw/CRM-20941
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

6 years agoCRM-20941 - Add punctuation to the end of sentences.
Coleman Watts [Wed, 6 Sep 2017 01:08:43 +0000 (21:08 -0400)]
CRM-20941 - Add punctuation to the end of sentences.

6 years agoCRM-20941 - Display correct version number in upgrade message
Coleman Watts [Wed, 6 Sep 2017 01:05:10 +0000 (21:05 -0400)]
CRM-20941 - Display correct version number in upgrade message

6 years agoMerge pull request #10907 from seamuslee001/CRM-21110
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…

6 years agoMerge pull request #10944 from mattwire/CRM-21152_membership_status_spec
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

6 years agoMerge pull request #9783 from mattwire/back_to_single_lang
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…

6 years agoMerge pull request #10945 from mattwire/nfc_changes
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

6 years agoFix mispelled variable
Matthew Wire [Thu, 17 Aug 2017 20:00:43 +0000 (21:00 +0100)]
Fix mispelled variable

6 years agoAdd spec for MembershipStatus.calc API function
Matthew Wire [Tue, 5 Sep 2017 14:04:09 +0000 (15:04 +0100)]
Add spec for MembershipStatus.calc API function

6 years agoMerge pull request #10940 from seamuslee001/CRM-20769-fields
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

6 years agoCRM-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

6 years agoMerge pull request #10926 from MegaphoneJon/CRM-21121
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

6 years agoMerge pull request #10938 from eileenmcnaughton/deltest
Tim Otten [Mon, 4 Sep 2017 22:17:05 +0000 (15:17 -0700)]
Merge pull request #10938 from eileenmcnaughton/deltest

Reinstate accidentally deleted test.

6 years agoMerge pull request #10939 from MegaphoneJon/xml-install
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

6 years agoBetter labeling of XML requirement
Jon goldberg [Mon, 4 Sep 2017 19:02:33 +0000 (15:02 -0400)]
Better labeling of XML requirement

6 years agoMerge pull request #10719 from JKingsnorth/CRM-20935
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

6 years agoCheck for XML module before install
Jon goldberg [Mon, 4 Sep 2017 16:00:33 +0000 (12:00 -0400)]
Check for XML module before install

6 years agoCRM-20935 Remove related profile links when event deleted
JKingsnorth [Mon, 4 Sep 2017 13:20:10 +0000 (14:20 +0100)]
CRM-20935 Remove related profile links when event deleted

6 years agoReinstate accidentally deleted test.
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

6 years agoMerge pull request #10915 from eileenmcnaughton/primary
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

6 years agoCRM-20855: Disabling "Search Primary Details Only" causes partial CiviMail delivery...
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.

6 years agoMerge pull request #10785 from kenwest/CRM-20982
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…

6 years agoMerge pull request #10937 from colemanw/CRM-21139
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

6 years agoCRM-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

6 years agoMerge pull request #10929 from seamuslee001/CRM-20237
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 …

6 years agoMerge pull request #8724 from JMAConsulting/CRM-18231
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

6 years agoMerge pull request #10933 from civicrm/4.7.24-rc
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

6 years agoMerge pull request #10932 from jitendrapurohit/CRM-21135-rcfix
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…

6 years agoCRM-21135 - Activity filter preference are not remembered when enabled in display...
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

6 years agoQA fixes
deb.monish [Tue, 29 Aug 2017 07:36:41 +0000 (13:06 +0530)]
QA fixes

6 years agoCRM-21130 - Search builder throws error if location type has space (#10928)
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

6 years agoUpdate tests following changes by Eileen
Seamus Lee [Fri, 1 Sep 2017 02:05:11 +0000 (12:05 +1000)]
Update tests following changes by Eileen

6 years agoCRM-20237 keep some of original name in name field
eileen [Fri, 1 Sep 2017 01:34:26 +0000 (13:34 +1200)]
CRM-20237 keep some of original name in name field

6 years agoCRM-21128 Personal Campaign Page selection with force=1 in Find Contributions (#8997)
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

6 years agoCRM-20237 Don't add in extra copy of ids and only use most recent id copied from...
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

6 years agoMerge pull request #10831 from MiyaNoctem/CRM-20858-fix-merge-of-unselected-custom...
Eileen McNaughton [Thu, 31 Aug 2017 21:31:53 +0000 (09:31 +1200)]
Merge pull request #10831 from MiyaNoctem/CRM-20858-fix-merge-of-unselected-custom-fields

CRM-20858: Fix Merging of Unselected Custom Fields

6 years agoadditional fixes
deb.monish [Tue, 29 Aug 2017 05:11:25 +0000 (10:41 +0530)]
additional fixes

6 years agoCRM-18231 Added settings on developer page
Edsel [Mon, 14 Mar 2016 10:41:00 +0000 (16:11 +0530)]
CRM-18231 Added settings on developer page

6 years agoMerge pull request #10923 from jitendrapurohit/CRM-21126
Monish Deb [Thu, 31 Aug 2017 20:20:14 +0000 (01:50 +0530)]
Merge pull request #10923 from jitendrapurohit/CRM-21126

CRM-21126: fix default selection of member_is_primary input

6 years agoMerge pull request #10921 from eileenmcnaughton/cachekey
Monish Deb [Thu, 31 Aug 2017 19:59:43 +0000 (01:29 +0530)]
Merge pull request #10921 from eileenmcnaughton/cachekey

CRM-21124 fix error on cacheKey when too long

6 years agoMerge pull request #10731 from eileenmcnaughton/pref_comm
Monish Deb [Thu, 31 Aug 2017 19:49:20 +0000 (01:19 +0530)]
Merge pull request #10731 from eileenmcnaughton/pref_comm

CRM-19933 proposed fix for import wiping out preferred comm method (possibly CRM-20035 too)

6 years agoMerge pull request #10890 from eileenmcnaughton/dedupe
colemanw [Thu, 31 Aug 2017 19:03:09 +0000 (15:03 -0400)]
Merge pull request #10890 from eileenmcnaughton/dedupe

Towards CRM-20155 clean up form code in order to consolidate function…

7 years agoCRM-20858: Remove Uneeded Variable
Camilo Rodriguez [Thu, 31 Aug 2017 13:38:12 +0000 (13:38 +0000)]
CRM-20858: Remove Uneeded Variable

7 years agoCRM-19933 proposed fix for import wiping out preferred comm method
eileen [Mon, 24 Jul 2017 01:51:45 +0000 (13:51 +1200)]
CRM-19933 proposed fix for import wiping out preferred comm method

7 years agomodify check to 0 or 1
Jitendra Purohit [Thu, 31 Aug 2017 08:32:08 +0000 (14:02 +0530)]
modify check to 0 or 1

7 years agoCRM-21121 - Fix crash with sql_mode is only_full_group_by
Jon goldberg [Thu, 31 Aug 2017 04:21:38 +0000 (00:21 -0400)]
CRM-21121 - Fix crash with sql_mode is only_full_group_by

7 years agoMerge pull request #10924 from MegaphoneJon/CRM-21129
Eileen McNaughton [Thu, 31 Aug 2017 02:28:54 +0000 (14:28 +1200)]
Merge pull request #10924 from MegaphoneJon/CRM-21129

CRM-21129 - CLI API CSV import doesn't allow single-column CSVs

7 years agoMerge pull request #10757 from jitendrapurohit/CRM-20964
Monish Deb [Wed, 30 Aug 2017 20:14:34 +0000 (01:44 +0530)]
Merge pull request #10757 from jitendrapurohit/CRM-20964

CRM-20964: Include queue id while retrieving rows from Event Queue

7 years agoCRM-21129 - CLI API CSV import doesn't allow single-column CSVs
Jon goldberg [Wed, 30 Aug 2017 18:47:16 +0000 (14:47 -0400)]
CRM-21129 - CLI API CSV import doesn't allow single-column CSVs

7 years agoCRM-21126: fix default selection of member_is_primary input
Jitendra Purohit [Wed, 30 Aug 2017 09:42:44 +0000 (15:12 +0530)]
CRM-21126: fix default selection of member_is_primary input

7 years agoCRM-21124 fix error on cacheKey when too long
eileen [Wed, 30 Aug 2017 05:19:17 +0000 (17:19 +1200)]
CRM-21124 fix error on cacheKey when too long

7 years agoMerge pull request #10734 from jitendrapurohit/CRM-20949
Eileen McNaughton [Wed, 30 Aug 2017 02:57:51 +0000 (14:57 +1200)]
Merge pull request #10734 from jitendrapurohit/CRM-20949

CRM-20949 - Fix payment processor assignment

7 years agoMerge pull request #10886 from eileenmcnaughton/task
Tim Otten [Tue, 29 Aug 2017 20:51:44 +0000 (13:51 -0700)]
Merge pull request #10886 from eileenmcnaughton/task

NFC remove some unused vars, fix comment

7 years agoMerge pull request #10906 from MegaphoneJon/CRM-21108-2
Monish Deb [Tue, 29 Aug 2017 20:48:41 +0000 (02:18 +0530)]
Merge pull request #10906 from MegaphoneJon/CRM-21108-2

CRM-21108 - Greatly improve performance of adding contacts

7 years agoMerge pull request #10916 from eileenmcnaughton/permission_problem_address_get
colemanw [Tue, 29 Aug 2017 17:50:26 +0000 (13:50 -0400)]
Merge pull request #10916 from eileenmcnaughton/permission_problem_address_get

CRM-20027 add test for locBlock permission issue

7 years agoMerge pull request #10917 from mattwire/CRM-21118_messagetemplate_buttons_at_top
Eileen McNaughton [Tue, 29 Aug 2017 10:32:19 +0000 (22:32 +1200)]
Merge pull request #10917 from mattwire/CRM-21118_messagetemplate_buttons_at_top

CRM-21118 Add action links at top of page on message template overview

7 years agoMerge pull request #10585 from JMAConsulting/CRM-17748
Eileen McNaughton [Tue, 29 Aug 2017 10:29:32 +0000 (22:29 +1200)]
Merge pull request #10585 from JMAConsulting/CRM-17748

[ready for core team review] CRM-17748: Expose options to CRM_Core_DAO

7 years agoCRM-20027 add test for locBlock permission issue
eileen [Tue, 29 Aug 2017 08:21:15 +0000 (20:21 +1200)]
CRM-20027 add test for locBlock permission issue

7 years agoMerge pull request #9973 from lcdservices/CRM-19469
Eileen McNaughton [Tue, 29 Aug 2017 09:20:45 +0000 (21:20 +1200)]
Merge pull request #9973 from lcdservices/CRM-19469

CRM-19469 support returning payment params after mapping

7 years agoAdd action links at top of page
Matthew Wire [Tue, 29 Aug 2017 09:15:58 +0000 (10:15 +0100)]
Add action links at top of page

7 years agoDrop Table before returning from function
Seamus Lee [Tue, 29 Aug 2017 04:19:09 +0000 (14:19 +1000)]
Drop Table before returning from function

Include word temporary hopefully appeases jenkins

7 years agoMerge pull request #10780 from jitendrapurohit/CRM-20979
Eileen McNaughton [Tue, 29 Aug 2017 08:01:00 +0000 (20:01 +1200)]
Merge pull request #10780 from jitendrapurohit/CRM-20979

CRM-20979 -  expose pre help for price fields to the UI

7 years agoMerge pull request #10874 from totten/master-ts-warn
Eileen McNaughton [Tue, 29 Aug 2017 03:00:02 +0000 (15:00 +1200)]
Merge pull request #10874 from totten/master-ts-warn

CRM-21079, CRM-9683 - Display advisories about DATETIME/TIMESTAMP columns

7 years agoMerge pull request #10730 from eileenmcnaughton/test_name
Eileen McNaughton [Tue, 29 Aug 2017 02:21:38 +0000 (14:21 +1200)]
Merge pull request #10730 from eileenmcnaughton/test_name

Renamed test class.

7 years agoCRM-21079, CRM-9683 - CRM_Utils_Check - Expand advice
Tim Otten [Tue, 29 Aug 2017 02:03:11 +0000 (19:03 -0700)]
CRM-21079, CRM-9683 - CRM_Utils_Check - Expand advice