civicrm-core.git
7 years agoMinor cleanup
Coleman Watts [Thu, 19 Oct 2017 00:57:35 +0000 (20:57 -0400)]
Minor cleanup

7 years agoMerge pull request #11159 from colemanw/CRM-20078
colemanw [Thu, 19 Oct 2017 00:56:37 +0000 (20:56 -0400)]
Merge pull request #11159 from colemanw/CRM-20078

CRM-20078 - Fix activity file on case button

7 years agoMerge pull request #11160 from civicrm/4.7.27-rc
Eileen McNaughton [Wed, 18 Oct 2017 21:53:10 +0000 (10:53 +1300)]
Merge pull request #11160 from civicrm/4.7.27-rc

4.7.27 rc

7 years agoMerge pull request #11157 from jitendrapurohit/4.7.27
Eileen McNaughton [Wed, 18 Oct 2017 20:55:53 +0000 (09:55 +1300)]
Merge pull request #11157 from jitendrapurohit/4.7.27

CRM-21330 - Add regen.sh changes

7 years agoMerge pull request #11145 from herbdool/crm21272-2
Eileen McNaughton [Wed, 18 Oct 2017 20:07:37 +0000 (09:07 +1300)]
Merge pull request #11145 from herbdool/crm21272-2

CRM-21272: move definition of isPasswordUserGenerated to CMS classes

7 years agoCRM-20078 - Fix activity file on case button
Coleman Watts [Wed, 18 Oct 2017 16:06:47 +0000 (12:06 -0400)]
CRM-20078 - Fix activity file on case button

7 years agoMerge pull request #11035 from JMAConsulting/CRM-21231
Mathieu Lu [Wed, 18 Oct 2017 14:56:38 +0000 (10:56 -0400)]
Merge pull request #11035 from JMAConsulting/CRM-21231

CRM-21231: On CiviMail screen make 'Review and Schedule' tab active if required fields are filled

7 years agoMerge pull request #11141 from eileenmcnaughton/mem
Monish Deb [Wed, 18 Oct 2017 12:08:38 +0000 (17:38 +0530)]
Merge pull request #11141 from eileenmcnaughton/mem

 CRM-21315: (intra-rc regression) pay_later processor showing up in list of available processors

7 years agoCRM-21330 - Add regen.sh changes
Jitendra Purohit [Wed, 18 Oct 2017 11:37:06 +0000 (17:07 +0530)]
CRM-21330 - Add regen.sh changes

7 years agoMerge pull request #11150 from civicrm/4.7.27-rc
Eileen McNaughton [Tue, 17 Oct 2017 23:41:31 +0000 (12:41 +1300)]
Merge pull request #11150 from civicrm/4.7.27-rc

4.7.27 rc

7 years agoMerge pull request #11135 from GinkgoFJG/CRM-21300-joomla-perms-notices
Tim Otten [Tue, 17 Oct 2017 21:57:12 +0000 (14:57 -0700)]
Merge pull request #11135 from GinkgoFJG/CRM-21300-joomla-perms-notices

CRM-21300: Addressed notices due to unexpected NULL from Joomla DB object.

7 years agoMerge pull request #11147 from kainukempowerment/CRM-21319
Yashodha Chaku [Tue, 17 Oct 2017 13:39:53 +0000 (19:09 +0530)]
Merge pull request #11147 from kainukempowerment/CRM-21319

Fix for CRM-21319

7 years agoMerge pull request #11134 from deepak-srivastava/CRM-19998
Yashodha Chaku [Tue, 17 Oct 2017 11:30:57 +0000 (17:00 +0530)]
Merge pull request #11134 from deepak-srivastava/CRM-19998

CRM-19998: membership start/end date has no effect in search builder

7 years agoFix for CRM-21319
Klaas Eikelboom [Tue, 17 Oct 2017 08:58:27 +0000 (09:58 +0100)]
Fix for CRM-21319

