civicrm-core.git
7 years agoCRM-20833: Change api4 entity namespace
mickadoo [Sat, 8 Jul 2017 00:00:11 +0000 (01:00 +0100)]
CRM-20833: Change api4 entity namespace

7 years agoMerge pull request #10621 from agh1/fix-bgm
Tim Otten [Fri, 7 Jul 2017 19:50:41 +0000 (12:50 -0700)]
Merge pull request #10621 from agh1/fix-bgm

Release notes: Mathieu primary affiliation still Coop SymbioTIC

7 years agoRelease notes: Mathieu primary affiliation still Coop SymbioTIC
Andrew Hunt [Fri, 7 Jul 2017 17:22:04 +0000 (13:22 -0400)]
Release notes: Mathieu primary affiliation still Coop SymbioTIC

7 years agoMerge pull request #10619 from francescbassas/patch-11
Monish Deb [Fri, 7 Jul 2017 12:12:15 +0000 (17:42 +0530)]
Merge pull request #10619 from francescbassas/patch-11

Misspelling

7 years agoMerge pull request #10613 from jitendrapurohit/CRM-20823
Monish Deb [Fri, 7 Jul 2017 11:54:06 +0000 (17:24 +0530)]
Merge pull request #10613 from jitendrapurohit/CRM-20823

CRM-20823 : Price Set field with an Expiry Date still being required …

7 years agoMerge pull request #10535 from jitendrapurohit/CRM-20752
Monish Deb [Fri, 7 Jul 2017 11:43:59 +0000 (17:13 +0530)]
Merge pull request #10535 from jitendrapurohit/CRM-20752

CRM-20752: Editing a Cancelled Pledge updates the status of it to Pen…

7 years agoMerge pull request #10565 from eileenmcnaughton/extract
Monish Deb [Fri, 7 Jul 2017 11:28:17 +0000 (16:58 +0530)]
Merge pull request #10565 from eileenmcnaughton/extract

CRM-20759, add ability to import to 'Primary' address add unit testing, move deprecated function into calling class

7 years agoMisspelling
francescbassas [Fri, 7 Jul 2017 09:23:33 +0000 (11:23 +0200)]
Misspelling

7 years agoMerge pull request #10609 from totten/master-case-settings
colemanw [Fri, 7 Jul 2017 02:09:32 +0000 (22:09 -0400)]
Merge pull request #10609 from totten/master-case-settings

CRM-20816 - Expose CiviCase settings through "Settings" framework

7 years agoCRM-20816 - Rename civicaseAllowMultipleCaseClients to civicaseAllowMultipleClients
Tim Otten [Fri, 7 Jul 2017 00:15:04 +0000 (17:15 -0700)]
CRM-20816 - Rename civicaseAllowMultipleCaseClients to civicaseAllowMultipleClients

The second instance of the word "case" seems redundant.  Nip it in the bud.

7 years agoCRM-20816 - XMLProcessor - Consolidate implementation of setting-lookup
Tim Otten [Fri, 7 Jul 2017 00:11:58 +0000 (17:11 -0700)]
CRM-20816 - XMLProcessor - Consolidate implementation of setting-lookup

7 years agoCRM-20816 - Rename `auto` to `default`
Tim Otten [Thu, 6 Jul 2017 23:51:44 +0000 (16:51 -0700)]
CRM-20816 - Rename `auto` to `default`

7 years agoMerge pull request #10616 from civicrm/4.7.21-rc
Tim Otten [Thu, 6 Jul 2017 22:42:43 +0000 (15:42 -0700)]
Merge pull request #10616 from civicrm/4.7.21-rc

4.7.21 rc

7 years agoMerge pull request #10551 from jitendrapurohit/CRM-20633
Monish Deb [Thu, 6 Jul 2017 20:00:36 +0000 (01:30 +0530)]
Merge pull request #10551 from jitendrapurohit/CRM-20633

CRM-20633 : custom field set displayed twice on register event Partic…

7 years agoMerge pull request #10578 from eileenmcnaughton/deprecated
Monish Deb [Thu, 6 Jul 2017 19:44:14 +0000 (01:14 +0530)]
Merge pull request #10578 from eileenmcnaughton/deprecated

