civicrm-core.git
6 years agoAdd unit test coverage for financial_type_id
Matthew Wire [Sat, 28 Apr 2018 20:32:53 +0000 (21:32 +0100)]
Add unit test coverage for financial_type_id

6 years agoMake sure financial_type_id is properly assigned when non-recurring contribution...
Matthew Wire [Sat, 31 Mar 2018 09:55:58 +0000 (10:55 +0100)]
Make sure financial_type_id is properly assigned when non-recurring contribution is created.

6 years agoMerge pull request #12053 from civicrm/5.1
Eileen McNaughton [Sun, 29 Apr 2018 07:47:24 +0000 (19:47 +1200)]
Merge pull request #12053 from civicrm/5.1

merge 5.1 to master

6 years agoMerge pull request #12045 from eileenmcnaughton/search-fix
Eileen McNaughton [Sun, 29 Apr 2018 07:44:18 +0000 (19:44 +1200)]
Merge pull request #12045 from eileenmcnaughton/search-fix

Fix regression whereby relationship types option no longer in adv search

6 years agoMerge pull request #12047 from seamuslee001/dev_core_90
Eileen McNaughton [Sun, 29 Apr 2018 07:43:50 +0000 (19:43 +1200)]
Merge pull request #12047 from seamuslee001/dev_core_90

Dev/Core#90 Apply disabling Full Group By to reports

6 years agoMerge pull request #12046 from eileenmcnaughton/pcp
Eileen McNaughton [Sun, 29 Apr 2018 06:07:43 +0000 (18:07 +1200)]
Merge pull request #12046 from eileenmcnaughton/pcp

[NFC] Add metadata to describe personal note field

6 years agoDev/Core#90 Apply disabling Full Group By to reports
Seamus Lee [Sun, 29 Apr 2018 05:21:55 +0000 (15:21 +1000)]
Dev/Core#90 Apply disabling Full Group By to reports

6 years agoMerge pull request #12043 from seamuslee001/dev_core_90
Seamus Lee [Sun, 29 Apr 2018 05:18:19 +0000 (15:18 +1000)]
Merge pull request #12043 from seamuslee001/dev_core_90

Dev/Core#90 Disable Only Full Group By sql mode on specific queries t…

6 years agoFix regression whereby relationship types option no longer in adv search
eileen [Sun, 29 Apr 2018 02:08:59 +0000 (14:08 +1200)]
Fix regression whereby relationship types option no longer in adv search

6 years agoMerge pull request #12039 from mattwire/deprecated_paymentprocessortype
Eileen McNaughton [Sun, 29 Apr 2018 04:39:17 +0000 (16:39 +1200)]
Merge pull request #12039 from mattwire/deprecated_paymentprocessortype

Remove usage of deprecated paymentProcessorType function

6 years agoAdd metadata to describe personal note field
eileen [Sun, 29 Apr 2018 02:58:25 +0000 (14:58 +1200)]
Add metadata to describe personal note field

6 years agoDev/Core#90 Disable Only Full Group By sql mode on specific queries to get tests...
Seamus Lee [Sun, 29 Apr 2018 02:02:04 +0000 (12:02 +1000)]
Dev/Core#90 Disable Only Full Group By sql mode on specific queries to get tests to pass so we can switch to using MySQL 5.7 for PR Tests

6 years agoMerge pull request #12027 from jitendrapurohit/core-75
Eileen McNaughton [Sat, 28 Apr 2018 23:33:58 +0000 (11:33 +1200)]
Merge pull request #12027 from jitendrapurohit/core-75

core/issues/75 - warning message after an activity is created

6 years agoRemove usage of deprecated function and duplicated code in getPayment()
Matthew Wire [Sat, 28 Apr 2018 15:16:27 +0000 (16:16 +0100)]
Remove usage of deprecated function and duplicated code in getPayment()

6 years agoRemove unused variable
Matthew Wire [Sat, 28 Apr 2018 15:09:22 +0000 (16:09 +0100)]
Remove unused variable

6 years agoMerge pull request #12020 from yashodha/inv_report
Seamus Lee [Sat, 28 Apr 2018 07:06:15 +0000 (17:06 +1000)]
Merge pull request #12020 from yashodha/inv_report

core/issues/73 - Add invoice number to bookkeeping report

