civicrm-core.git
6 years agoCRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.
Mathieu Lutfy [Wed, 29 Nov 2017 03:23:27 +0000 (22:23 -0500)]
CRM-21480 FourSeven/updateContributionInvoiceNumber: fix for MariaDB 10.2.

6 years agoCRM-21436: Fix exception on pay later contribution page. (#11317)
Jitendra Purohit [Tue, 28 Nov 2017 03:05:44 +0000 (08:35 +0530)]
CRM-21436: Fix exception on pay later contribution page. (#11317)

* CRM-21436: Fix exception on pay later contribution page.

* minor fix

* move test against master

* variable fix

6 years agoMerge pull request #11322 from mlutfy/4.7.28-rc-crm21481
colemanw [Sun, 26 Nov 2017 04:06:08 +0000 (23:06 -0500)]
Merge pull request #11322 from mlutfy/4.7.28-rc-crm21481

CRM-21481: 4.7.28: call rebuildMultilingalSchema().

6 years agoMerge pull request #11321 from mlutfy/4.7.28-rc-crm21479
colemanw [Fri, 24 Nov 2017 17:06:30 +0000 (12:06 -0500)]
Merge pull request #11321 from mlutfy/4.7.28-rc-crm21479

CRM-21479: Syntax fix for updateContributionInvoiceNumber().

6 years agoCRM-21481: 4.7.28: call rebuildMultilingalSchema().
Mathieu Lutfy [Fri, 24 Nov 2017 16:32:33 +0000 (11:32 -0500)]
CRM-21481: 4.7.28: call rebuildMultilingalSchema().

6 years agoCRM-21479: Syntax fix for updateContributionInvoiceNumber().
Mathieu Lutfy [Fri, 24 Nov 2017 15:54:13 +0000 (10:54 -0500)]
CRM-21479: Syntax fix for updateContributionInvoiceNumber().

6 years agoMerge pull request #11258 from seamuslee001/CRM-21411
Eileen McNaughton [Tue, 21 Nov 2017 20:33:50 +0000 (09:33 +1300)]
Merge pull request #11258 from seamuslee001/CRM-21411

CRM-21411 Fix issue where unsubscribe group field would not show beca…

7 years agoMerge pull request #11286 from jitendrapurohit/pay-later-fix
Eileen McNaughton [Fri, 17 Nov 2017 22:40:02 +0000 (11:40 +1300)]
Merge pull request #11286 from jitendrapurohit/pay-later-fix

CRM-21436 - Fix fatal error on pay later

7 years agofix contribution page loading on no processor
Jitendra Purohit [Fri, 17 Nov 2017 12:56:28 +0000 (18:26 +0530)]
fix contribution page loading on no processor

7 years agoFix fatal error on pay later
Jitendra Purohit [Tue, 14 Nov 2017 03:26:32 +0000 (08:56 +0530)]
Fix fatal error on pay later

7 years agoCRM-21411 Fix issue where unsubscribe group field would not show because CRM.crmMaili...
Seamus Lee [Wed, 8 Nov 2017 20:09:53 +0000 (07:09 +1100)]
CRM-21411 Fix issue where unsubscribe group field would not show because CRM.crmMailing.groupNames was empty

7 years agoMerge pull request #11249 from seamuslee001/CRM-21363-maria
Eileen McNaughton [Wed, 8 Nov 2017 05:24:03 +0000 (18:24 +1300)]
Merge pull request #11249 from seamuslee001/CRM-21363-maria

CRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default g…

7 years agoCRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default global sql_modes
Seamus Lee [Tue, 7 Nov 2017 21:09:50 +0000 (08:09 +1100)]
CRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default global sql_modes

7 years agoMerge pull request #11173 from totten/master-reinstall-dep
Eileen McNaughton [Tue, 7 Nov 2017 04:42:50 +0000 (17:42 +1300)]
Merge pull request #11173 from totten/master-reinstall-dep

CRM-16243 - Redundant extension installation should not throw error

7 years agoMerge pull request #11229 from seamuslee001/dedupe_test_fix
Eileen McNaughton [Tue, 7 Nov 2017 04:32:40 +0000 (17:32 +1300)]
Merge pull request #11229 from seamuslee001/dedupe_test_fix

CRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode

7 years agoMerge pull request #11234 from seamuslee001/CRM-21388
Eileen McNaughton [Sun, 5 Nov 2017 22:16:28 +0000 (11:16 +1300)]
Merge pull request #11234 from seamuslee001/CRM-21388

CRM-21388 Only throw execption if Extexsion Key is set in the url

7 years agoMerge pull request #11231 from seamuslee001/recur_test_fix
Monish Deb [Fri, 3 Nov 2017 09:35:14 +0000 (15:05 +0530)]
Merge pull request #11231 from seamuslee001/recur_test_fix

Fix Recurring contribution sql so that it doesen't use group by as th…

7 years agoFix Recurring contribution sql so that it doesen't use group by as there doesn't...
Seamus Lee [Thu, 2 Nov 2017 23:40:16 +0000 (10:40 +1100)]
Fix Recurring contribution sql so that it doesen't use group by as there doesn't appear to be a reason to do so given that we have a where id = x clause and we were grouping on the same field

7 years agoCRM-21388 Only throw execption if Extexsion Key is set in the url
Seamus Lee [Fri, 3 Nov 2017 05:40:14 +0000 (16:40 +1100)]
CRM-21388 Only throw execption if Extexsion Key is set in the url

7 years agoCRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode
Seamus Lee [Thu, 2 Nov 2017 23:34:05 +0000 (10:34 +1100)]
CRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode

7 years agoMerge remote-tracking branch 'origin/4.7.27-rc' into 4.7.27-rc-master-2017-11-02...
CiviCRM [Thu, 2 Nov 2017 09:00:48 +0000 (09:00 +0000)]
Merge remote-tracking branch 'origin/4.7.27-rc' into 4.7.27-rc-master-2017-11-02-09-00-47

7 years agoMerge pull request #11219 from seamuslee001/test-fixes-full
Monish Deb [Thu, 2 Nov 2017 08:44:38 +0000 (14:14 +0530)]
Merge pull request #11219 from seamuslee001/test-fixes-full

CRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_…

7 years agoMerge remote-tracking branch 'agh1/4.7.26-releasenotes' into 4.7.27-rc-notes
Tim Otten [Thu, 2 Nov 2017 07:29:45 +0000 (00:29 -0700)]
Merge remote-tracking branch 'agh1/4.7.26-releasenotes' into 4.7.27-rc-notes

7 years agoAdd 4.7.26 release notes (credits)
Tim Otten [Thu, 2 Nov 2017 07:26:10 +0000 (00:26 -0700)]
Add 4.7.26 release notes (credits)

7 years agoAdd 4.7.26 release notes
Tim Otten [Thu, 2 Nov 2017 07:13:57 +0000 (00:13 -0700)]
Add 4.7.26 release notes

7 years agoCRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_DATE sqlModes
Seamus Lee [Tue, 31 Oct 2017 23:22:31 +0000 (10:22 +1100)]
CRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_DATE sqlModes

7 years agoMerge pull request #11221 from JMAConsulting/CRM-21379
colemanw [Wed, 1 Nov 2017 18:40:54 +0000 (14:40 -0400)]
Merge pull request #11221 from JMAConsulting/CRM-21379

CRM-21379: Remove hard-coded Activity status set as 'Scheduled' in query for listing activities in Activity dashlet

7 years agoremove special sort order handling for dashlet
deb.monish [Wed, 1 Nov 2017 17:30:37 +0000 (23:00 +0530)]
remove special sort order handling for dashlet

7 years agoadd unit test
deb.monish [Wed, 1 Nov 2017 12:14:14 +0000 (17:44 +0530)]
add unit test

7 years agoMerge pull request #11220 from mukeshcompucorp/HW-382-individual-case-type-setting...
colemanw [Wed, 1 Nov 2017 13:23:48 +0000 (09:23 -0400)]
Merge pull request #11220 from mukeshcompucorp/HW-382-individual-case-type-setting-page

HW-382: Moved help section outside of block

7 years agoCRM-21379: Remove hard-coded Activity status set as 'Scheduled' in query for listing...
deb.monish [Wed, 1 Nov 2017 08:26:42 +0000 (13:56 +0530)]
CRM-21379: Remove hard-coded Activity status set as 'Scheduled' in query for listing activities in Activity dashlet

7 years agoHW-382: Moved help section outside of block
Mukesh Ram [Wed, 1 Nov 2017 06:18:33 +0000 (11:48 +0530)]
HW-382: Moved help section outside of block

7 years ago4.7.27 release notes: sections in proper order
Andrew Hunt [Wed, 1 Nov 2017 04:52:59 +0000 (00:52 -0400)]
4.7.27 release notes: sections in proper order

7 years ago4.7.27 release notes: added late changes
Andrew Hunt [Wed, 1 Nov 2017 04:42:35 +0000 (00:42 -0400)]
4.7.27 release notes: added late changes

7 years ago4.7.27 release notes: finished bugs and contributors
Andrew Hunt [Tue, 31 Oct 2017 21:43:10 +0000 (17:43 -0400)]
4.7.27 release notes: finished bugs and contributors

7 years ago4.7.27 release notes: started bugs and updated release date
Andrew Hunt [Thu, 26 Oct 2017 19:46:23 +0000 (15:46 -0400)]
4.7.27 release notes: started bugs and updated release date

7 years ago4.7.27 release notes: done with features
Andrew Hunt [Wed, 25 Oct 2017 16:09:07 +0000 (12:09 -0400)]
4.7.27 release notes: done with features

7 years agoMerge pull request #10717 from JMAConsulting/CRM-20934
colemanw [Tue, 31 Oct 2017 22:36:24 +0000 (18:36 -0400)]
Merge pull request #10717 from JMAConsulting/CRM-20934

CRM-20934 Filtered active parent groups

7 years agoMerge pull request #11192 from JMAConsulting/CRM-21322
colemanw [Tue, 31 Oct 2017 22:22:03 +0000 (18:22 -0400)]
Merge pull request #11192 from JMAConsulting/CRM-21322

CRM-21322: create hook to modify entityRef fields

7 years agoMerge pull request #10681 from JMAConsulting/CRM-20868
colemanw [Tue, 31 Oct 2017 21:45:06 +0000 (17:45 -0400)]
Merge pull request #10681 from JMAConsulting/CRM-20868

CRM-20868, set invoice_number at Contribution::create not when invoice is generated

7 years agoMerge pull request #11217 from jitendrapurohit/CRM-21373
Eileen McNaughton [Tue, 31 Oct 2017 21:31:21 +0000 (10:31 +1300)]
Merge pull request #11217 from jitendrapurohit/CRM-21373

CRM-21373 - Notice error on creating cases

7 years agoMerge pull request #11054 from omarabuhussein/CRM-21195-improve-menu-item-icons-markup
colemanw [Tue, 31 Oct 2017 20:49:39 +0000 (16:49 -0400)]
Merge pull request #11054 from omarabuhussein/CRM-21195-improve-menu-item-icons-markup

CRM-21195: Improving menu item icon markup

7 years agominor fix
deb.monish [Wed, 26 Jul 2017 07:33:26 +0000 (13:03 +0530)]
minor fix

7 years agoMerge pull request #11218 from colemanw/CRM-21374
colemanw [Tue, 31 Oct 2017 15:18:12 +0000 (11:18 -0400)]
Merge pull request #11218 from colemanw/CRM-21374

CRM-21374 - Quick fix - D8 doesn't support regions

7 years agoCRM-21374 - Quick fix - D8 doesn't support regions
Coleman Watts [Tue, 31 Oct 2017 14:23:42 +0000 (10:23 -0400)]
CRM-21374 - Quick fix - D8 doesn't support regions

7 years agoupgrade code fix
deb.monish [Thu, 20 Jul 2017 11:42:54 +0000 (17:12 +0530)]
upgrade code fix

7 years agoadditional fixes and added unit test
deb.monish [Tue, 18 Jul 2017 11:33:55 +0000 (17:03 +0530)]
additional fixes and added unit test

7 years agoCRM-20868, set invoice_number at contribution->create, not invoice creation
Pradeep Nayak [Mon, 17 Jul 2017 12:11:59 +0000 (17:41 +0530)]
CRM-20868, set invoice_number at contribution->create, not invoice creation

----------------------------------------
* CRM-20868: set invoice_number at contribution->create, not invoice creation
  https://issues.civicrm.org/jira/browse/CRM-20868

CRM-20868, style fix

----------------------------------------
* CRM-20868: set invoice_number at contribution->create, not invoice creation
  https://issues.civicrm.org/jira/browse/CRM-20868

CRM-20868, fixed style error

----------------------------------------
* CRM-20868: set invoice_number at contribution->create, not invoice creation
  https://issues.civicrm.org/jira/browse/CRM-20868

7 years agoMerge pull request #11209 from seamuslee001/CRM-21364-2
Monish Deb [Tue, 31 Oct 2017 12:25:52 +0000 (17:55 +0530)]
Merge pull request #11209 from seamuslee001/CRM-21364-2

CRM-21364 Fix upgrades from 4.2.x for ONLY_FULL_GROUP_BY compatability

7 years agoCRM-21373 - Notice error on creating cases
Jitendra Purohit [Tue, 31 Oct 2017 12:12:30 +0000 (17:42 +0530)]
CRM-21373 - Notice error on creating cases

7 years agoMerge remote-tracking branch 'origin/4.7.27-rc' into 4.7.27-rc-master-2017-10-30...
Tim Otten [Tue, 31 Oct 2017 00:02:19 +0000 (17:02 -0700)]
Merge remote-tracking branch 'origin/4.7.27-rc' into 4.7.27-rc-master-2017-10-30-16-57-59

7 years agoMerge pull request #11211 from seamuslee001/CRM-20892-upgrade
Tim Otten [Mon, 30 Oct 2017 23:18:42 +0000 (16:18 -0700)]
Merge pull request #11211 from seamuslee001/CRM-20892-upgrade

CRM-20892 Fix up issue where created_date may not have yet been conve…

7 years agoMerge pull request #11156 from mukeshcompucorp/HW-381-case-type-settings-screen
colemanw [Mon, 30 Oct 2017 16:39:41 +0000 (12:39 -0400)]
Merge pull request #11156 from mukeshcompucorp/HW-381-case-type-settings-screen

CRM-21367: Styled case type settings sreen

7 years agoMerge pull request #11206 from JMAConsulting/CRM-21362
colemanw [Sun, 29 Oct 2017 23:43:58 +0000 (19:43 -0400)]
Merge pull request #11206 from JMAConsulting/CRM-21362

CRM-21362: Mailing summary report group by MySQL 5.7 error

7 years agoCRM-20892 Fix up issue where created_date may not have yet been converted to timestam...
Seamus Lee [Sun, 29 Oct 2017 21:15:10 +0000 (08:15 +1100)]
CRM-20892 Fix up issue where created_date may not have yet been converted to timestamp so should stay as datetime in upgrade

7 years agoCRM-21364 Fix upgrades from 4.2.x for ONLY_FULL_GROUP_BY compatability
Seamus Lee [Sun, 29 Oct 2017 04:17:24 +0000 (15:17 +1100)]
CRM-21364 Fix upgrades from 4.2.x for ONLY_FULL_GROUP_BY compatability

7 years agoMerge pull request #11080 from waddyvic/advanced-search-recur-status
Monish Deb [Fri, 27 Oct 2017 19:15:39 +0000 (00:45 +0530)]
Merge pull request #11080 from waddyvic/advanced-search-recur-status

CRM-21354 : Allow "Advanced Search" to search for recurring contribution status.

7 years agoadditional fixes
deb.monish [Fri, 27 Oct 2017 18:08:09 +0000 (23:38 +0530)]
additional fixes

7 years agoCRM-21362: Mailing summary report group by MySQL 5.7 error
deb.monish [Fri, 27 Oct 2017 08:23:24 +0000 (13:53 +0530)]
CRM-21362: Mailing summary report group by MySQL 5.7 error

7 years agoMerge pull request #11186 from totten/master-civicase-pdf
colemanw [Fri, 27 Oct 2017 17:48:34 +0000 (13:48 -0400)]
Merge pull request #11186 from totten/master-civicase-pdf

CRM-21255 - PDFLetterCommon - Detect buttons in new popup style

7 years agoMerge pull request #10934 from seamuslee001/full_group_by_testing
Monish Deb [Fri, 27 Oct 2017 11:39:34 +0000 (17:09 +0530)]
Merge pull request #10934 from seamuslee001/full_group_by_testing

CRM-21363 Test using ONLY_FULL_GROUP_BY sqlmode as well

7 years agoMove supportsFullGroupBy to CRM_Utils_SQL and add a CRM_Utils_SQL::getSqlModes functi...
Seamus Lee [Fri, 27 Oct 2017 09:54:08 +0000 (20:54 +1100)]
Move supportsFullGroupBy to CRM_Utils_SQL and add a CRM_Utils_SQL::getSqlModes function and set private test variable and update code as needed

7 years agoAdd test of sqlModes being set correctly
Seamus Lee [Sat, 2 Sep 2017 04:45:46 +0000 (14:45 +1000)]
Add test of sqlModes being set correctly

Revert to only running ONLY_FULL_GROUP_BY mode on mysql 5.7

7 years agoRefactor sqlMode setting to be checking if 'STRICT_TRANS_TABLES' is present or not
Seamus Lee [Sat, 2 Sep 2017 04:12:53 +0000 (14:12 +1000)]
Refactor sqlMode setting to be checking if 'STRICT_TRANS_TABLES' is present or not

7 years agoNFC Test using ONLY_FULL_GROUP_BY sqlmode as well
Seamus Lee [Fri, 1 Sep 2017 22:56:57 +0000 (08:56 +1000)]
NFC Test using ONLY_FULL_GROUP_BY sqlmode as well

7 years agoadditional fix
deb.monish [Thu, 26 Oct 2017 08:44:07 +0000 (14:14 +0530)]
additional fix

7 years agoMerge pull request #11200 from mlutfy/crm21351
Eileen McNaughton [Wed, 25 Oct 2017 23:13:13 +0000 (10:13 +1100)]
Merge pull request #11200 from mlutfy/crm21351

CRM-21351: fix deceased_date format on contact record page.

7 years agoAdd field in "Advanced Search" to search for contacts with specific recurring contrib...
Victor Huang [Fri, 6 Oct 2017 22:21:00 +0000 (16:21 -0600)]
Add field in "Advanced Search" to search for contacts with specific recurring contribution status(es).

CRM_Contribute_BAO_ContributionRecur: add multi-select dropdown field to select recurring contribution status.

CRM_Contribute_BAO_Query: add case to construct where clause for recurring contribution status.

templates/CRM/Contribute/Form/Search/ContributionRecur.tpl: add recurring contribution status field in template.

civicrm/civicrm-core#11080

Add quotes around recurring contribution status qill.

civicrm/civicrm-core#11080

Directly use CRM_Contribute_PseudoConstant::contributionStatus() instead
of creating variable that is not used anywhere else.

Remove space after closing ) to comply with coding standard

Remove comma after closing ) to comply with coding standard