CRM-20786 Move deprecated utils functions to the import classes

7 years agoMerge pull request #10580 from eileenmcnaughton/deprecated3
Monish Deb [Thu, 6 Jul 2017 19:31:48 +0000 (01:01 +0530)]
Merge pull request #10580 from eileenmcnaughton/deprecated3

CRM-20786 stop calling deprecated function, that does not do anything…

7 years agoMerge pull request #10607 from JMAConsulting/CRM-20773
Monish Deb [Thu, 6 Jul 2017 12:35:00 +0000 (18:05 +0530)]
Merge pull request #10607 from JMAConsulting/CRM-20773

CRM-20773: Contribution tab shows Receive Date twice instead of ThankYou date

7 years agoCRM-20823 : Price Set field with an Expiry Date still being required after being...
Jitendra Purohit [Thu, 6 Jul 2017 10:15:54 +0000 (15:45 +0530)]
CRM-20823 : Price Set field with an Expiry Date still being required after being expired

7 years agoMerge pull request #10587 from JMAConsulting/isPayment
Monish Deb [Thu, 6 Jul 2017 11:39:06 +0000 (17:09 +0530)]
Merge pull request #10587 from JMAConsulting/isPayment

CRM-20797, fixed sql to use is_payment = 1 to get payments

7 years agoMerge pull request #10611 from totten/4.7.21-rc-notes
Tim Otten [Thu, 6 Jul 2017 02:46:44 +0000 (19:46 -0700)]
Merge pull request #10611 from totten/4.7.21-rc-notes

Release notes - Multiple updates for v4.7.21

7 years agorelease-notes/4.7.21 - Fix references to subordinate PRs
Tim Otten [Thu, 6 Jul 2017 01:48:15 +0000 (18:48 -0700)]
release-notes/4.7.21 - Fix references to subordinate PRs

7 years agorelease-notes/4.7.21 - Add section for security advisories
Tim Otten [Thu, 6 Jul 2017 01:55:20 +0000 (18:55 -0700)]
release-notes/4.7.21 - Add section for security advisories

7 years agoMerge pull request #10610 from agh1/4.7.21-releasenotes
Tim Otten [Thu, 6 Jul 2017 01:44:52 +0000 (18:44 -0700)]
Merge pull request #10610 from agh1/4.7.21-releasenotes

4.7.21 release notes

7 years ago4.7.21 release notes: updated contributors
Andrew Hunt [Wed, 5 Jul 2017 07:56:56 +0000 (03:56 -0400)]
4.7.21 release notes: updated contributors

7 years ago4.7.21 release notes: bulk of notes
Andrew Hunt [Wed, 5 Jul 2017 07:26:28 +0000 (03:26 -0400)]
4.7.21 release notes: bulk of notes

7 years agoraw from script
Andrew Hunt [Tue, 4 Jul 2017 22:57:26 +0000 (18:57 -0400)]
raw from script

7 years agoCRM-20816 - Add more help text
Tim Otten [Tue, 4 Jul 2017 22:48:15 +0000 (15:48 -0700)]
CRM-20816 - Add more help text

7 years agoCRM-20816 - CiviCase `Settings.xml` - Add deprecation notices
Tim Otten [Tue, 4 Jul 2017 22:34:32 +0000 (15:34 -0700)]
CRM-20816 - CiviCase `Settings.xml` - Add deprecation notices

7 years agoCRM-20816 - CiviCase - Settings framework takes precedence over "Settings.xml"
Tim Otten [Tue, 4 Jul 2017 22:17:54 +0000 (15:17 -0700)]
CRM-20816 - CiviCase - Settings framework takes precedence over "Settings.xml"

CiviCase was originally developed before the creation of the "Settings"
framework (aka `$civicrm_settings`, `Settings API`, `civicrm_settings`,
`*.setting.php`).  At the time, it stored some settings in a special file
named "Settings.xml".

Today, this file is an anomaly which supports fewer dataflows.

With this revision:
 * For backward compatibility, the default setting is `auto`, which reads
   the setting from XML.
 * For maximum compliance with the Settings framework, the
   value from `Civi::settings()->get()` takes precedence (if defined).