6 years agoMerge pull request #12034 from colemanw/versionCheck
Tim Otten [Sat, 28 Apr 2018 05:50:10 +0000 (22:50 -0700)]
Merge pull request #12034 from colemanw/versionCheck

Flush versionCheck cache when upgrading

6 years agoFlush versionCheck cache when upgrading
Coleman Watts [Fri, 27 Apr 2018 03:44:55 +0000 (23:44 -0400)]
Flush versionCheck cache when upgrading

6 years agoMerge pull request #10695 from JMAConsulting/CRM-20879
Eileen McNaughton [Fri, 27 Apr 2018 08:01:20 +0000 (20:01 +1200)]
Merge pull request #10695 from JMAConsulting/CRM-20879

CRM-20879: Extend self-service event registration transfer to backend

6 years agoMerge pull request #12033 from compucorp/81-fix-warnings-in-custom-entities
Seamus Lee [Thu, 26 Apr 2018 22:54:58 +0000 (08:54 +1000)]
Merge pull request #12033 from compucorp/81-fix-warnings-in-custom-entities

(NFC) Fix Warnings When Updating Custom Entities

6 years agodev/core#81 (NFC) Fix warnings in custom field create
Michael Devery [Thu, 26 Apr 2018 16:16:30 +0000 (17:16 +0100)]
dev/core#81 (NFC) Fix warnings in custom field create

6 years agodev/core#81 (NFC) Fix warnings in custom group create
Michael Devery [Thu, 26 Apr 2018 16:15:38 +0000 (17:15 +0100)]
dev/core#81 (NFC) Fix warnings in custom group create

6 years agoMerge pull request #12029 from totten/master-xml-headers
colemanw [Thu, 26 Apr 2018 15:14:56 +0000 (11:14 -0400)]
Merge pull request #12029 from totten/master-xml-headers

(NFC) Update version headers in `xml`, `tests`, `tools`, et al

6 years agoMerge pull request #12031 from mukeshcompucorp/fix-template-structure-issues
colemanw [Thu, 26 Apr 2018 14:08:49 +0000 (10:08 -0400)]
Merge pull request #12031 from mukeshcompucorp/fix-template-structure-issues

Move help section outside the container

6 years agoMove help section outside the container
Mukesh Ram [Thu, 26 Apr 2018 10:58:47 +0000 (16:28 +0530)]
Move help section outside the container

6 years agoGeneric.getunique API - Fix code style
Tim Otten [Thu, 26 Apr 2018 01:32:27 +0000 (18:32 -0700)]
Generic.getunique API - Fix code style

This appears to be a pre-existing issue, but it shows up as an error when
updating some of the header-comments.

6 years ago(NFC) Update version headers in `api/`
Tim Otten [Wed, 25 Apr 2018 23:42:58 +0000 (16:42 -0700)]
(NFC) Update version headers in `api/`

This looks like a new file that slipped through because it was roughly
contemporaneous with the previous fixup (fee14197b427c1781e369e5bfd36816afad6d7ee).

6 years ago(NFC) Update version headers in `tests/`
Tim Otten [Wed, 25 Apr 2018 23:40:26 +0000 (16:40 -0700)]
(NFC) Update version headers in `tests/`

This is a simple administrative update to the headers. It's a follow-up to
https://github.com/civicrm/civicrm-core/pull/11999 (fee14197b427c1781e369e5bfd36816afad6d7ee)
which addresses some files missed by the previous search.

6 years ago(NFC) Update version headers in `header*`
Tim Otten [Wed, 25 Apr 2018 23:39:24 +0000 (16:39 -0700)]
(NFC) Update version headers in `header*`

This is a simple administrative update to the headers. It's a follow-up to
https://github.com/civicrm/civicrm-core/pull/11999 (fee14197b427c1781e369e5bfd36816afad6d7ee)
which addresses some files missed by the previous search.

6 years ago(NFC) Update version headers in `tools/`
Tim Otten [Wed, 25 Apr 2018 23:34:53 +0000 (16:34 -0700)]
(NFC) Update version headers in `tools/`

This is a simple administrative update to the headers. It's a follow-up to
https://github.com/civicrm/civicrm-core/pull/11999 (fee14197b427c1781e369e5bfd36816afad6d7ee)
which addresses some files missed by the previous search.

6 years ago(NFC) Update version headers in `sql/`
Tim Otten [Wed, 25 Apr 2018 23:34:32 +0000 (16:34 -0700)]
(NFC) Update version headers in `sql/`

