nbrettell [Fri, 10 Nov 2017 17:20:50 +0000 (17:20 +0000)]
CRM-21383 - Inclusion of a directive to replace the existing select field for loading Message templates on demand in the CiviMail compose UI
Tim Otten [Fri, 10 Nov 2017 01:59:08 +0000 (17:59 -0800)]
Merge pull request #11265 from eileenmcnaughton/test
[NFC] Minor refactor of test to allow re-use
eileen [Sun, 22 Oct 2017 03:29:51 +0000 (14:29 +1100)]
[NFC] Minor refactor of test to allow re-use
Change-Id: Ie0ec7ff504420aa41641abc6de4edb8cfb5a4b64
Tim Otten [Thu, 9 Nov 2017 20:58:20 +0000 (12:58 -0800)]
Merge pull request #11253 from christianwach/CRM-20358
CRM-20358: Fix WordPress Access Control table
Christian Wach [Wed, 8 Nov 2017 12:13:20 +0000 (12:13 +0000)]
CRM-20358: fix WordPress Access Control table
Tim Otten [Wed, 8 Nov 2017 19:05:15 +0000 (11:05 -0800)]
Merge pull request #11256 from colemanw/CRM-21408
CRM-21408 - Api explorer - better defaults for sequential checkbox
Coleman Watts [Wed, 8 Nov 2017 14:40:27 +0000 (09:40 -0500)]
CRM-21408 - Api explorer - better defaults for sequential checkbox
----------------------------------------
* CRM-21408: Api explorer - better defaults for sequential checkbox
https://issues.civicrm.org/jira/browse/CRM-21408
colemanw [Wed, 8 Nov 2017 10:40:28 +0000 (05:40 -0500)]
Merge pull request #11223 from colemanw/CRM-21382
CRM-21382 - Fix print/merge document on case and support multiple cases
colemanw [Wed, 8 Nov 2017 10:38:47 +0000 (05:38 -0500)]
Merge pull request #11245 from colemanw/CRM-21398
CRM-21398 - Fix fatal error when exporting cases
Tim Otten [Wed, 8 Nov 2017 08:21:36 +0000 (00:21 -0800)]
Merge pull request #11251 from totten/master-mailtest
CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once
Tim Otten [Wed, 8 Nov 2017 06:47:19 +0000 (22:47 -0800)]
CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once
Overview
--------
Remove an unnecessary line from test suite.
Before
------
The test worked when executed as part of the `api_v3` suite, but it failed
when run individually (because the `require_once` doesn't work). Moreover,
the tests for `org.civicrm.flexmailer` failed
After
-----
The tests work on their own.
Comment
-------
This change deals entirely with the packaging/framing of a test-case. It
neither (a) involves the runtime behavior of the application nor (b) the
semantics/behavior of the test. Consequently, it should be safe to merge as
long as the test-runner remains happy.
Eileen McNaughton [Wed, 8 Nov 2017 00:52:00 +0000 (13:52 +1300)]
Merge pull request #11059 from JMAConsulting/CRM-21200
CRM-21200: Pay Now payment overwrites the contribution
Eileen McNaughton [Tue, 7 Nov 2017 21:53:51 +0000 (10:53 +1300)]
Merge pull request #10901 from JMAConsulting/CRM-21106
CRM-21106, removed code related to Financial type acl from report
Mark Hanna [Tue, 7 Nov 2017 13:38:34 +0000 (07:38 -0600)]
Merge pull request #11171 from mydropwizard/drupal-8-hooks
CRM-21341 Drupal 8 Hook Support
Coleman Watts [Tue, 7 Nov 2017 02:16:23 +0000 (21:16 -0500)]
Whitespace cleanup
Eileen McNaughton [Tue, 7 Nov 2017 02:15:43 +0000 (15:15 +1300)]
Merge pull request #11247 from seamuslee001/CRM-21400
CRM-21400 Add a static var to hold the trxn_id so it can be accessed …
Tim Otten [Tue, 7 Nov 2017 01:51:30 +0000 (17:51 -0800)]
Merge pull request #11246 from seamuslee001/CRM-21395
CRM-21395 make patch safe for multiple composer runs
Seamus Lee [Tue, 7 Nov 2017 00:21:14 +0000 (11:21 +1100)]
CRM-21400 Add a static var to hold the trxn_id so it can be accessed through hook_civicrm_buildForm
David Snopek [Mon, 6 Nov 2017 22:46:00 +0000 (16:46 -0600)]
Check that Drupal 8 has been bootstrapped
Eileen McNaughton [Mon, 6 Nov 2017 22:14:55 +0000 (11:14 +1300)]
Merge pull request #11237 from civicrm/4.7.28-rc
4.7.28 rc
Seamus Lee [Mon, 6 Nov 2017 21:25:23 +0000 (08:25 +1100)]
CRM-21395 make patch safe for multiple composer runs
Coleman Watts [Mon, 6 Nov 2017 15:38:56 +0000 (10:38 -0500)]
CRM-21398 - Fix fatal error when exporting cases
----------------------------------------
* CRM-21398: Error when exporting cases
https://issues.civicrm.org/jira/browse/CRM-21398
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
Eileen McNaughton [Sun, 5 Nov 2017 22:09:30 +0000 (11:09 +1300)]
Merge pull request #11243 from seamuslee001/CRM-21395
CRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using…
Seamus Lee [Sun, 5 Nov 2017 21:16:54 +0000 (08:16 +1100)]
CRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using patch files to civicrm dompdf to fix no-block-level error found
colemanw [Sun, 5 Nov 2017 14:08:00 +0000 (09:08 -0500)]
Merge pull request #11242 from mlutfy/crm21393
CRM-21393: Event checkPermission should only check the specific event…
colemanw [Sat, 4 Nov 2017 23:56:24 +0000 (19:56 -0400)]
Merge pull request #11236 from mattwire/CRM-20164_Joomla_IPN
CRM-20164 Fix IPN notify URL with Joomla when derived from menu item
Mathieu Lutfy [Sat, 4 Nov 2017 03:25:00 +0000 (23:25 -0400)]
CRM-21393: Event checkPermission should only check the specific event, if eventId was passed (for performance).
colemanw [Sat, 4 Nov 2017 00:47:17 +0000 (20:47 -0400)]
Merge pull request #11230 from colemanw/CRM-21385
CRM-21385 - Hide wp admin bar when maximizing ckeditor
Eileen McNaughton [Fri, 3 Nov 2017 21:39:45 +0000 (10:39 +1300)]
Merge pull request #10501 from jitendrapurohit/CRM-20728
CRM-20728: Store session in drupal before exiting
Matthew Wire [Fri, 3 Nov 2017 19:49:12 +0000 (19:49 +0000)]
Fix IPN notify URL with Joomla when derived from menu item
Mathieu Lu [Fri, 3 Nov 2017 12:51:57 +0000 (08:51 -0400)]
Merge pull request #11202 from JMAConsulting/CRM-21357
CRM-21357: Added default start date on membership batch entry form
Mathieu Lu [Fri, 3 Nov 2017 12:31:57 +0000 (08:31 -0400)]
Merge pull request #10687 from JMAConsulting/CRM-20898
CRM-20899, formatted number upto 2 decimal place
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…
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
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
Tim Otten [Fri, 3 Nov 2017 03:58:18 +0000 (20:58 -0700)]
Merge pull request #11225 from seamuslee001/generate_data_only_full_group_by
Fix GenerateData for only_full_group_by sqlMode
Coleman Watts [Fri, 3 Nov 2017 00:00:35 +0000 (20:00 -0400)]
CRM-21385 - Hide wp admin bar when maximizing ckeditor
----------------------------------------
* CRM-21385: WordPress top nav bar blocks top row of WYSIWYG editor when maximized
https://issues.civicrm.org/jira/browse/CRM-21385
Tim Otten [Thu, 2 Nov 2017 23:41:47 +0000 (16:41 -0700)]
Merge pull request #11213 from totten/master-test-doc
(NFC) Move test docs to civicrm-dev-docs
CiviCRM [Thu, 2 Nov 2017 09:53:50 +0000 (09:53 +0000)]
Set version to 4.7.29
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
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_…
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
Tim Otten [Thu, 2 Nov 2017 07:26:10 +0000 (00:26 -0700)]
Add 4.7.26 release notes (credits)
Tim Otten [Thu, 2 Nov 2017 07:13:57 +0000 (00:13 -0700)]
Add 4.7.26 release notes
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
Seamus Lee [Thu, 2 Nov 2017 00:14:44 +0000 (11:14 +1100)]
Fix GenerateData for only_full_group_by sqlMode
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
deb.monish [Wed, 1 Nov 2017 17:30:37 +0000 (23:00 +0530)]
remove special sort order handling for dashlet
deb.monish [Wed, 1 Nov 2017 12:14:14 +0000 (17:44 +0530)]
add unit test
Coleman Watts [Wed, 1 Nov 2017 16:07:01 +0000 (12:07 -0400)]
CRM-21382 - Fix print/merge document on case and support multiple cases
I took the time to audit and remove the code blocks which had been previously commented as "silly but difficult to audit"
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
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
Mukesh Ram [Wed, 1 Nov 2017 06:18:33 +0000 (11:48 +0530)]
HW-382: Moved help section outside of block
Andrew Hunt [Wed, 1 Nov 2017 04:52:59 +0000 (00:52 -0400)]
4.7.27 release notes: sections in proper order
Andrew Hunt [Wed, 1 Nov 2017 04:42:35 +0000 (00:42 -0400)]
4.7.27 release notes: added late changes
Andrew Hunt [Tue, 31 Oct 2017 21:43:10 +0000 (17:43 -0400)]
4.7.27 release notes: finished bugs and contributors
Andrew Hunt [Thu, 26 Oct 2017 19:46:23 +0000 (15:46 -0400)]
4.7.27 release notes: started bugs and updated release date
Andrew Hunt [Wed, 25 Oct 2017 16:09:07 +0000 (12:09 -0400)]
4.7.27 release notes: done with features
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
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
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
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
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
deb.monish [Wed, 26 Jul 2017 07:33:26 +0000 (13:03 +0530)]
minor fix
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
Coleman Watts [Tue, 31 Oct 2017 14:23:42 +0000 (10:23 -0400)]
CRM-21374 - Quick fix - D8 doesn't support regions
deb.monish [Thu, 20 Jul 2017 11:42:54 +0000 (17:12 +0530)]
upgrade code fix
deb.monish [Tue, 18 Jul 2017 11:33:55 +0000 (17:03 +0530)]
additional fixes and added unit test
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
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
Jitendra Purohit [Tue, 31 Oct 2017 12:12:30 +0000 (17:42 +0530)]
CRM-21373 - Notice error on creating cases
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
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…
Tim Otten [Mon, 30 Oct 2017 21:14:53 +0000 (14:14 -0700)]
tests/README.md - Migrate to civicrm-dev-docs
As part of https://github.com/civicrm/civicrm-dev-docs/pull/415 , the dev
docs will assimilate and organize more of the instructions about testing.
Tim Otten [Mon, 30 Oct 2017 21:13:24 +0000 (14:13 -0700)]
tests/qunit/README.txt - Migrate to civicrm-dev-docs
As part of https://github.com/civicrm/civicrm-dev-docs/pull/415 , the dev
docs will assimilate and organize more of the instructions about testing.
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
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
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
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
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.
deb.monish [Fri, 27 Oct 2017 18:08:09 +0000 (23:38 +0530)]
additional fixes
deb.monish [Fri, 27 Oct 2017 08:23:24 +0000 (13:53 +0530)]
CRM-21362: Mailing summary report group by MySQL 5.7 error
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
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
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
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
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
Seamus Lee [Fri, 1 Sep 2017 22:56:57 +0000 (08:56 +1000)]
NFC Test using ONLY_FULL_GROUP_BY sqlmode as well
Edsel [Thu, 26 Oct 2017 11:46:59 +0000 (17:16 +0530)]
CRM-21357 Added default start date on membership batch entry form
----------------------------------------
* CRM-21357: Start date is NULL when membership batch entry is processed
https://issues.civicrm.org/jira/browse/CRM-21357
deb.monish [Thu, 26 Oct 2017 08:44:07 +0000 (14:14 +0530)]
additional fix
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.
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".
Mathieu Lutfy [Wed, 25 Oct 2017 16:13:40 +0000 (12:13 -0400)]
CRM-21351: fix deceased_date format on contact record page.
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
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
Noah Miller [Tue, 24 Oct 2017 21:26:36 +0000 (14:26 -0700)]
Remove extra whitespace
Noah Miller [Tue, 24 Oct 2017 21:02:37 +0000 (14:02 -0700)]
CRM-21346: Make pledge installment count & amount exportable
Matthew Wire [Tue, 24 Oct 2017 20:58:52 +0000 (21:58 +0100)]
Translateable strings (#11191)
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