7 years agoCRM-20816 - Add `civicrm/admin/setting/case` to navbar
Tim Otten [Tue, 4 Jul 2017 22:08:54 +0000 (15:08 -0700)]
CRM-20816 - Add `civicrm/admin/setting/case` to navbar

7 years agoCRM-20816 - Implement new screen `civicrm/admin/setting/case`
Tim Otten [Tue, 4 Jul 2017 21:52:33 +0000 (14:52 -0700)]
CRM-20816 - Implement new screen `civicrm/admin/setting/case`

7 years agoCRM-20816 - Case.setting.php - Define settings for CiviCase
Tim Otten [Tue, 4 Jul 2017 21:29:43 +0000 (14:29 -0700)]
CRM-20816 - Case.setting.php - Define settings for CiviCase

7 years agoCRM-20759 enable Primary as an import location type.
eileen [Tue, 27 Jun 2017 02:23:50 +0000 (14:23 +1200)]
CRM-20759 enable Primary as an import location type.

This goes to the default location type if the contact has no primary, or overwrites primary,
in keeping with profile behaviour

7 years agoMerge pull request #10606 from jitendrapurohit/CRM-20812
Eileen McNaughton [Tue, 4 Jul 2017 21:24:46 +0000 (09:24 +1200)]
Merge pull request #10606 from jitendrapurohit/CRM-20812

CRM-20812 : Notice on live contribution when only pay later is selected

7 years agoMerge pull request #10603 from JMAConsulting/CRM-20640
Eileen McNaughton [Tue, 4 Jul 2017 21:20:30 +0000 (09:20 +1200)]
Merge pull request #10603 from JMAConsulting/CRM-20640

CRM-20640: Added unit test for the fix

7 years agoCRM-20773: Contribution tab shows Receive Date twice instead of Thank You date
deb.monish [Tue, 4 Jul 2017 17:38:40 +0000 (23:08 +0530)]
CRM-20773: Contribution tab shows Receive Date twice instead of Thank You date

7 years agoMerge pull request #10594 from eileenmcnaughton/extract2
Monish Deb [Tue, 4 Jul 2017 13:08:34 +0000 (18:38 +0530)]
Merge pull request #10594 from eileenmcnaughton/extract2

[NFC] Add unit test towards CRM-20759

7 years agoCRM-20812 : Notice on live contribution when only pay later is selected
Jitendra Purohit [Tue, 4 Jul 2017 11:35:40 +0000 (17:05 +0530)]
CRM-20812 : Notice on live contribution when only pay later is selected

7 years agoCRM-20640: Added unit test for the fix
deb.monish [Tue, 4 Jul 2017 08:28:53 +0000 (13:58 +0530)]
CRM-20640: Added unit test for the fix

7 years agoMerge pull request #10600 from civicrm/4.7.21-rc
Eileen McNaughton [Tue, 4 Jul 2017 04:43:20 +0000 (16:43 +1200)]
Merge pull request #10600 from civicrm/4.7.21-rc

4.7.21 rc

7 years agoMerge pull request #10596 from JMAConsulting/CRM-20640
Eileen McNaughton [Tue, 4 Jul 2017 03:17:09 +0000 (15:17 +1200)]
Merge pull request #10596 from JMAConsulting/CRM-20640

CRM-20640: contribution summary report: duplicates values with group filter

7 years agoMerge pull request #10598 from totten/4.7.21-rc-20675
Eileen McNaughton [Tue, 4 Jul 2017 03:07:12 +0000 (15:07 +1200)]
Merge pull request #10598 from totten/4.7.21-rc-20675

(Backport) CRM-20675 - Fix incorrect renewal activity created when membership updated via API

7 years agoMinor fix at unit test
Monish Deb [Mon, 19 Jun 2017 17:29:04 +0000 (22:59 +0530)]
Minor fix at unit test

7 years agoCRM-20675: Fix incorrect renewal activity created when membership updated via api
Jitendra Purohit [Fri, 2 Jun 2017 15:13:58 +0000 (20:43 +0530)]
CRM-20675: Fix incorrect renewal activity created when membership updated via api