Add unit test for recurring contribution status filter

Fix coding style error: The closing brace for the class must have an empty line before it

Do not use variable replacement in qill for static text "Recurring
Contribution Status".

7 years agoCRM-21351: fix deceased_date format on contact record page.
Mathieu Lutfy [Wed, 25 Oct 2017 16:13:40 +0000 (12:13 -0400)]
CRM-21351: fix deceased_date format on contact record page.

7 years agoMerge pull request #11194 from highfalutin/CRM-21346-export-pledge-installment-amount...
Monish Deb [Wed, 25 Oct 2017 12:26:41 +0000 (17:56 +0530)]
Merge pull request #11194 from highfalutin/CRM-21346-export-pledge-installment-amount-and-count

CRM-21346: Make pledge installment count & amount exportable

7 years agoMerge pull request #11188 from jitendrapurohit/revertCRM-20343
Monish Deb [Wed, 25 Oct 2017 11:39:01 +0000 (17:09 +0530)]
Merge pull request #11188 from jitendrapurohit/revertCRM-20343

CRM-20227 - Revert #10093 skip status calculation when form dates are not modified

7 years agoRemove extra whitespace
Noah Miller [Tue, 24 Oct 2017 21:26:36 +0000 (14:26 -0700)]
Remove extra whitespace