This is a simple administrative update to the headers. It's a follow-up to
https://github.com/civicrm/civicrm-core/pull/11999 (fee14197b427c1781e369e5bfd36816afad6d7ee)
which addresses some files missed by the previous search.

6 years ago(NFC) Update version headers in `xml/`
Tim Otten [Wed, 25 Apr 2018 23:28:13 +0000 (16:28 -0700)]
(NFC) Update version headers in `xml/`

This is a simple administrative update to the headers. It's a follow-up to
https://github.com/civicrm/civicrm-core/pull/11999 (fee14197b427c1781e369e5bfd36816afad6d7ee).

This addresses a small discrepancy -- after running GenCode locally, some files would be changed
back to `version 4.7`. Now they'll stay as `version 5`.

6 years agocore/issues/75 - warning message after an activity is created
Jitendra Purohit [Wed, 25 Apr 2018 05:38:25 +0000 (11:08 +0530)]
core/issues/75 - warning message after an activity is created

6 years agoMerge pull request #12009 from yashodha/translate_strings
Mathieu Lu [Tue, 24 Apr 2018 20:50:24 +0000 (16:50 -0400)]
Merge pull request #12009 from yashodha/translate_strings

Translate strings in "Report" UI, et al

6 years agoCRM-20879: Extend self-service event registration transfer to backend
deb.monish [Tue, 18 Jul 2017 19:25:20 +0000 (00:55 +0530)]
CRM-20879: Extend self-service event registration transfer to backend

6 years agoMerge pull request #12023 from compucorp/refactor-case-type-tests
Monish Deb [Tue, 24 Apr 2018 19:10:35 +0000 (00:40 +0530)]
Merge pull request #12023 from compucorp/refactor-case-type-tests

Add missing case type tests

6 years agoFix js lint issues
colemanw [Tue, 24 Apr 2018 14:21:13 +0000 (10:21 -0400)]
Fix js lint issues

6 years agoMerge pull request #12010 from JMAConsulting/dev-core-70
colemanw [Tue, 24 Apr 2018 14:15:56 +0000 (10:15 -0400)]
Merge pull request #12010 from JMAConsulting/dev-core-70

(dev/core/issues/70) On any custom search 'Print selected rows' action doesn't retain columns/values

6 years agoAdd tests for CaseTypeListCtrl's revertCaseType method
René Olivo [Tue, 24 Apr 2018 00:02:04 +0000 (20:02 -0400)]
Add tests for CaseTypeListCtrl's revertCaseType method

6 years agoAdd tests for CaseTypeListCtrl's deleteCaseType method
René Olivo [Mon, 23 Apr 2018 23:54:34 +0000 (19:54 -0400)]
Add tests for CaseTypeListCtrl's deleteCaseType method

6 years agoAdd tests for CaseTypeListCtrl's toggleCaseType method
René Olivo [Mon, 23 Apr 2018 23:26:43 +0000 (19:26 -0400)]
Add tests for CaseTypeListCtrl's toggleCaseType method

6 years agoAdd test for caseTypeListCtrl case types storage
René Olivo [Mon, 23 Apr 2018 23:15:56 +0000 (19:15 -0400)]
Add test for caseTypeListCtrl case types storage

6 years agoDefine common dependencies at the top of the spec file
René Olivo [Mon, 23 Apr 2018 23:09:03 +0000 (19:09 -0400)]
Define common dependencies at the top of the spec file

6 years agocore/issues/73 - Add invoice number to bookkeeping report
yashodha [Mon, 23 Apr 2018 11:07:38 +0000 (16:37 +0530)]
core/issues/73 - Add invoice number to bookkeeping report

6 years agomore fixes
yashodha [Mon, 23 Apr 2018 05:59:52 +0000 (11:29 +0530)]
more fixes

6 years agoMerge pull request #12017 from colemanw/Improve
Monish Deb [Mon, 23 Apr 2018 04:06:46 +0000 (09:36 +0530)]
Merge pull request #12017 from colemanw/Improve

Improve input handling in get-cases AJAX API

6 years agoMerge pull request #12014 from seamuslee001/dev_core_65
Monish Deb [Mon, 23 Apr 2018 03:55:06 +0000 (09:25 +0530)]
Merge pull request #12014 from seamuslee001/dev_core_65