7 years agoCRM-20640: contribution summary report: duplicates values with group filter
deb.monish [Mon, 3 Jul 2017 08:01:17 +0000 (13:31 +0530)]
CRM-20640: contribution summary report: duplicates values with group filter

7 years agoTowards CRM-20759, minor tidy up
eileen [Mon, 3 Jul 2017 00:04:31 +0000 (12:04 +1200)]
Towards CRM-20759, minor tidy up

7 years agoCRM-20759 add e-notice fix and unit tests for saving mappings
eileen [Wed, 28 Jun 2017 00:32:16 +0000 (12:32 +1200)]
CRM-20759 add e-notice fix and unit tests for saving mappings

7 years agoAdd unit test towards CRM-20759
eileen [Tue, 27 Jun 2017 01:31:46 +0000 (13:31 +1200)]
Add unit test towards CRM-20759

7 years agoMerge pull request #10593 from civicrm/4.7.21-rc
Eileen McNaughton [Sun, 2 Jul 2017 20:41:10 +0000 (08:41 +1200)]
Merge pull request #10593 from civicrm/4.7.21-rc

4.7.21 rc

7 years agoMerge pull request #10583 from seamuslee001/CRM-20789
Eileen McNaughton [Sun, 2 Jul 2017 20:40:13 +0000 (08:40 +1200)]
Merge pull request #10583 from seamuslee001/CRM-20789

CRM-20789 Fix unsubscribing when link comes from an AB Test

7 years agoMerge pull request #10579 from eileenmcnaughton/deprecated2
Eileen McNaughton [Sun, 2 Jul 2017 20:39:26 +0000 (08:39 +1200)]
Merge pull request #10579 from eileenmcnaughton/deprecated2

CRM-20786 Move deprecated utils functions to the import classes

7 years agoMerge pull request #10591 from totten/master-casetype-flush
colemanw [Sat, 1 Jul 2017 20:14:18 +0000 (16:14 -0400)]
Merge pull request #10591 from totten/master-casetype-flush

CRM-20802 - CaseType - Flush any in-memory caches that might reference case-type

7 years agoCRM-20802 - CaseType - Flush any in-memory caches that might reference case-type
Tim Otten [Sat, 1 Jul 2017 19:22:08 +0000 (12:22 -0700)]
CRM-20802 - CaseType - Flush any in-memory caches that might reference case-type

7 years agoFix bug in open case status selector
Coleman Watts [Fri, 23 Jun 2017 16:20:18 +0000 (12:20 -0400)]
Fix bug in open case status selector

7 years agoMerge branch '4.7.21-rc' into master
Coleman Watts [Sat, 1 Jul 2017 18:23:02 +0000 (14:23 -0400)]
Merge branch '4.7.21-rc' into master

7 years agoMerge pull request #10575 from JMAConsulting/CRM-20747-rc
Monish Deb [Sat, 1 Jul 2017 11:25:12 +0000 (16:55 +0530)]
Merge pull request #10575 from JMAConsulting/CRM-20747-rc

CRM-20747: {contribution.campaign} token not working on Contribution

7 years agoMerge pull request #10533 from JMAConsulting/CRM-20747
Monish Deb [Sat, 1 Jul 2017 11:23:23 +0000 (16:53 +0530)]
Merge pull request #10533 from JMAConsulting/CRM-20747

CRM-20747: {contribution.campaign} token not working on Contribution ThankYou letter

7 years agoMerge pull request #10574 from eileenmcnaughton/cms
Tim Otten [Fri, 30 Jun 2017 23:54:59 +0000 (16:54 -0700)]
Merge pull request #10574 from eileenmcnaughton/cms

CRM-20780 Add drupal option to define CMS_ROOT

7 years agoMerge pull request #6 from totten/eileenmcnaughton-cms
Eileen McNaughton [Fri, 30 Jun 2017 22:55:59 +0000 (10:55 +1200)]
Merge pull request #6 from totten/eileenmcnaughton-cms

CRM-20780 - System::cmsRootPath() - Use the same override on all CMS's

7 years agoCRM-20780 - System::cmsRootPath() - Use the same override on all CMS's
Tim Otten [Fri, 30 Jun 2017 21:49:57 +0000 (14:49 -0700)]
CRM-20780 - System::cmsRootPath() - Use the same override on all CMS's