7 years agoCRM-21272: add visibility to methods
Herb vd Dool [Mon, 16 Oct 2017 21:27:57 +0000 (17:27 -0400)]
CRM-21272: add visibility to methods

7 years agoMerge pull request #11146 from civicrm/4.7.27-rc
Eileen McNaughton [Mon, 16 Oct 2017 20:12:20 +0000 (09:12 +1300)]
Merge pull request #11146 from civicrm/4.7.27-rc

4.7.27 rc

7 years agoMerge pull request #11143 from JMAConsulting/CRM-21267-rc
Eileen McNaughton [Mon, 16 Oct 2017 20:09:38 +0000 (09:09 +1300)]
Merge pull request #11143 from JMAConsulting/CRM-21267-rc

CRM-21267: Fixed call to undefined formatCustomDate method in Parser.

7 years agoCRM-21272: move definition of isPasswordUserGenerated to CMS classes
Herb vd Dool [Mon, 16 Oct 2017 16:01:12 +0000 (12:01 -0400)]
CRM-21272: move definition of isPasswordUserGenerated to CMS classes

7 years agoCRM-21300: Addressed notices due to unexpected NULL from Joomla DB object.
Frank J. Gómez [Fri, 13 Oct 2017 12:21:45 +0000 (08:21 -0400)]
CRM-21300: Addressed notices due to unexpected NULL from Joomla DB object.

7 years agoCRM-21267: Cleaning up lint errors
Alok Patel [Thu, 12 Oct 2017 11:34:04 +0000 (17:04 +0530)]
CRM-21267: Cleaning up lint errors

7 years agoCRM-21267: Fixed call to undefined formatCustomDate method in Parser. Agileware Ref...
Alok Patel [Thu, 12 Oct 2017 05:43:47 +0000 (11:13 +0530)]
CRM-21267: Fixed call to undefined formatCustomDate method in Parser. Agileware Ref: CIVICRM-542

7 years agoMerge pull request #11125 from agileware/CRM-20432
Monish Deb [Mon, 16 Oct 2017 07:21:51 +0000 (12:51 +0530)]
Merge pull request #11125 from agileware/CRM-20432

CRM-20432: Change Membership status to current when related contribution payment is recorded from pending status.

7 years agoCRM-20432: Changed membership status to New from Current
Alok Patel [Mon, 16 Oct 2017 03:17:21 +0000 (08:47 +0530)]
CRM-20432: Changed membership status to New from Current

7 years agoCRM-20432: Bug is no more reproducible. Removed patch which was updating the Membersh...
Alok Patel [Fri, 13 Oct 2017 08:59:54 +0000 (14:29 +0530)]
CRM-20432: Bug is no more reproducible. Removed patch which was updating the Membership status when Completing Contribution payment.

7 years agoCRM-20432: Change Membership status to current when related contribution payment...
Alok Patel [Thu, 12 Oct 2017 06:07:51 +0000 (11:37 +0530)]
CRM-20432: Change Membership status to current when related contribution payment is recorded from pending status.

7 years agoMerge pull request #11133 from agileware/CRM-19620
Eileen McNaughton [Mon, 16 Oct 2017 04:06:27 +0000 (17:06 +1300)]
Merge pull request #11133 from agileware/CRM-19620

