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…
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
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
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
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
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.
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
Jitendra Purohit [Tue, 24 Oct 2017 09:36:15 +0000 (15:06 +0530)]
Revert #10093 skip status calculation when form dates are not modified
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.
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?
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
Tim Otten [Mon, 23 Oct 2017 21:34:41 +0000 (14:34 -0700)]
CRM-21335 - crmMailing - Ensure that `recipients` renders as required
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>
```
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 …
Dave Jenkins [Mon, 23 Oct 2017 17:30:54 +0000 (18:30 +0100)]
CRM-20955 CRM-20966 Adding unit tests.
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
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
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 -…
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
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
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…
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
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
Matthew Wire [Sat, 21 Oct 2017 09:27:31 +0000 (10:27 +0100)]
Format tax rate for display on confirm/thankyou pages
Matthew Wire [Sat, 21 Oct 2017 09:04:35 +0000 (10:04 +0100)]
Add database changes to support > 2 decimal places in calculations
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
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
Matthew Wire [Fri, 20 Oct 2017 17:43:58 +0000 (18:43 +0100)]
Fix fatal js error on cart checkout when pay later not enabled
JKingsnorth [Fri, 20 Oct 2017 16:22:08 +0000 (17:22 +0100)]
CRM-21337 ISO compliance for Romanian counties
deb.monish [Fri, 20 Oct 2017 05:21:58 +0000 (10:51 +0530)]
CRM-21336: Custom file fields should display file name without hash
Alice Frumin [Thu, 19 Oct 2017 20:39:29 +0000 (16:39 -0400)]
using civi function to get contact id because it is cms agnostic
Kevin Cristiano [Thu, 19 Oct 2017 00:54:57 +0000 (20:54 -0400)]
CRM-21297 - Automatically fill database details in Drupal installer. Update WP redirect after install
Monish Deb [Thu, 19 Oct 2017 10:31:42 +0000 (16:01 +0530)]
Merge pull request #11153 from yashodha/CRM-21327
CRM-21327 - Not able to change Payment Processor in event fees
Eileen McNaughton [Thu, 19 Oct 2017 02:32:25 +0000 (15:32 +1300)]
Merge pull request #11062 from mattwire/CRM-21203_joomla_cli_3_8_0
CRM-21203 Fixes for Joomla 3.8+ CRON/cli and directories
Coleman Watts [Thu, 19 Oct 2017 00:57:35 +0000 (20:57 -0400)]
Minor cleanup
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
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
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
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
Coleman Watts [Wed, 18 Oct 2017 16:06:47 +0000 (12:06 -0400)]
CRM-20078 - Fix activity file on case button
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
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
Jitendra Purohit [Wed, 18 Oct 2017 11:37:06 +0000 (17:07 +0530)]
CRM-21330 - Add regen.sh changes
Mukesh Ram [Wed, 18 Oct 2017 11:05:59 +0000 (16:35 +0530)]
HW-381: Styled case type settings sreen
yashodha [Wed, 18 Oct 2017 09:30:09 +0000 (15:00 +0530)]
//crm_Core_Error::Debug('p', );
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
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.
William Mortada [Mon, 16 Oct 2017 11:01:44 +0000 (12:01 +0100)]
Check that the user in logged in and has permissions to adminster site configuration (Drupal only)
This is necessary because the script exposes the database settings in the form and these could be viewed by unauthorised users
William Mortada [Thu, 12 Oct 2017 16:05:33 +0000 (17:05 +0100)]
Move the install type variable from SESSION to POST and remove the session
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
yashodha [Tue, 17 Oct 2017 13:25:35 +0000 (18:55 +0530)]
CRM-21321 - Membership fields not loading in 'On behalf of' profile
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
Klaas Eikelboom [Tue, 17 Oct 2017 08:58:27 +0000 (09:58 +0100)]
Fix for CRM-21319
Herb vd Dool [Mon, 16 Oct 2017 21:27:57 +0000 (17:27 -0400)]
CRM-21272: add visibility to methods
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
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.
Herb vd Dool [Mon, 16 Oct 2017 16:01:12 +0000 (12:01 -0400)]
CRM-21272: move definition of isPasswordUserGenerated to CMS classes
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.
Alok Patel [Thu, 12 Oct 2017 11:34:04 +0000 (17:04 +0530)]
CRM-21267: Cleaning up lint errors
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
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.
Alok Patel [Mon, 16 Oct 2017 03:17:21 +0000 (08:47 +0530)]
CRM-20432: Changed membership status to New from Current
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.
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.
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)
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.
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
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
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
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:
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
eileen [Sun, 15 Oct 2017 07:32:42 +0000 (20:32 +1300)]
CRM-21314 Credit card block missing from membership payment form:
Herb vd Dool [Sun, 15 Oct 2017 04:47:49 +0000 (00:47 -0400)]
add definition of isUserRegistrationPermitted to Backdrop class
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
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
Coleman Watts [Sat, 14 Oct 2017 00:00:07 +0000 (19:00 -0500)]
CRM-20545 - Exclude deleted contacts from reports
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.
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
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
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
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.
projects / civicrm-core.git / log