dev/core#65 Fix issue where source for participant could be entered w…

6 years agoMerge pull request #12018 from civicrm/5.1
Eileen McNaughton [Mon, 23 Apr 2018 02:38:14 +0000 (14:38 +1200)]
Merge pull request #12018 from civicrm/5.1

5.1

6 years agoMerge pull request #12008 from totten/5.1-relnote-footer
Eileen McNaughton [Mon, 23 Apr 2018 02:37:53 +0000 (14:37 +1200)]
Merge pull request #12008 from totten/5.1-relnote-footer

footer.tpl - Change the URL formula pointing to the release notes

6 years agoImprove input handling in get-cases AJAX API
Coleman Watts [Mon, 23 Apr 2018 01:36:07 +0000 (21:36 -0400)]
Improve input handling in get-cases AJAX API

6 years agodev/core#65 Fix issue where source for participant could be entered which is longer...
Seamus Lee [Sun, 22 Apr 2018 07:29:05 +0000 (17:29 +1000)]
dev/core#65 Fix issue where source for participant could be entered which is longer than allowable in the databse

Update files to use metadata approach as per monish and Eileen

6 years agoMerge pull request #11990 from vinuvarshith/entity-unique-fields-api-call
Eileen McNaughton [Sat, 21 Apr 2018 03:38:45 +0000 (15:38 +1200)]
Merge pull request #11990 from vinuvarshith/entity-unique-fields-api-call

Add New API Call To Get All Unique Fields For Given Entity

6 years agoMerge pull request #11972 from eileenmcnaughton/sch
Seamus Lee [Fri, 20 Apr 2018 22:09:27 +0000 (08:09 +1000)]
Merge pull request #11972 from eileenmcnaughton/sch

CRM-19885 / dev/core/issues/36 fix fatal error on scheduled reminders due to no default

6 years ago(dev/core/issues/70) On any custom search 'Print selected rows' action doesn't retain...
deb.monish [Fri, 20 Apr 2018 20:40:37 +0000 (02:10 +0530)]
(dev/core/issues/70) On any custom search 'Print selected rows' action doesn't retain columns/values

6 years agotranslate more strings
yashodha [Fri, 20 Apr 2018 09:23:17 +0000 (14:53 +0530)]
translate more strings

6 years agotranslate more strings
yashodha [Fri, 20 Apr 2018 09:16:43 +0000 (14:46 +0530)]
translate more strings

6 years agotranslate more strings
yashodha [Fri, 20 Apr 2018 09:10:43 +0000 (14:40 +0530)]
translate more strings

6 years agofooter.tpl - The release notes URL should be more maintainable
Tim Otten [Fri, 20 Apr 2018 02:04:09 +0000 (19:04 -0700)]
footer.tpl - The release notes URL should be more maintainable

Overview
----------------------------------------
Change the URL formula pointing to the release notes.

Before
----------------------------------------
The formula was `https://github.com/civicrm/civicrm-core/blob/{$version}/release-notes/{$version}.md`. Because the URL
points to a tag on Github, it's hard to make any corrections if something has changed or gone wrong.

