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
Eileen McNaughton [Tue, 17 Apr 2018 23:16:37 +0000 (11:16 +1200)]
Merge pull request #11988 from yashodha/translate_strings
translate strings
yashodha [Tue, 17 Apr 2018 11:34:12 +0000 (17:04 +0530)]
translate strings
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
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
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
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
deb.monish [Tue, 17 Apr 2018 06:53:51 +0000 (12:23 +0530)]
additional fix
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
Monish Deb [Tue, 17 Apr 2018 05:29:16 +0000 (10:59 +0530)]
Merge pull request #11982 from eileenmcnaughton/enotice
E-notice fix
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
eileen [Mon, 16 Apr 2018 22:43:48 +0000 (10:43 +1200)]
E-notice fix
Eileen McNaughton [Mon, 16 Apr 2018 22:27:45 +0000 (10:27 +1200)]
Merge pull request #11887 from eileenmcnaughton/date
CRM-21148 - Refactor two near-identical date functions into one
Eileen McNaughton [Mon, 16 Apr 2018 21:24:53 +0000 (09:24 +1200)]
Merge pull request #11978 from eileenmcnaughton/profile
CRM-20598 Phone ext in profile edit mode is messing up with address
colemanw [Mon, 16 Apr 2018 13:56:00 +0000 (09:56 -0400)]
Merge pull request #11755 from colemanw/AllCoreTables
AllCoreTables - Generate file every time
Seamus Lee [Mon, 16 Apr 2018 06:39:18 +0000 (16:39 +1000)]
Merge pull request #11953 from eileenmcnaughton/section_fail
Prevent hard-fail when section header / group by option chosen on logging report
Monish Deb [Mon, 16 Apr 2018 06:05:51 +0000 (11:35 +0530)]
Merge pull request #11658 from eileenmcnaughton/criteria
CRM-21753 add pass-through support for criteria in urls on dedupe pages
Eileen McNaughton [Mon, 16 Apr 2018 05:24:14 +0000 (17:24 +1200)]
Merge pull request #10988 from jmcclelland/CRM-21194
CRM-21194 - ensure distinct count of clickable URLs works.
Samuel Vanhove [Mon, 16 Apr 2018 04:42:34 +0000 (16:42 +1200)]
CRM-20598 Phone ext in profile edit mode is messing up with address
eileen [Mon, 16 Apr 2018 03:57:30 +0000 (15:57 +1200)]
CRM-21148 revert back to odd handling when NULL passed to getFromTo, deprecate
Jon goldberg [Wed, 28 Mar 2018 08:56:44 +0000 (21:56 +1300)]
CRM-21148 change form function to wrap Date function
Jon goldberg [Wed, 28 Mar 2018 08:30:50 +0000 (21:30 +1300)]
CRM-21148 - Refactor two near-identical functions into one
eileen [Mon, 16 Apr 2018 00:20:37 +0000 (12:20 +1200)]
Fix failure to render dedupe page
Monish Deb [Fri, 13 Apr 2018 13:05:08 +0000 (18:35 +0530)]
Merge pull request #11657 from eileenmcnaughton/more_speed
CRM-19752 Fix slow query on contribution dash.
deb.monish [Fri, 13 Apr 2018 12:43:56 +0000 (18:13 +0530)]
test failure fix
Coleman Watts [Thu, 8 Mar 2018 03:21:43 +0000 (22:21 -0500)]
CRM_Core_CodeGen_Util_Template - simplify beautification param
Tim Otten [Thu, 8 Mar 2018 01:51:59 +0000 (17:51 -0800)]
AllCoreTables.data.php - Don't pass through PHP_Beautifier. Update layout.
Tim Otten [Thu, 8 Mar 2018 01:48:03 +0000 (17:48 -0800)]
CRM_Core_CodeGen_Util_Template - Make PHPBeautifier optional
Coleman Watts [Fri, 2 Mar 2018 20:18:04 +0000 (15:18 -0500)]
AllCoreTables.data.php - generate every time.
The file was not being updated as often as necessary, and the freshness checks
were almost as expensive as just generating the file, if not more.
Brian Shaughnessy [Thu, 12 Apr 2018 16:19:55 +0000 (12:19 -0400)]
dev/financial#11 email invoice fails with validation error
Eileen McNaughton [Fri, 13 Apr 2018 02:32:15 +0000 (14:32 +1200)]
Merge pull request #11965 from colemanw/CRM-21855
CRM-21855 - Clean up and standardize relationshipType BAO
colemanw [Thu, 12 Apr 2018 12:28:21 +0000 (08:28 -0400)]
Merge pull request #11947 from eileenmcnaughton/dev_tab
Add 'addToDeveloperTab' in more places to expose sql in use (permission limited)
colemanw [Thu, 12 Apr 2018 12:02:54 +0000 (08:02 -0400)]
Merge pull request #11970 from mukeshcompucorp/fix-template-structure-issues
Fix API template
colemanw [Thu, 12 Apr 2018 11:31:32 +0000 (07:31 -0400)]
Merge pull request #10898 from seamuslee001/CRM-21100
CRM-21100 Convert list of test groups into AJAX based select2 like r…
Mukesh Ram [Thu, 12 Apr 2018 05:38:54 +0000 (11:08 +0530)]
Fix API template
Deepa Verma [Thu, 12 Apr 2018 04:43:47 +0000 (10:13 +0530)]
Form email vaildation
Eileen McNaughton [Thu, 12 Apr 2018 02:33:22 +0000 (14:33 +1200)]
Merge pull request #11960 from jitendrapurohit/core-54
core-54 - Activity created for case role relationship is not assigned…
Seamus Lee [Thu, 12 Apr 2018 01:04:05 +0000 (11:04 +1000)]
Merge pull request #11954 from eileenmcnaughton/cont
Fix contribution detail report to work with FULL GROUP BY mode
Coleman Watts [Tue, 10 Apr 2018 12:13:28 +0000 (08:13 -0400)]
CRM-21100 - Remove dependency on pre-loaded group data from CiviMail
Coleman Watts [Tue, 10 Apr 2018 13:38:29 +0000 (09:38 -0400)]
CRM-21855 - Clean up and standardize relationshipType BAO
Coleman Watts [Tue, 10 Apr 2018 01:57:43 +0000 (21:57 -0400)]
CRM-21100 - Optimize group loading
Seamus Lee [Thu, 24 Aug 2017 10:15:22 +0000 (20:15 +1000)]
CRM-201100 Convert list of test groups into AJAX based select2 like receipients box
Switch to entity ref as per coleman
Eileen McNaughton [Mon, 9 Apr 2018 19:41:19 +0000 (07:41 +1200)]
Merge pull request #11961 from colemanw/CRM-21843
CRM-21843 - Fix export of case activities
colemanw [Mon, 9 Apr 2018 16:17:29 +0000 (12:17 -0400)]
Merge pull request #11958 from mlutfy/d8-bootstrap-user
Drupal8 loadBootStrap: fix user variable
colemanw [Mon, 9 Apr 2018 13:53:47 +0000 (09:53 -0400)]
Merge pull request #11902 from mukeshcompucorp/fix-template-structure-issues
Fix template for widget
Coleman Watts [Mon, 9 Apr 2018 13:12:12 +0000 (09:12 -0400)]
CRM-21843 - Fix export of case activities
colemanw [Mon, 9 Apr 2018 12:10:30 +0000 (08:10 -0400)]
Merge pull request #11377 from lcdservices/CRM-21523
CRM-21523 add form rule for repetition fields in scheduled reminder form
Jitendra Purohit [Mon, 9 Apr 2018 10:46:45 +0000 (16:16 +0530)]
core-54 - Activity created for case role relationship is not assigned to correct contact
Eileen McNaughton [Mon, 9 Apr 2018 09:25:09 +0000 (21:25 +1200)]
Merge pull request #11959 from eileenmcnaughton/api_in_test
[nfc] Consistently specify whether to clean money when calling from test suite
Seamus Lee [Mon, 9 Apr 2018 08:49:07 +0000 (18:49 +1000)]
Merge pull request #11957 from seamuslee001/core_53
dev/Core#53 Add in stats to AB tests and add in clickthrough and open…
eileen [Mon, 9 Apr 2018 04:39:30 +0000 (16:39 +1200)]
Consistently specify whether to clean money when calling from test suite
Seamus Lee [Sat, 7 Apr 2018 22:22:52 +0000 (08:22 +1000)]
dev/Core#53 Add in stats to AB tests and add in clickthrough and opened % stats to mailing reports
Update Test following changes in stats function
Fixes following on from review
Further divide by zero fixes
Mathieu Lutfy [Mon, 9 Apr 2018 02:44:50 +0000 (22:44 -0400)]
Drupal8 loadBootStrap: fix user variable.
Brian Shaughnessy [Tue, 5 Dec 2017 20:27:47 +0000 (15:27 -0500)]
CRM-21523 add form rule for repetition fields in scheduled reminder form
eileen [Fri, 6 Apr 2018 02:26:31 +0000 (14:26 +1200)]
Fix contribution detail report to work with FULL GROUP BY mode
eileen [Fri, 6 Apr 2018 00:31:39 +0000 (12:31 +1200)]
Prevent hard-fail when section header / group by option chosen on logging report
Eileen McNaughton [Thu, 5 Apr 2018 22:52:34 +0000 (10:52 +1200)]
Merge pull request #11950 from mattwire/cust_data_tpl_extract
Extract custom data edit template code to shared template
Seamus Lee [Thu, 5 Apr 2018 20:37:36 +0000 (06:37 +1000)]
Merge pull request #11900 from eileenmcnaughton/ref
Simple function extraction on editing Address (within main contact edit)
Matthew Wire [Thu, 5 Apr 2018 16:44:03 +0000 (17:44 +0100)]
Extract custom data edit template code to shared template
eileen [Thu, 5 Apr 2018 11:39:00 +0000 (23:39 +1200)]
Add 'addToDeveloperTab' in more places to expose sql in use (permission limited)
CiviCRM [Thu, 5 Apr 2018 06:57:04 +0000 (06:57 +0000)]
Set version to 5.2.alpha1
CiviCRM [Thu, 5 Apr 2018 06:51:50 +0000 (06:51 +0000)]
Set version to 5.1.beta1
Eileen McNaughton [Wed, 4 Apr 2018 23:05:17 +0000 (11:05 +1200)]
Merge pull request #11942 from civicrm/5.0
5.0 merge to master
Tim Otten [Wed, 4 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Merge pull request #11924 from JMAConsulting/dev-42
(dev/mail/6) Fix recipient calculation when system has mixed records. Add multilingual test.
Eileen McNaughton [Wed, 4 Apr 2018 19:06:35 +0000 (07:06 +1200)]
Merge pull request #11941 from civicrm/5.0
5.0 to master
Eileen McNaughton [Wed, 4 Apr 2018 19:05:58 +0000 (07:05 +1200)]
Merge pull request #11940 from agh1/5.0.0-release-notes-update
5.0.0 release notes: last-minute change merged
Andrew Hunt [Wed, 4 Apr 2018 16:06:10 +0000 (12:06 -0400)]
5.0.0 release notes: René Olivo works for CompuCorp
Andrew Hunt [Wed, 4 Apr 2018 15:17:26 +0000 (11:17 -0400)]
5.0.0 release notes: last-minute change merged
Monish Deb [Wed, 4 Apr 2018 14:41:11 +0000 (20:11 +0530)]
Merge pull request #11934 from eileenmcnaughton/fees
Fix fatal error when selecting a $0 price option in change fee selection
Eileen McNaughton [Wed, 4 Apr 2018 13:13:44 +0000 (01:13 +1200)]
Merge pull request #11930 from agh1/translate-phone-extension
Phone: standardize appearance and translation of extension label
Eileen McNaughton [Wed, 4 Apr 2018 13:04:33 +0000 (01:04 +1200)]
Merge pull request #11884 from eileenmcnaughton/hold
Tidy up on_hold handling in holdEmail function.
Eileen McNaughton [Wed, 4 Apr 2018 10:16:33 +0000 (22:16 +1200)]
Merge pull request #11935 from civicrm/5.0
5.0 to master
Andrew Hunt [Wed, 4 Apr 2018 10:15:56 +0000 (06:15 -0400)]
5.0.0 release notes (#11931)
* 5.0.0 release notes: raw from script
* 5.0.0 release notes: starting from the top
* 5.0.0 release notes: finished features next steps start with bugs
* 5.0.0 release notes: a few more bugs
* 5.0.0 release notes: cleaning up
* 5.0.0 release notes: fixed up features and bugs sections
* 5.0.0 release notes: updated contributors and boilerplate
* 5.0.0 release notes: late changes to RC
eileen [Thu, 15 Feb 2018 04:55:46 +0000 (17:55 +1300)]
CRM-21753 add pass-through support for criteria in urls on dedupe pages
This permits urls such as
civicrm/contact/dedupefind?reset=1&rgid=4&gid=&limit=&criteria={"contact":{"contact_id":205}}&action=update
The contents of $criteria['contact'] are passed to the contact api to get a list of contacts to find possible
matches for (acls are applied when generating the match list to both the matched & match list in the next step).
Note that the urls are urlencoded & hence will have %22 rather than a quote so that feels xss safe but I added some
validation before I figured that part out & I think it still makes sense to keep it.
Monish Deb [Wed, 4 Apr 2018 09:11:52 +0000 (14:41 +0530)]
Merge pull request #11666 from eileenmcnaughton/validate_json
CRM-21753 add json validation for incoming criteria
Eileen McNaughton [Wed, 4 Apr 2018 05:54:15 +0000 (17:54 +1200)]
Merge pull request #11865 from seamuslee001/core_dev_18
Fix Core/Dev 18# where logging fails if the AUTO INCREMENT column is …
eileen [Wed, 4 Apr 2018 05:52:14 +0000 (17:52 +1200)]
Fix fatal error when selecting a /bin/bash price option.
The code for creating a new price option creates a new financial transaction but when choosing a /bin/bash price option
it fails as the api does not accept /bin/bash EntityFinancialTrxn, skip if /bin/bash
Eileen McNaughton [Wed, 4 Apr 2018 05:42:39 +0000 (17:42 +1200)]
Merge pull request #11933 from civicrm/5.0
5.0 to master
Eileen McNaughton [Wed, 4 Apr 2018 05:42:10 +0000 (17:42 +1200)]
Merge pull request #11932 from colemanw/8
Core/8 - Fix fatal error on Print/Merge Document for cases
Andrew Hunt [Wed, 4 Apr 2018 01:59:23 +0000 (21:59 -0400)]
Phone: standardize appearance and translation of extension label
Coleman Watts [Tue, 3 Apr 2018 14:52:08 +0000 (10:52 -0400)]
Core/8 - Fix fatal error on Print/Merge Document for cases
Conflicts:
CRM/Case/Form/Task.php
Eileen McNaughton [Wed, 4 Apr 2018 01:36:46 +0000 (13:36 +1200)]
Merge pull request #11929 from civicrm/5.0
5.0 merge to master
Eileen McNaughton [Wed, 4 Apr 2018 01:36:15 +0000 (13:36 +1200)]
Merge pull request #11928 from seamuslee001/case_pre_process_task
Re Add CRM_Case_Form_Task::PreProcessCommon()
Seamus Lee [Tue, 3 Apr 2018 21:44:07 +0000 (07:44 +1000)]
Re Add CRM_Case_Form_Task::PreProcessCommon()
Simplify down and use parent PreProcess function
Eileen McNaughton [Tue, 3 Apr 2018 23:00:46 +0000 (11:00 +1200)]
Merge pull request #11927 from samuelsov/NFC-taxts
(NFC) make (includes taxes) translation work
Samuel Vanhove [Tue, 3 Apr 2018 20:49:48 +0000 (16:49 -0400)]
(NFC) make (includes taxes) translation work
colemanw [Tue, 3 Apr 2018 13:03:38 +0000 (09:03 -0400)]
Merge pull request #11885 from eileenmcnaughton/report_filter_eq
Handle eq (equals) operator in the report url
deb.monish [Tue, 3 Apr 2018 06:37:55 +0000 (12:07 +0530)]
(dev/mail/6) additional fix and added unit test
Eileen McNaughton [Mon, 2 Apr 2018 19:30:28 +0000 (07:30 +1200)]
Merge pull request #11921 from civicrm/5.0
5.0 merge to master
Eileen McNaughton [Mon, 2 Apr 2018 19:28:39 +0000 (07:28 +1200)]
Merge pull request #11917 from eileenmcnaughton/cont_report
CRM-21831 & dev/report/issues/1 Fix regressions in contribution detail report relating to soft credits
Eileen McNaughton [Mon, 2 Apr 2018 19:27:50 +0000 (07:27 +1200)]
Merge pull request #11919 from eileenmcnaughton/top
Fix fatal on topDonor report
Monish Deb [Mon, 2 Apr 2018 10:53:34 +0000 (16:23 +0530)]
Merge pull request #11918 from eileenmcnaughton/export
Extract fetchRelationshipDetails function
eileen [Mon, 2 Apr 2018 08:46:09 +0000 (20:46 +1200)]
Fix fatal on topDonor report
Yashodha Chaku [Mon, 2 Apr 2018 04:25:30 +0000 (09:55 +0530)]
Merge pull request #11814 from eileenmcnaughton/report
CRM-21677 - Report improvements
eileen [Sun, 1 Apr 2018 23:17:36 +0000 (11:17 +1200)]
Extract fetchRelationshipDetails function
Eileen McNaughton [Sun, 1 Apr 2018 22:51:46 +0000 (10:51 +1200)]
Merge pull request #11914 from seamuslee001/CRM-21244-doc
CRM-21244 Update documetnation so it makes sense when setting is disabled
eileen [Sun, 1 Apr 2018 22:36:01 +0000 (10:36 +1200)]
Fix bugs in contribution detail report relating to soft credits
Eileen McNaughton [Sun, 1 Apr 2018 21:52:11 +0000 (09:52 +1200)]
Merge pull request #11915 from civicrm/5.0
5.0
Eileen McNaughton [Sun, 1 Apr 2018 21:50:04 +0000 (09:50 +1200)]
Merge pull request #11906 from JMAConsulting/dev-42
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list
Monish Deb [Sun, 1 Apr 2018 11:57:37 +0000 (17:27 +0530)]
Merge pull request #11905 from seamuslee001/CRM-21244-consistancy
CRM-21244 Ensure consistancy with previous behavior where user emails …
projects / civicrm-core.git / log