7 years agoCRM-20797, fixed sql to use is_payment = 1 to get payments
Pradeep Nayak [Tue, 20 Jun 2017 19:08:56 +0000 (00:38 +0530)]
CRM-20797, fixed sql to use is_payment = 1 to get payments

----------------------------------------
* CRM-20797: Use is_payment to retrieve payments
  https://issues.civicrm.org/jira/browse/CRM-20797

7 years agoCRM-20780 Add drupal option to define CMS_ROOT
eileen [Wed, 28 Jun 2017 08:29:54 +0000 (20:29 +1200)]
CRM-20780 Add drupal option to define CMS_ROOT

7 years agoCRM-20789 Add check based on mailing_type following chat with Tim to ensure only...
Seamus Lee [Thu, 29 Jun 2017 21:54:01 +0000 (21:54 +0000)]
CRM-20789 Add check based on mailing_type following chat with Tim to ensure only deailing with AB tests

7 years agoMerge pull request #10527 from eileenmcnaughton/act
Monish Deb [Thu, 29 Jun 2017 14:15:19 +0000 (19:45 +0530)]
Merge pull request #10527 from eileenmcnaughton/act

Replace a couple of calls to deprecated function

7 years agoMerge pull request #10581 from eileenmcnaughton/deprecated4
Monish Deb [Thu, 29 Jun 2017 12:21:06 +0000 (17:51 +0530)]
Merge pull request #10581 from eileenmcnaughton/deprecated4

CRM-20786 consolidate calls to deprecated function

7 years agoCRM-20789 Fix unsubscribing when link comes from an AB Test
Seamus Lee [Thu, 29 Jun 2017 05:20:38 +0000 (05:20 +0000)]
CRM-20789 Fix unsubscribing when link comes from an AB Test

CRM-20789 Fix retrieving entity when in AB test context

7 years agoCRM-20786 consolidate calls to deprecated function
eileen [Wed, 28 Jun 2017 21:26:37 +0000 (09:26 +1200)]
CRM-20786 consolidate calls to deprecated function

7 years agoMerge pull request #10577 from totten/4.7.21-rc-src
Tim Otten [Wed, 28 Jun 2017 22:11:01 +0000 (15:11 -0700)]
Merge pull request #10577 from totten/4.7.21-rc-src

CRM-19303 - Drupal - Restore getCiviSourceStorage()

7 years agoCRM-20786 stop calling deprecated function, that does not do anything here
eileen [Wed, 28 Jun 2017 21:16:35 +0000 (09:16 +1200)]
CRM-20786 stop calling deprecated function, that does not do anything here

7 years agoCRM-20786 minor code simplification
eileen [Wed, 28 Jun 2017 21:08:04 +0000 (09:08 +1200)]
CRM-20786 minor code simplification

7 years agoCRM-20786 copy deprecated utils function 'inids' to import class.
eileen [Wed, 28 Jun 2017 21:03:33 +0000 (09:03 +1200)]
CRM-20786 copy deprecated utils function 'inids' to import class.

Will work separately to fully remove it

7 years agoCRM-20786 Move deprecated utils functions to the import classes
eileen [Wed, 28 Jun 2017 20:59:35 +0000 (08:59 +1200)]
CRM-20786 Move deprecated utils functions to the import classes

7 years agoMerge pull request #10576 from JMAConsulting/CRM-20781
Eileen McNaughton [Wed, 28 Jun 2017 20:53:18 +0000 (08:53 +1200)]
Merge pull request #10576 from JMAConsulting/CRM-20781

CRM-20781: Truncate long text in mail listing

7 years agoCRM-20786 combine functions in order to move to class
eileen [Wed, 28 Jun 2017 20:47:51 +0000 (08:47 +1200)]
CRM-20786 combine functions in order to move to class

7 years agoCRM-20786 Move deprecated utils functions to the import classes
eileen [Wed, 28 Jun 2017 20:37:56 +0000 (08:37 +1200)]
CRM-20786 Move deprecated utils functions to the import classes