7 years agoCRM-21346: Make pledge installment count & amount exportable
Noah Miller [Tue, 24 Oct 2017 21:02:37 +0000 (14:02 -0700)]
CRM-21346: Make pledge installment count & amount exportable

7 years agoTranslateable strings (#11191)
Matthew Wire [Tue, 24 Oct 2017 20:58:52 +0000 (21:58 +0100)]
Translateable strings (#11191)

7 years ago Notice if no prev. mailing reports exist in a system (#11181)
yurg [Tue, 24 Oct 2017 20:56:39 +0000 (22:56 +0200)]
 Notice if no prev. mailing reports exist in a system (#11181)

*  Notice if no prev. mailing reports exist in a system

https://civicrm.stackexchange.com/questions/20943/blank-page-in-mailings-with-notice/

* Update Info.php

Spaces according to code style and https://test.civicrm.org/job/CiviCRM-Core-PR/17741/checkstyleResult/new/

* Update Info.php

White spaces correction

7 years agoCRM-21322: create hook to modify entityRef fields
deb.monish [Tue, 24 Oct 2017 12:29:25 +0000 (17:59 +0530)]
CRM-21322: create hook to modify entityRef fields

7 years agoMerge pull request #11185 from totten/master-recip-star
Monish Deb [Tue, 24 Oct 2017 12:08:45 +0000 (17:38 +0530)]
Merge pull request #11185 from totten/master-recip-star

CRM-21335: CiviMail - Make recipient appear as required

7 years agoMerge pull request #11184 from davejenx/CRM-20955-20966-unit-tests
Monish Deb [Tue, 24 Oct 2017 11:16:27 +0000 (16:46 +0530)]
Merge pull request #11184 from davejenx/CRM-20955-20966-unit-tests

CRM-20955 CRM-20966 Adding unit tests.

7 years agoMerge pull request #11148 from yashodha/CRM-21321
Monish Deb [Tue, 24 Oct 2017 10:51:21 +0000 (16:21 +0530)]
Merge pull request #11148 from yashodha/CRM-21321

CRM-21321 - Membership fields not loading in 'On behalf of' profile

7 years agoRevert #10093 skip status calculation when form dates are not modified
Jitendra Purohit [Tue, 24 Oct 2017 09:36:15 +0000 (15:06 +0530)]
Revert #10093 skip status calculation when form dates are not modified

7 years agoCRM-20955 CRM-20966 Adding unit tests: minor changes to text wording, capitalisation...
Dave Jenkins [Tue, 24 Oct 2017 09:29:51 +0000 (10:29 +0100)]
CRM-20955 CRM-20966 Adding unit tests: minor changes to text wording, capitalisation & white space.

7 years agoCRM-21255 - PDFLetterCommon - Detect buttons in new popup style
Tim Otten [Tue, 24 Oct 2017 01:11:36 +0000 (18:11 -0700)]
CRM-21255 - PDFLetterCommon - Detect buttons in new popup style

Overview
--------------

Suppose you enable the extension `org.civicrm.civicase`, set the option
`recordGeneratedLetters=combined-attached`, and create a PDF based on the
instructions in [CRM-21255](https://issues.civicrm.org/jira/browse/CRM-21255).

The PDF generator tries to determine whether the clicked the button labeled
"Preview" or "Download Document". This works correctly with the CiviCase 4 popup
mechanism, but in the CiviCase 5 popup mechanism it doesn't work.

Before
--------------

When you click the "Download Document" button, the operates in a
quasi-preview mode and fails to create any activities. This eventually
leads to a crash because the expected activities are missing.

After
--------------

The controller uses a more accurate check which correctly differentiates
"Preview" and "Download Document" on both CiviCase 4+5.

Comments
--------------

I'm not a huge fan of this patch, but it helps demonstrate the
problem+solution.  @colemanw, perhaps there's a better way to make
the buttons function consistently in CiviCase 4+5?

7 years agoMerge pull request #11166 from JMAConsulting/CRM-21336
colemanw [Mon, 23 Oct 2017 22:49:28 +0000 (18:49 -0400)]
Merge pull request #11166 from JMAConsulting/CRM-21336

CRM-21336: Custom file fields should display file name without hash

7 years agoCRM-21335 - crmMailing - Ensure that `recipients` renders as required
Tim Otten [Mon, 23 Oct 2017 21:34:41 +0000 (14:34 -0700)]
CRM-21335 - crmMailing - Ensure that `recipients` renders as required

7 years agoCRM-21335 - crmUi - Allow forcing the required `*` flag
Tim Otten [Mon, 23 Oct 2017 21:28:48 +0000 (14:28 -0700)]
CRM-21335 - crmUi - Allow forcing the required `*` flag

The `crm-ui-field` autodetects whether the element is required by inspecting
the Angular form model. However, in CRM-21335, we have a scenario where this
inspection fails. (There are other possible scenarios -- eg generally, if the
apparent field element is not actually a well-behaved+singular Angular form element.)

This revision adds a new option to make the field *render* as required even
if there's no underlying form ngModel element.

Ex:

```html
<div crm-ui-field="{name: 'subform.recipients', title: ts('Recipients'), required: true}">...</div>
```

7 years agoMerge pull request #11017 from seamuslee001/CRM-21212
Tim Otten [Mon, 23 Oct 2017 19:00:57 +0000 (12:00 -0700)]
Merge pull request #11017 from seamuslee001/CRM-21212

CRM-21212 Include getUfId function for wordpress to help getting E2E …

7 years agoCRM-20955 CRM-20966 Adding unit tests.
Dave Jenkins [Mon, 23 Oct 2017 17:30:54 +0000 (18:30 +0100)]
CRM-20955 CRM-20966 Adding unit tests.

7 years agoMerge pull request #11170 from mattwire/CRM-21339_fatal_js_error_cart_checkout
Eileen McNaughton [Mon, 23 Oct 2017 02:49:50 +0000 (13:49 +1100)]
Merge pull request #11170 from mattwire/CRM-21339_fatal_js_error_cart_checkout

CRM-21339 Fix fatal js error on cart checkout when pay later not enabled

7 years agoMerge pull request #11172 from alifrumin/permission
Eileen McNaughton [Mon, 23 Oct 2017 02:46:56 +0000 (13:46 +1100)]
Merge pull request #11172 from alifrumin/permission

CRM - 21340 using civi function to get contact id because it is cms agnostic

7 years agoMerge pull request #10856 from mattwire/CRM-21062_taxrate_trailing_zeros
Eileen McNaughton [Mon, 23 Oct 2017 02:41:47 +0000 (13:41 +1100)]
Merge pull request #10856 from mattwire/CRM-21062_taxrate_trailing_zeros

CRM-21062 Remove trailing zeros in tax rate for online Confirm/Thankyou forms -…

7 years agoMerge pull request #10805 from JKingsnorth/CRM-21009
Eileen McNaughton [Sun, 22 Oct 2017 00:22:09 +0000 (13:22 +1300)]
Merge pull request #10805 from JKingsnorth/CRM-21009

CRM-21009 Only count line items with a quantity towards max capacity

7 years agoMerge pull request #10557 from seamuslee001/CRM-20769
Eileen McNaughton [Sun, 22 Oct 2017 00:16:36 +0000 (13:16 +1300)]
Merge pull request #10557 from seamuslee001/CRM-20769

CRM-20769 Allow for Profile button text to be overidden in profile settings

7 years agoMerge pull request #11129 from seamuslee001/CRM-21306
Eileen McNaughton [Sat, 21 Oct 2017 23:53:28 +0000 (12:53 +1300)]
Merge pull request #11129 from seamuslee001/CRM-21306

CRM-21306 Add in comments to array to pass to the Doctor When extensi…

7 years agoCRM-21306 Add in comments to array to pass to the Doctor When extension so that it...
Seamus Lee [Thu, 12 Oct 2017 13:26:20 +0000 (00:26 +1100)]
CRM-21306 Add in comments to array to pass to the Doctor When extension so that it doesn't loose comments

7 years agoMerge pull request #11016 from mattwire/CRM-20772_database_fieldtypes
Eileen McNaughton [Sat, 21 Oct 2017 23:41:08 +0000 (12:41 +1300)]
Merge pull request #11016 from mattwire/CRM-20772_database_fieldtypes

CRM-20772 Add database changes to support > 2 decimal places

7 years agoFormat tax rate for display on confirm/thankyou pages
Matthew Wire [Sat, 21 Oct 2017 09:27:31 +0000 (10:27 +0100)]
Format tax rate for display on confirm/thankyou pages

7 years agoAdd database changes to support > 2 decimal places in calculations
Matthew Wire [Sat, 21 Oct 2017 09:04:35 +0000 (10:04 +0100)]
Add database changes to support > 2 decimal places in calculations

7 years agoCRM-16243 - Redundant installation should not throw error
Tim Otten [Sat, 21 Oct 2017 00:17:43 +0000 (17:17 -0700)]
CRM-16243 - Redundant installation should not throw error

Suppose we have two modules, `foo.core` and `foo.addon` (where `foo.addon`
depends on `foo.core`).

Now you suppose you try to install `foo.addon` twice, e.g.

```
cv en foo.addon
cv en foo.addon
```

The first installation succeeds (and enables both modules as expected).
However, the second installation throws an error: "Dependency foo.core not
found, required by foo.addon"

This adds a test and resolves the error.

7 years agoMerge pull request #11168 from JKingsnorth/CRM-21337
Mathieu Lu [Sat, 21 Oct 2017 00:01:32 +0000 (20:01 -0400)]
Merge pull request #11168 from JKingsnorth/CRM-21337

CRM-21337 ISO compliance for Romanian and Bulgarian counties

7 years agoMerge pull request #11113 from wmortada/CRM-21297
Tim Otten [Fri, 20 Oct 2017 17:50:45 +0000 (10:50 -0700)]
Merge pull request #11113 from wmortada/CRM-21297

CRM-21297 - Automatically fill database details in Drupal installer