After
----------------------------------------
The formula is `https://download.civicrm.org/about/{$version}`, which corresponds to
[civicrm-dist-manager's AboutController](https://github.com/civicrm/civicrm-dist-manager/blob/master/src/CiviDistManagerBundle/Controller/AboutController.php).

6 years agoCRM-19885 / dev/core/issues/36 fix fatal error on scheduled reminders due to no default
eileen [Fri, 13 Apr 2018 02:52:09 +0000 (14:52 +1200)]
CRM-19885 / dev/core/issues/36 fix fatal error on scheduled reminders due to no default

6 years agoMerge pull request #11993 from jaapjansma/issue_66
Eileen McNaughton [Thu, 19 Apr 2018 21:04:06 +0000 (09:04 +1200)]
Merge pull request #11993 from jaapjansma/issue_66

Standardise Address code in Contact summary report & enable links

6 years agoMerge pull request #11967 from seamuslee001/dev_translation_9
Eileen McNaughton [Thu, 19 Apr 2018 20:48:56 +0000 (08:48 +1200)]
Merge pull request #11967 from seamuslee001/dev_translation_9

dev/translation#9 Create API Action to rebuild Multilingual Schema

6 years agoMerge pull request #12006 from civicrm/5.1
Eileen McNaughton [Thu, 19 Apr 2018 20:46:18 +0000 (08:46 +1200)]
Merge pull request #12006 from civicrm/5.1

5.1 merge to master

6 years agoMerge pull request #12005 from eileenmcnaughton/5.1
Eileen McNaughton [Thu, 19 Apr 2018 20:43:35 +0000 (08:43 +1200)]
Merge pull request #12005 from eileenmcnaughton/5.1

core/issues/64 - In custom searches, column headings are being ignored

6 years agocore/issues/64 - In custom searches, column headings are being ignored
Jitendra Purohit [Thu, 19 Apr 2018 12:21:42 +0000 (17:51 +0530)]
core/issues/64 - In custom searches, column headings are being ignored

6 years agoMerge pull request #12001 from jitendrapurohit/core-64
Eileen McNaughton [Thu, 19 Apr 2018 20:04:42 +0000 (08:04 +1200)]
Merge pull request #12001 from jitendrapurohit/core-64

core/issues/64 - In custom searches, column headings are being ignored

6 years agoWork on issue 66 (https://lab.civicrm.org/dev/core/issues/66)
Jaap Jansma [Wed, 18 Apr 2018 09:00:36 +0000 (11:00 +0200)]
Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

 Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

 Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

 Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

 Work on issue 66 (https://lab.civicrm.org/dev/core/issues/66)

6 years agoSet API Function Name Case To All Lowercase
varshith89 [Thu, 19 Apr 2018 12:54:11 +0000 (12:54 +0000)]
Set API Function Name Case To All Lowercase

6 years agocore/issues/64 - In custom searches, column headings are being ignored
Jitendra Purohit [Thu, 19 Apr 2018 12:21:42 +0000 (17:51 +0530)]
core/issues/64 - In custom searches, column headings are being ignored

6 years agoMerge pull request #11992 from mydropwizard/merge-contact
Monish Deb [Thu, 19 Apr 2018 11:13:15 +0000 (16:43 +0530)]
Merge pull request #11992 from mydropwizard/merge-contact

Fix the contact merge form on Drupal 8

6 years agodev/translation#9 Create API Action to rebuild Multilingual Schema
Seamus Lee [Tue, 10 Apr 2018 21:31:30 +0000 (07:31 +1000)]
dev/translation#9 Create API Action to rebuild Multilingual Schema

6 years agoMerge pull request #11999 from totten/master-header
Eileen McNaughton [Thu, 19 Apr 2018 08:21:35 +0000 (20:21 +1200)]
Merge pull request #11999 from totten/master-header

(NFC) Update version in header

6 years ago(NFC) Update version in header
Tim Otten [Thu, 19 Apr 2018 05:18:39 +0000 (22:18 -0700)]
(NFC) Update version in header

This is a simple administrative update to the headers. It was generated with the command:

```
rgrep '| CiviCRM version 4.7' CRM/ Civi ang api bin extern install/ settings/ templates -l \
  | xargs sed -i'' "s/| CiviCRM version 4.7/| CiviCRM version 5  /g"
```

Tthe inclusion of `|` aimed to avoid matching any non-header text (e.g. inline docs that
mentioned the version incidentally). But then I did a looser search and for just

```
rgrep 'CiviCRM version 4.7'
````

and manually patched the remainder.

Note: I'm not really keen on doing this every month, so I relaxed the header
statement -- instead of `CiviCRM version 5.0`, it's just `CiviCRM version 5`.

6 years agoMerge pull request #11991 from totten/5.1-vernum
colemanw [Thu, 19 Apr 2018 02:39:28 +0000 (22:39 -0400)]
Merge pull request #11991 from totten/5.1-vernum

VersionCheck - Get more nuanced messages from latest.civicrm.org

6 years agoMerge pull request #11986 from eileenmcnaughton/test
colemanw [Thu, 19 Apr 2018 01:41:18 +0000 (21:41 -0400)]
Merge pull request #11986 from eileenmcnaughton/test

Namespace exception in test

6 years agoMerge pull request #11853 from compucorp/CRM-21849-inline-relationship-type-edit
colemanw [Thu, 19 Apr 2018 01:39:08 +0000 (21:39 -0400)]
Merge pull request #11853 from compucorp/CRM-21849-inline-relationship-type-edit

CRM-21849: Inline Relationship Type Edit

6 years agoMerge pull request #11995 from eileenmcnaughton/odd
Seamus Lee [Thu, 19 Apr 2018 01:29:41 +0000 (11:29 +1000)]
Merge pull request #11995 from eileenmcnaughton/odd

Fix intermittant test bug

6 years agoMerge pull request #11963 from JMAConsulting/dev-mail-8
Seamus Lee [Wed, 18 Apr 2018 21:55:54 +0000 (07:55 +1000)]
Merge pull request #11963 from JMAConsulting/dev-mail-8

(dev/mail/8) Using ACL to restrict mailing recipients leads to fatal error

6 years agoMerge pull request #11984 from eileenmcnaughton/5.1.1
Seamus Lee [Wed, 18 Apr 2018 21:39:39 +0000 (07:39 +1000)]
Merge pull request #11984 from eileenmcnaughton/5.1.1

Fix trigger generation for modified_date on custom data

6 years agoFix intermittant test bug
eileen [Wed, 18 Apr 2018 14:28:39 +0000 (02:28 +1200)]
Fix intermittant test bug

6 years agoAdd Unit Tests For getunique API get
varshith89 [Wed, 18 Apr 2018 19:00:26 +0000 (19:00 +0000)]
Add Unit Tests For getunique API get

6 years agoUse indices Function In DAOs Instead Of SQL Query
varshith89 [Wed, 18 Apr 2018 18:59:39 +0000 (18:59 +0000)]
Use indices Function In DAOs Instead Of SQL Query

6 years agoVersionCheck - Get more nuanced messages from latest.civicrm.org
Tim Otten [Wed, 18 Apr 2018 00:41:11 +0000 (17:41 -0700)]
VersionCheck - Get more nuanced messages from latest.civicrm.org

Overview
----------------------------------------
Get fully-formed upgrade messages from `latest.civicrm.org`. This allows us to convey more nuanced information about available upgrades.
It also allows us to iterate more quickly on how releases are presented (e.g. adding hyperlinks to the blog/changelog, highlighting
important changes, introducing the in-between status `deprecated`).

Before
----------------------------------------
The `VersionCheck` helper sends a request to `latest.civicrm.org` with `format=json` to get a list of all available versions.

Then it digests the information and presents any messages in the `CRM_Utils_Check` layer.

After
----------------------------------------
The `VersionCheck` helper sends a request to `latest.civicrm.org` with `format=summary` to get a list of displayable messages.

Then it presents any messages in the `CRM_Utils_Check` layer.

Technical Details
----------------------------------------

* Because patch-releases are allowed mid-month, this patch also reduces the TTL from 7 days to 3 days.
* Test coverage is reduced here (`civicrm-core`), but it's improved a lot elsewhere (`latest.civicrm.org`).
* In `VersionCheck`, it makes a few contract changes (which have been evaluated by grepping for stale references circa 4.7.31). Specifically:
    * Add `getVersionMessages()`
    * Remove unnecessary members `$localMajorVersion`, `getMajorVersion()`, `isNewerVersionAvailable()`, `checkBranchForNewVersion()`
    * Change the content of `versionInfo`. It's still a cache of the web-service response, but now it's a list of displayable messages (rather than a list of all versions).

6 years agoMerge pull request #11979 from compucorp/fix-crm-add-name-directive
colemanw [Wed, 18 Apr 2018 13:41:07 +0000 (09:41 -0400)]
Merge pull request #11979 from compucorp/fix-crm-add-name-directive

Fix select2 value updation for crmAddName Directive

6 years agouse Civi::static in place of static variable
deb.monish [Wed, 18 Apr 2018 12:21:24 +0000 (17:51 +0530)]
use Civi::static in place of static variable

6 years agoMerge pull request #11971 from lcdservices/dev-financial-11
Eileen McNaughton [Wed, 18 Apr 2018 09:23:33 +0000 (21:23 +1200)]
Merge pull request #11971 from lcdservices/dev-financial-11

dev/financial#11 email invoice fails with validation error

6 years agoFix the contact merge form on Drupal 8
David Snopek [Wed, 18 Apr 2018 03:12:51 +0000 (22:12 -0500)]
Fix the contact merge form on Drupal 8

6 years agoMerge pull request #11988 from yashodha/translate_strings
Eileen McNaughton [Tue, 17 Apr 2018 23:16:37 +0000 (11:16 +1200)]
Merge pull request #11988 from yashodha/translate_strings

translate strings

6 years agoAdd New API Call To Get All Unique Fields For Given Entity
varshith89 [Tue, 17 Apr 2018 14:18:37 +0000 (14:18 +0000)]
Add New API Call To Get All Unique Fields For Given Entity

6 years agotranslate strings
yashodha [Tue, 17 Apr 2018 11:34:12 +0000 (17:04 +0530)]
translate strings

6 years agoMerge pull request #11985 from JMAConsulting/devcore48
Eileen McNaughton [Tue, 17 Apr 2018 09:00:31 +0000 (21:00 +1200)]
Merge pull request #11985 from JMAConsulting/devcore48

dev/core#48 Fix PDF Letter only generates a single letter when multiple contact IDs are specified

6 years agoCRM-21849: Remove limit on API call
Michael Devery [Tue, 17 Apr 2018 08:50:28 +0000 (09:50 +0100)]
CRM-21849: Remove limit on API call

6 years agoMerge pull request #11973 from lcdservices/master
Eileen McNaughton [Tue, 17 Apr 2018 08:27:26 +0000 (20:27 +1200)]
Merge pull request #11973 from lcdservices/master

dev/core#59 scheduled reminder email validation

6 years agoMerge pull request #11987 from civicrm/5.1
Eileen McNaughton [Tue, 17 Apr 2018 08:22:09 +0000 (20:22 +1200)]
Merge pull request #11987 from civicrm/5.1

5.1 merge to master

6 years agoNamespace exception in test
eileen [Tue, 17 Apr 2018 08:08:57 +0000 (20:08 +1200)]
Namespace exception in test

6 years agoMerge pull request #11976 from eileenmcnaughton/5.1
Monish Deb [Tue, 17 Apr 2018 07:12:53 +0000 (12:42 +0530)]
Merge pull request #11976 from eileenmcnaughton/5.1

Fix failure to render dedupe page

6 years agoadditional fix
deb.monish [Tue, 17 Apr 2018 06:53:51 +0000 (12:23 +0530)]
additional fix

6 years agodev/core/48 Fix PDF Letter only generates a single letter when multiple contact IDs...
Matthew Wire [Thu, 5 Apr 2018 10:04:08 +0000 (11:04 +0100)]
dev/core/48 Fix PDF Letter only generates a single letter when multiple contact IDs are specified

6 years agoFix trigger generation for modified_date on custom data
eileen [Tue, 17 Apr 2018 00:03:00 +0000 (12:03 +1200)]
Fix trigger generation for modified_date on custom data

In 4.7.25 https://github.com/civicrm/civicrm-core/pull/10754/commits introduced
some modifications to the generation of triggers to update the modified date field.

It basically derived the entity being extended by a table and then if that entity had a
modified_date field then a trigger would be created to update that field.

However, a bug in the CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity function
meant that incorrect additional tables are also being updated for custom fields.

For entities extending contact the contact table AND the mailing table are updated. e.g
```
CREATE TRIGGER {mycustomtable}...
UPDATE civicrm_contact SET modified_date = CURRENT_TIMESTAMP WHERE id = NEW.entity_id;

UPDATE civicrm_mailing SET modified_date = CURRENT_TIMESTAMP WHERE id = NEW.entity_id;
```

For entities that extend tables that should not attract a trigger ONLY
the mailing table is updated.

The bug in CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity is that it adds the
WHERE clause 'AND extends IN ($entityType)' ONLY if $entityType is in a whitelist.

Invalid entities result in no filtering.

As a fix using a whitelist is no longer valid - we support any entity that might
be configured now so simply filtering on the entity makes sense.

Other paths to this function seem unlikely to pass in invalid entities & hence trigger this bug.

6 years agoMerge pull request #11982 from eileenmcnaughton/enotice
Monish Deb [Tue, 17 Apr 2018 05:29:16 +0000 (10:59 +0530)]
Merge pull request #11982 from eileenmcnaughton/enotice

E-notice fix

6 years agoissue 63 clarify permission descriptions (#11981)
Herb [Mon, 16 Apr 2018 23:45:37 +0000 (19:45 -0400)]
issue 63 clarify permission descriptions (#11981)

* issue 63 clarify permission descriptions

* fix syntax