7 years agoMerge pull request #10558 from JMAConsulting/CRM-20412
Eileen McNaughton [Wed, 28 Jun 2017 19:48:39 +0000 (07:48 +1200)]
Merge pull request #10558 from JMAConsulting/CRM-20412

CRM-20412: mailing report: unique opens detail view inaccurate

7 years agoCRM-20781: Truncate long text in mail listing
deb.monish [Wed, 28 Jun 2017 18:46:35 +0000 (00:16 +0530)]
CRM-20781: Truncate long text in mail listing

7 years agoCRM-19303 - Drupal - Restore getCiviSourceStorage()
Tim Otten [Wed, 28 Jun 2017 18:57:54 +0000 (11:57 -0700)]
CRM-19303 - Drupal - Restore getCiviSourceStorage()

This partially reverts changes made under CRM-19303:
 * The changes to `getDefaultFileStorage()` are preserved
 * The changes to `getCiviSourceStorage()` are reverted
 * To avoid conflicts, `parseDrupalSiteName()` has been split into the older `parseDrupalSiteNameFromRoot()` and the newer `parseDrupalSiteNameFromRequest()`.
   (IMHO, `parseDrupalSiteNameFromRequest()` is more correct, but `parseDrupalSiteNameFromRoot()` is more compatible with existing deployments).

