civicrm-core.git
6 years agoadd unit test
Jitendra Purohit [Wed, 13 Sep 2017 10:14:41 +0000 (15:44 +0530)]
add unit test

6 years agofixed jenkins style
Pradeep Nayak [Tue, 12 Sep 2017 08:43:41 +0000 (14:13 +0530)]
fixed jenkins style

6 years agoCRM-20276, fixed code to store correct value in financial item table for amount when...
Pradeep Nayak [Mon, 11 Sep 2017 12:58:07 +0000 (18:28 +0530)]
CRM-20276, fixed code to store correct value in financial item table for amount when contribution amount is changed

----------------------------------------
* CRM-20276: When editing a contribution the value in civicrm_financial_item_amount is not updated
  https://issues.civicrm.org/jira/browse/CRM-20276

6 years agofix payment type label
deb.monish [Wed, 13 Sep 2017 08:33:19 +0000 (14:03 +0530)]
fix payment type label

6 years agoadditional fix to load selected payment instrument field on edit
deb.monish [Thu, 31 Aug 2017 19:31:31 +0000 (01:01 +0530)]
additional fix to load selected payment instrument field on edit

6 years agoCRM-20889: Toggle check_number field on backoffice form as payment form fields
deb.monish [Mon, 17 Jul 2017 12:09:12 +0000 (17:39 +0530)]
CRM-20889: Toggle check_number field on backoffice form as payment form fields

6 years agoCRM-20869, removed cruft code for check number
Pradeep Nayak [Thu, 13 Jul 2017 20:02:12 +0000 (01:32 +0530)]
CRM-20869, removed cruft code for check number

----------------------------------------
* CRM-20869: Remove cruft code for check number
  https://issues.civicrm.org/jira/browse/CRM-20869

6 years agoMerge pull request #10976 from eileenmcnaughton/4.7.25-rc
Eileen McNaughton [Wed, 13 Sep 2017 07:41:58 +0000 (19:41 +1200)]
Merge pull request #10976 from eileenmcnaughton/4.7.25-rc

4.7.25 rc

6 years agoMerge branch '4.7.25-rc' of https://github.com/civicrm/civicrm-core
eileen [Wed, 13 Sep 2017 07:35:31 +0000 (19:35 +1200)]
Merge branch '4.7.25-rc' of https://github.com/civicrm/civicrm-core

6 years agoMerge pull request #10975 from eileenmcnaughton/4.7.25-rc
Tim Otten [Tue, 12 Sep 2017 22:08:22 +0000 (15:08 -0700)]
Merge pull request #10975 from eileenmcnaughton/4.7.25-rc

CRM-21175 fix fatal error on multiple custom field import.

6 years agoCRM-21175 fix fatal error on multiple custom field import.
eileen [Tue, 12 Sep 2017 06:53:02 +0000 (18:53 +1200)]
CRM-21175 fix fatal error on multiple custom field import.

Additional test is tangental....

6 years agoMerge pull request #10439 from jitendrapurohit/CRM-20657
Monish Deb [Tue, 12 Sep 2017 16:56:02 +0000 (22:26 +0530)]
Merge pull request #10439 from jitendrapurohit/CRM-20657

CRM-20657: get all participant ids if multiple contacts register from…

6 years agoStore menu item fields other than module_data
Noah Miller [Tue, 12 Sep 2017 14:40:24 +0000 (07:40 -0700)]
Store menu item fields other than module_data

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 #10838 from jmcclelland/CRM-16964
Eileen McNaughton [Tue, 12 Sep 2017 13:00:34 +0000 (01:00 +1200)]
Merge pull request #10838 from jmcclelland/CRM-16964

CRM-16964: ensure FILL works on import with custom fields.

6 years agoMerge pull request #10952 from civicrm/michaelmcandrew-patch-1
Tim Otten [Mon, 11 Sep 2017 21:45:23 +0000 (14:45 -0700)]
Merge pull request #10952 from civicrm/michaelmcandrew-patch-1

Fixing type (missing function call) in example for hook_civicrm_alterAngular

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

6 years agoMerge pull request #10963 from eileenmcnaughton/cleanup
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.

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 #10922 from eileenmcnaughton/tpl
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

6 years agoMerge pull request #10969 from yashodha/CRM-21172
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

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

6 years agoUpdate Hook.php
Michael McAndrew [Mon, 11 Sep 2017 09:27:30 +0000 (10:27 +0100)]
Update Hook.php

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

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 #10953 from seamuslee001/CRM-20892
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…

6 years agoCRM-20892 Fix issue where saving to the database wasn't creating a new modified_date
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

6 years agoCRM-21169 - Fix broken inline edit for profiles
yashodha [Mon, 11 Sep 2017 05:50:12 +0000 (11:20 +0530)]
CRM-21169 - Fix broken inline edit for profiles