Unit test for CRM-19620 (#9362)

7 years agoCRM-19620 - Restore matching contacts in trash prior to import along with Unit Test.
Jamie McClelland [Tue, 8 Nov 2016 19:45:45 +0000 (14:45 -0500)]
CRM-19620 - Restore matching contacts in trash prior to import along with Unit Test.

This avoids duplicate key errors. If we don't restore and return the
deleted contact when we have a match on external_identifier, then
we end up with a key error.

7 years ago CRM-21315 - (intra-rc regression) pay_later processor showing up in list of availabl...
eileen [Mon, 16 Oct 2017 01:08:26 +0000 (14:08 +1300)]
 CRM-21315 - (intra-rc regression) pay_later processor showing up in list of available processors

7 years agoMerge pull request #11139 from herbdool/crm21272
Eileen McNaughton [Sun, 15 Oct 2017 20:55:42 +0000 (09:55 +1300)]
Merge pull request #11139 from herbdool/crm21272

CRM-21272 add definition of isUserRegistrationPermitted to Backdrop class

7 years agoMerge pull request #11127 from JMAConsulting/CRM-21305
colemanw [Sun, 15 Oct 2017 19:42:09 +0000 (15:42 -0400)]
Merge pull request #11127 from JMAConsulting/CRM-21305

CRM-21305: fixed sorting of column on batch transaction listing page

7 years agoMerge pull request #11140 from eileenmcnaughton/mem
Monish Deb [Sun, 15 Oct 2017 11:17:49 +0000 (16:47 +0530)]
Merge pull request #11140 from eileenmcnaughton/mem

CRM-21314 Credit card block missing from membership payment form:

7 years agoMerge pull request #11136 from colemanw/CRM-20545
Eileen McNaughton [Sun, 15 Oct 2017 10:01:04 +0000 (23:01 +1300)]
Merge pull request #11136 from colemanw/CRM-20545

CRM-20545 - Exclude deleted contacts from reports

7 years agoCRM-21314 Credit card block missing from membership payment form:
eileen [Sun, 15 Oct 2017 07:32:42 +0000 (20:32 +1300)]
CRM-21314 Credit card block missing from membership payment form:

7 years agoadd definition of isUserRegistrationPermitted to Backdrop class
Herb vd Dool [Sun, 15 Oct 2017 04:47:49 +0000 (00:47 -0400)]
add definition of isUserRegistrationPermitted to Backdrop class

7 years agoMerge pull request #11121 from eileenmcnaughton/dedupe_limit_bug
colemanw [Sat, 14 Oct 2017 12:22:20 +0000 (08:22 -0400)]
Merge pull request #11121 from eileenmcnaughton/dedupe_limit_bug

CRM-21303 fix:dedupe conflicts screen, not all rows visible

7 years agoMerge pull request #11117 from eileenmcnaughton/dedupe_js_error
colemanw [Sat, 14 Oct 2017 00:07:07 +0000 (20:07 -0400)]
Merge pull request #11117 from eileenmcnaughton/dedupe_js_error

CRM-21294 js error when selecting & unselecting merge contacts

7 years agoCRM-20545 - Exclude deleted contacts from reports
Coleman Watts [Sat, 14 Oct 2017 00:00:07 +0000 (19:00 -0500)]
CRM-20545 - Exclude deleted contacts from reports

7 years agoMerge pull request #11124 from agileware/CRM-21267
Monish Deb [Fri, 13 Oct 2017 20:48:57 +0000 (02:18 +0530)]
Merge pull request #11124 from agileware/CRM-21267

CRM-21267: Fixed call to undefined formatCustomDate method in Parser.

7 years agoCRM-19998 membership start/end date has no effect in search builder
Deepak Srivastava [Fri, 13 Oct 2017 11:37:02 +0000 (12:37 +0100)]
CRM-19998 membership start/end date has no effect in search builder

7 years agoMerge pull request #10486 from mickadoo/CRM-20710_get-valid-types-function
colemanw [Fri, 13 Oct 2017 02:34:00 +0000 (22:34 -0400)]
Merge pull request #10486 from mickadoo/CRM-20710_get-valid-types-function

CRM-20710: Add function to return valid types

7 years agoMerge pull request #11067 from MegaphoneJon/resource-url-check
colemanw [Fri, 13 Oct 2017 01:31:31 +0000 (21:31 -0400)]
Merge pull request #11067 from MegaphoneJon/resource-url-check

CRM-21262 - Add a system check for the resource URL

7 years agoMerge pull request #11116 from eileenmcnaughton/dedupe_obs_code
colemanw [Fri, 13 Oct 2017 01:25:41 +0000 (21:25 -0400)]
Merge pull request #11116 from eileenmcnaughton/dedupe_obs_code

CRM-21291 remove obsolete code from dedupe.

7 years agoMerge pull request #11107 from totten/master-nav-ser
Eileen McNaughton [Thu, 12 Oct 2017 23:55:51 +0000 (12:55 +1300)]
Merge pull request #11107 from totten/master-nav-ser

Navigation - Fix serialization error

7 years agoMerge pull request #10707 from eileenmcnaughton/civimail
Mathieu Lu [Thu, 12 Oct 2017 16:06:52 +0000 (12:06 -0400)]
Merge pull request #10707 from eileenmcnaughton/civimail

CRM-20919 adjust mailing.create to allow adding completed mailings.

7 years agoCRM/Upgrade - Move 4.7.26 steps to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:22 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.26 steps to 4.7.27

7 years agoCRM/Upgrade - Move 4.7.26 steps to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.26 steps to 4.7.27

7 years agoMerge branch 'new-4.7.27-rc' into new-master
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
Merge branch 'new-4.7.27-rc' into new-master

7 years agoCRM/Upgrade - Make the Tajikistan change replayable
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
CRM/Upgrade - Make the Tajikistan change replayable

7 years agoSet version to 4.7.28
Tim Otten [Thu, 12 Oct 2017 14:31:21 +0000 (15:31 +0100)]
Set version to 4.7.28

7 years agoSet version to 4.7.27
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
Set version to 4.7.27

7 years agoMerge branch 'new-4.7.27-rc' into new-master
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
Merge branch 'new-4.7.27-rc' into new-master

7 years agoCRM/Upgrade - Move 4.7.27 steps to 4.7.28
Tim Otten [Thu, 12 Oct 2017 14:31:19 +0000 (15:31 +0100)]
CRM/Upgrade - Move 4.7.27 steps to 4.7.28

7 years agoCRM-21267: Cleaning up lint errors
Alok Patel [Thu, 12 Oct 2017 11:34:04 +0000 (17:04 +0530)]
CRM-21267: Cleaning up lint errors

7 years agoCRM-21305, fixed sorting of column on batch transaction listing page
Pradeep Nayak [Thu, 12 Oct 2017 08:57:57 +0000 (14:27 +0530)]
CRM-21305, fixed sorting of column on batch transaction listing page

----------------------------------------
* CRM-21305: Sorting not working on Batch listing page
  https://issues.civicrm.org/jira/browse/CRM-21305

7 years agoCRM-21267: Fixed call to undefined formatCustomDate method in Parser. Agileware Ref...
Alok Patel [Thu, 12 Oct 2017 05:43:47 +0000 (11:13 +0530)]
CRM-21267: Fixed call to undefined formatCustomDate method in Parser. Agileware Ref: CIVICRM-542

7 years agoCRM-21303 fix:dedupe conflicts screen, not all rows visible
eileen [Thu, 12 Oct 2017 05:01:16 +0000 (18:01 +1300)]
CRM-21303 fix:dedupe conflicts screen, not all rows visible

7 years agoCRM-21224 reinstate use of limit on dedupe searches
eileen [Wed, 27 Sep 2017 07:08:08 +0000 (20:08 +1300)]
CRM-21224 reinstate use of limit on dedupe searches

7 years agoMerge pull request #11119 from eileenmcnaughton/phpcs
Eileen McNaughton [Thu, 12 Oct 2017 04:41:54 +0000 (17:41 +1300)]
Merge pull request #11119 from eileenmcnaughton/phpcs

[nfc] Fix missing comma for phpcs

7 years agoFix missing comma for phpcs
eileen [Thu, 12 Oct 2017 04:41:07 +0000 (17:41 +1300)]
Fix missing comma for phpcs

7 years agoCRM-21294 js error when selecting & unselecting merge contacts
eileen [Thu, 12 Oct 2017 03:04:10 +0000 (16:04 +1300)]
CRM-21294 js error when selecting & unselecting merge contacts

7 years agoCRM-21291 remove obsolete code from dedupe.
eileen [Thu, 12 Oct 2017 02:26:19 +0000 (15:26 +1300)]
CRM-21291 remove obsolete code from dedupe.

As confirmed by Jamie this code is no longer in use

7 years agoMerge pull request #11112 from kcristiano/4.7.26-rc
Eileen McNaughton [Wed, 11 Oct 2017 19:50:42 +0000 (08:50 +1300)]
Merge pull request #11112 from kcristiano/4.7.26-rc

CRM-21285 Buildkit Installs failing for WordPress

7 years agoMerge pull request #11109 from JKingsnorth/CRM-20903a
Eileen McNaughton [Wed, 11 Oct 2017 19:49:33 +0000 (08:49 +1300)]
Merge pull request #11109 from JKingsnorth/CRM-20903a

CRM-20903 Order dedupe rules by title not ID

7 years agoMerge pull request #11111 from civicrm/4.7.26-rc
Eileen McNaughton [Wed, 11 Oct 2017 19:45:56 +0000 (08:45 +1300)]
Merge pull request #11111 from civicrm/4.7.26-rc

4.7.26 rc

7 years agoMerge pull request #11096 from mukeshcompucorp/HW-381-case-type-settings-screen
colemanw [Wed, 11 Oct 2017 12:46:08 +0000 (08:46 -0400)]
Merge pull request #11096 from mukeshcompucorp/HW-381-case-type-settings-screen

HW-381: Added container block to wrap elements

7 years agoCRM-20903 Order dedupe rules by title not ID - users first!
JKingsnorth [Wed, 11 Oct 2017 08:07:03 +0000 (09:07 +0100)]
CRM-20903 Order dedupe rules by title not ID - users first!

7 years agoMerge pull request #11099 from JKingsnorth/CRM-21282
Eileen McNaughton [Wed, 11 Oct 2017 00:34:32 +0000 (13:34 +1300)]
Merge pull request #11099 from JKingsnorth/CRM-21282

CRM-21282 Improve ordering of click reporting

7 years agoMerge pull request #11104 from highfalutin/CRM-21284-mail-setup-doc-link
Eileen McNaughton [Tue, 10 Oct 2017 21:22:40 +0000 (10:22 +1300)]
Merge pull request #11104 from highfalutin/CRM-21284-mail-setup-doc-link

CRM-21284: Update documentation link for setting up default mailbox

7 years agoMerge pull request #11108 from cividesk/CRM-21281
Eileen McNaughton [Tue, 10 Oct 2017 21:21:05 +0000 (10:21 +1300)]
Merge pull request #11108 from cividesk/CRM-21281

CRM-21281: Fix potential e-notice

7 years agoMerge pull request #11106 from twomice/CRM-21287_contributions_by_household_add_finan...
Eileen McNaughton [Tue, 10 Oct 2017 21:16:01 +0000 (10:16 +1300)]
Merge pull request #11106 from twomice/CRM-21287_contributions_by_household_add_financial_type

CRM-21287: Add Financial Type column and filter.

7 years agoUpdate wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may...
Kevin Cristiano [Tue, 10 Oct 2017 20:57:55 +0000 (16:57 -0400)]
Update wp.frontend and wp.backend to account for cases where CIVICRM_UF_BASEURL may or may not have a trailing slash

7 years agoCRM-21281: Fix potential e-notice
Nicolas Ganivet [Tue, 10 Oct 2017 20:27:57 +0000 (14:27 -0600)]
CRM-21281: Fix potential e-notice

7 years agoNavigation - Fix serialization error
Tim Otten [Tue, 10 Oct 2017 20:25:20 +0000 (21:25 +0100)]
Navigation - Fix serialization error

Overview
--------

The navigation subsystem stores per-user data in the table
`civicrm_setting`.  Most access to this table goes through
`CRM_Core_BAO_Setting` or `Civi\Core\SettingsBag`.  However, certain
edge-cases produce a warning about a serialization error because
`CRM_Core_BAO_Navigation` does not participate.

Before
------
`CRM_Core_BAO_Navigation::resetNavigation()` generates malformed
records which cannot be read via `CRM_Core_BAO_Setting` or
`Civi\Core\SettingsBag`.

After
-----
`CRM_Core_BAO_Navigation::resetNavigation()` generates better records.

7 years agoMerge pull request #11101 from JohnFF/feature/CRM-16243-sprint-b
Tim Otten [Tue, 10 Oct 2017 19:30:57 +0000 (20:30 +0100)]
Merge pull request #11101 from JohnFF/feature/CRM-16243-sprint-b

CRM-16243 - Activate extension dependencies

7 years agoMerge pull request #11097 from cividesk/CRM-21281
Eileen McNaughton [Tue, 10 Oct 2017 18:55:39 +0000 (07:55 +1300)]
Merge pull request #11097 from cividesk/CRM-21281

CRM-21281: Restore entity reference in case the post hook needs it

7 years agoMerge pull request #11098 from JKingsnorth/CRM-20903a
Eileen McNaughton [Tue, 10 Oct 2017 18:49:08 +0000 (07:49 +1300)]
Merge pull request #11098 from JKingsnorth/CRM-20903a

CRM-20903 Improve ordering of dedupe rules

7 years agoMerge pull request #11105 from kcristiano/4.7.26-rc
Eileen McNaughton [Tue, 10 Oct 2017 18:47:41 +0000 (07:47 +1300)]
Merge pull request #11105 from kcristiano/4.7.26-rc

CRM-21285 Buildkit Installs failing for WordPress 4.7.26-rc PR

7 years agoMerge pull request #10355 from eileenmcnaughton/deprecation
colemanw [Tue, 10 Oct 2017 18:45:01 +0000 (14:45 -0400)]
Merge pull request #10355 from eileenmcnaughton/deprecation

Deprecation:  CRM-20572 Remove jcalendar from Contrib Sybunt custom Search

7 years agoCRM-21287: Add Financial Type column and filter.
Allen Shaw [Tue, 10 Oct 2017 16:35:56 +0000 (11:35 -0500)]
CRM-21287: Add Financial Type column and filter.

7 years agoBuildkit Installs failing for WordPress
Kevin Cristiano [Tue, 10 Oct 2017 15:50:33 +0000 (11:50 -0400)]
Buildkit Installs failing for WordPress

Front end paths missing trailing slash on CIVICRM_UF_BASEURL

7 years agoMerge pull request #11089 from seamuslee001/CRM-19346
colemanw [Tue, 10 Oct 2017 14:57:50 +0000 (10:57 -0400)]
Merge pull request #11089 from seamuslee001/CRM-19346

CRM-19346 Ensure Option Values do not share same value

7 years agoCRM-19346 - Move variable setting to preprocess fn
colemanw [Tue, 10 Oct 2017 14:08:46 +0000 (10:08 -0400)]
CRM-19346 - Move variable setting to preprocess fn

7 years agoMerge pull request #11045 from mepps/CRM-20304
colemanw [Tue, 10 Oct 2017 13:46:11 +0000 (09:46 -0400)]
Merge pull request #11045 from mepps/CRM-20304

CRM-20304 Bug fixes to Alphabetize options

7 years ago Buildkit Installs are failing.
Kevin Cristiano [Tue, 10 Oct 2017 13:13:57 +0000 (09:13 -0400)]
 Buildkit Installs are failing.

 update wp.backend.base to ensure admin_url is correct

7 years agoMerge pull request #11100 from seamuslee001/CRM-21283
Monish Deb [Tue, 10 Oct 2017 13:01:28 +0000 (18:31 +0530)]
Merge pull request #11100 from seamuslee001/CRM-21283

CRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into …

7 years agoCRM-21284: Update documentation link for setting up default mailbox
Noah Miller [Tue, 10 Oct 2017 12:23:46 +0000 (13:23 +0100)]
CRM-21284: Update documentation link for setting up default mailbox

7 years agoadd upgrade code
deb.monish [Wed, 20 Sep 2017 12:16:50 +0000 (17:46 +0530)]
add upgrade code

7 years agoFix call to deprecated funciton
eileen [Sun, 14 May 2017 23:19:36 +0000 (11:19 +1200)]
Fix call to deprecated funciton

7 years agoCRM-20572 Remove jcalendar from Contrib Sybunt custom Search
eileen [Sun, 14 May 2017 23:19:01 +0000 (11:19 +1200)]
CRM-20572 Remove jcalendar from Contrib Sybunt custom Search

7 years agominor fix
Monish Deb [Tue, 10 Oct 2017 11:46:41 +0000 (17:16 +0530)]
minor fix

7 years agoMerge pull request #11058 from DanielvV/CRM-21249
Monish Deb [Tue, 10 Oct 2017 11:34:49 +0000 (17:04 +0530)]
Merge pull request #11058 from DanielvV/CRM-21249

CRM-21249 - GeocodeTest should warn hitting the Google limit

7 years agoCRM-21231: On CiviMail screen make 'Review and Schedule' tab active if required field...
deb.monish [Thu, 28 Sep 2017 11:45:17 +0000 (17:15 +0530)]
CRM-21231: On CiviMail screen make 'Review and Schedule' tab active if required fields are filled

7 years agoHW:381/HW-382: Removed extra buttons from UI
Mukesh Ram [Tue, 10 Oct 2017 10:53:05 +0000 (16:23 +0530)]
HW:381/HW-382: Removed extra buttons from UI

7 years agoCRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into list of states...
Seamus Lee [Tue, 10 Oct 2017 10:39:18 +0000 (21:39 +1100)]
CRM-21283 Incorporate Barbados and Antigua and Barbuda parishes into list of states as per ISO documentation https://en.wikipedia.org/wiki/ISO_3166-2:BB https://en.wikipedia.org/wiki/ISO_3166-2:AG

7 years agoMerge pull request #11093 from seamuslee001/CRM-20397-tollerance
Monish Deb [Tue, 10 Oct 2017 09:17:59 +0000 (14:47 +0530)]
Merge pull request #11093 from seamuslee001/CRM-20397-tollerance

CRM-20397 Allow for up to 4 hours tollarence in setting the date as v…

7 years agoCRM-21282 Improve ordering of click reporting
JKingsnorth [Tue, 10 Oct 2017 08:21:05 +0000 (09:21 +0100)]
CRM-21282 Improve ordering of click reporting

7 years agoCRM-20903 Improve ordering of dedupe rules
JKingsnorth [Tue, 10 Oct 2017 08:18:47 +0000 (09:18 +0100)]
CRM-20903 Improve ordering of dedupe rules

7 years agoRoll back unneeded composer.lock changes
Seamus Lee [Tue, 10 Oct 2017 07:47:35 +0000 (18:47 +1100)]
Roll back unneeded composer.lock changes

7 years agoCRM-19346 Patch API also to ensure that same value cannot be used as well
Seamus Lee [Mon, 9 Oct 2017 09:11:25 +0000 (20:11 +1100)]
CRM-19346 Patch API also to ensure that same value cannot be used as well

Add in fixes to unit tests

Switch to using CRM_Core_OptionGroup:: rather than hard codeded array

7 years agoCRM-19346 Add in form rule to ensure that option values can't use the same value
Seamus Lee [Mon, 9 Oct 2017 08:39:58 +0000 (19:39 +1100)]
CRM-19346 Add in form rule to ensure that option values can't use the same value