As discussed in [PR #10513](https://github.com/civicrm/civicrm-core/pull/10513#issuecomment-310506829),
we should stop trying so hard to autodetect these things.  We'll treat the
auto-detection stuff as legacy, and should shift toward a simpler/flatter arrangement
which encourages paths/URLs to be stored in `civicrm.settings.php`.

7 years agoMerge pull request #10571 from totten/master-joomla-hook
colemanw [Wed, 28 Jun 2017 12:28:32 +0000 (08:28 -0400)]
Merge pull request #10571 from totten/master-joomla-hook

CRM-19914 - CRM_Utils_Hook - Fix `civicrmHooks.php` on Joomla

7 years agoMerge pull request #10573 from totten/master-nav-hash
colemanw [Wed, 28 Jun 2017 12:09:48 +0000 (08:09 -0400)]
Merge pull request #10573 from totten/master-nav-hash

CRM-20776 - Navigation - Fix menu items with mix of #, ?, &

7 years agoCRM-20747: {contribution.campaign} token not working on Contribution
deb.monish [Wed, 28 Jun 2017 09:15:24 +0000 (14:45 +0530)]
CRM-20747: {contribution.campaign} token not working on Contribution

7 years agoCRM-20747: {contribution.campaign} token not working on Contribution ThankYou letter
deb.monish [Tue, 20 Jun 2017 11:24:59 +0000 (16:54 +0530)]
CRM-20747: {contribution.campaign} token not working on Contribution ThankYou letter

7 years agoMerge pull request #10572 from seamuslee001/CRM-20774-words
Tim Otten [Wed, 28 Jun 2017 07:54:30 +0000 (00:54 -0700)]
Merge pull request #10572 from seamuslee001/CRM-20774-words

CRM-20774 Add in additional words on contacting system administrator …

7 years agoCRM-20774 Add in additional words on contacting system administrator for assistance
Seamus Lee [Wed, 28 Jun 2017 06:57:35 +0000 (16:57 +1000)]
CRM-20774 Add in additional words on contacting system administrator for assistance

7 years agoCRM-20776 - Navigation - Fix menu items with mix of #, ?, &
Tim Otten [Wed, 28 Jun 2017 06:47:19 +0000 (23:47 -0700)]
CRM-20776 - Navigation - Fix menu items with mix of #, ?, &

== Use case

 * Use an extension to implement `hook_civicrm_navigationMenu`.
 * Add or edit the URL of a menu item to use a mix of URL control chars -- eg `civicrm/case/a/#/case?dtab=0&dme=0`
 * Look in the CiviCRM navigation bar and see the final URL of the link.

== Before

 * The URL is munged (eg `http://dcase.l/civicrm/case/a/?dtab=0&dme=0#/case`)

== After

 * The URL appears consistent (eg `http://dcase.l/civicrm/case/a/#/case?dtab=0&dme=0`)

== Testing

 * On Drupal 7, I activated all components (CiviContribute, CiviMail, etal) to build a large pool of menu items.
   Then I grabbed the menu content (eg `http://dcase.l/civicrm/ajax/menujs/202/en_US/1/abcd1234`) -- both with and
   without the patch. The content was the same, except for the intended items.
 * Repeated above on WordPress (which does not use clean URLs).

7 years agoMerge pull request #10566 from jitendrapurohit/indexfix
Eileen McNaughton [Wed, 28 Jun 2017 06:32:08 +0000 (18:32 +1200)]
Merge pull request #10566 from jitendrapurohit/indexfix

CRM-20774 - Add check for existing key index in table

7 years agoCRM-19914 - CRM_Utils_Hook - Fix `civicrmHooks.php` on Joomla
Tim Otten [Wed, 28 Jun 2017 03:46:59 +0000 (20:46 -0700)]
CRM-19914 - CRM_Utils_Hook - Fix `civicrmHooks.php` on Joomla

7 years agoMerge pull request #10552 from colemanw/CRM-19778
colemanw [Wed, 28 Jun 2017 02:19:33 +0000 (22:19 -0400)]
Merge pull request #10552 from colemanw/CRM-19778

CRM-19778 - Api.getoptions - Filter status id by case type id

7 years agoMerge pull request #10569 from eileenmcnaughton/perm
Eileen McNaughton [Wed, 28 Jun 2017 02:09:16 +0000 (14:09 +1200)]
Merge pull request #10569 from eileenmcnaughton/perm

CRM-20778 - Use civicontribute permission for contribution recur.cancel

7 years agoMerge pull request #10570 from civicrm/4.7.21-rc
Tim Otten [Tue, 27 Jun 2017 22:49:16 +0000 (15:49 -0700)]
Merge pull request #10570 from civicrm/4.7.21-rc

Update `master` with latest `4.7.21-rc`

7 years agoMerge pull request #10567 from totten/4.7.21-rc-rm
Tim Otten [Tue, 27 Jun 2017 21:56:39 +0000 (14:56 -0700)]
Merge pull request #10567 from totten/4.7.21-rc-rm

CRM-20243 - Actively remove old files

7 years agoCRM-20778 - Use civicontribute permission for contribution recur.cancel
eileen [Tue, 27 Jun 2017 20:57:37 +0000 (08:57 +1200)]
CRM-20778 - Use civicontribute permission for contribution recur.cancel

7 years agoCRM-20243 - CRM_Utils_Check - Simplify Auth/SASL checks
Tim Otten [Tue, 27 Jun 2017 20:44:11 +0000 (13:44 -0700)]
CRM-20243 - CRM_Utils_Check - Simplify Auth/SASL checks

7 years agoMark failing test incomplete
Coleman Watts [Tue, 27 Jun 2017 20:10:32 +0000 (16:10 -0400)]
Mark failing test incomplete

7 years agoCRM-19778 - Api.getoptions - Filter status id by case type id
Coleman Watts [Fri, 23 Jun 2017 16:21:27 +0000 (12:21 -0400)]
CRM-19778 - Api.getoptions - Filter status id by case type id

7 years agoadd test
Jitendra Purohit [Tue, 27 Jun 2017 14:18:01 +0000 (19:48 +0530)]
add test

7 years agoMerge pull request #10568 from francescbassas/patch-10
colemanw [Tue, 27 Jun 2017 13:40:57 +0000 (09:40 -0400)]
Merge pull request #10568 from francescbassas/patch-10

CRM-20775 Wrong is full results for API event get

7 years agoCode style
francescbassas [Tue, 27 Jun 2017 11:02:43 +0000 (13:02 +0200)]
Code style

7 years agoCRM-20775 Wrong is full results for API event get
francescbassas [Tue, 27 Jun 2017 10:52:52 +0000 (12:52 +0200)]
CRM-20775 Wrong is full results for API event get

7 years agoCRM-20243 - CRM_Upgrade_Form - Delete orphaned files before upgrade
Tim Otten [Tue, 27 Jun 2017 07:27:09 +0000 (00:27 -0700)]
CRM-20243 - CRM_Upgrade_Form - Delete orphaned files before upgrade