6 years agoCRM-20750 follow up.
eileen [Mon, 11 Sep 2017 05:33:37 +0000 (17:33 +1200)]
CRM-20750 follow up.

Change logic for determinig paymentInstrumentChange to look at whether
['payment_instrument_id'] isset. If not it has not been passed by the calling
function and by definition the calling function is not attempting to change it

6 years agoCRM-20750 follow up fix, reversal should be against original account.
eileen [Mon, 11 Sep 2017 02:37:50 +0000 (14:37 +1200)]
CRM-20750 follow up fix, reversal should be against original account.

On trying to investigate why a test change was required in the original PR I came to the following conclusions:

1) the test function was causing problems by being hard to read. As a result it was too easy to see it as
'accounts magic' - I started a cleanup here
2) Once I understood what was being tested & failing I concluded the change in the PR was in fact wrong
as it was putting a negative entry against the new financial account rather than the original one.

6 years agoCRM-20750: Incorrect financial trxn entries when payment instrument is changed on...
deb.monish [Wed, 21 Jun 2017 15:44:58 +0000 (21:14 +0530)]
CRM-20750: Incorrect financial trxn entries when payment instrument is changed on backoffice Contribution edit form

added unit test

CRM-20750, fixed db entries

----------------------------------------
* CRM-20750: Incorrect financial trxn entries when payment instrument is changed on backoffice Contribution edit form
  https://issues.civicrm.org/jira/browse/CRM-20750

6 years agoCRM-20892 Convert Created_date to default NULL and add in trigger to set it
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

6 years agoCRM-20892 Add in modified_date column to civicrm_mailing to assist in preventing...
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

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

6 years ago[NFC] comments clean up in test classes.
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

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

6 years agoMerge pull request #10957 from coldrunKacper/CRM-20630-change-activity-form-to-accept...
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.

6 years agoMerge pull request #10959 from mlutfy/cleanup-pcp
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).

6 years agotemplates/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).

6 years agoCRM-20630: Fixing indentations.
coldrunKacper [Fri, 8 Sep 2017 15:25:26 +0000 (17:25 +0200)]
CRM-20630: Fixing indentations.

6 years agoCRM-20630: Modifying CRM_Activity_Form_Search to use URL parameters as search form...
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.

6 years agoCRM-21160 - Make event_type_id available in event message templates
Jitendra Purohit [Fri, 8 Sep 2017 08:57:29 +0000 (14:27 +0530)]
CRM-21160 - Make event_type_id available in event message templates

6 years agoMerge pull request #10826 from jitendrapurohit/CRM-21038
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.

6 years agoCRM-21157 date column information into array of converted columns in System Check
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

6 years agoCRM-21157 Convert civicrm_subscription_history.date column to be timestamp rather...
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

6 years agoUpdate Hook.php
Michael McAndrew [Thu, 7 Sep 2017 15:28:18 +0000 (16:28 +0100)]
Update Hook.php

6 years agoUpdate Hook.php
Michael McAndrew [Thu, 7 Sep 2017 15:24:34 +0000 (16:24 +0100)]
Update Hook.php

6 years agoMerge pull request #10883 from mickadoo/CRM-21086-allow-inline-file-view
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

6 years agoMerge pull request #10911 from lcdservices/CRM-21113
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

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

6 years agoMerge pull request #10955 from fuzionnz/typofix_in_deprecation
Eileen McNaughton [Thu, 7 Sep 2017 05:58:26 +0000 (17:58 +1200)]
Merge pull request #10955 from fuzionnz/typofix_in_deprecation

Correct spelling.

6 years agoSet version to 4.7.26
CiviCRM [Thu, 7 Sep 2017 05:35:30 +0000 (05:35 +0000)]
Set version to 4.7.26

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 agoCorrect spelling.
Chris Burgess [Thu, 7 Sep 2017 02:24:55 +0000 (14:24 +1200)]
Correct spelling.

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 agoCRM-21106 Add Warnings about new required extension to support Financial Type ACLs...
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

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 agoFixing type (missing function call) in example for hook_civicrm_alterAngular
Michael McAndrew [Wed, 6 Sep 2017 18:47:10 +0000 (19:47 +0100)]
Fixing type (missing function call) in example for hook_civicrm_alterAngular

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 agoCRM-21113: find cases -- use tag multi-select widget
Brian Shaughnessy [Wed, 6 Sep 2017 15:39:53 +0000 (11:39 -0400)]
CRM-21113: find cases -- use tag multi-select widget

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 agoadditional fix
deb.monish [Wed, 6 Sep 2017 10:16:22 +0000 (15:46 +0530)]
additional fix

6 years agoCRM-21133: Price set error with NULL financial types
deb.monish [Tue, 5 Sep 2017 19:28:30 +0000 (00:58 +0530)]
CRM-21133: Price set error with NULL financial types

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