Eileen McNaughton [Thu, 4 Jan 2018 02:19:55 +0000 (15:19 +1300)]
Merge pull request #11483 from eileenmcnaughton/fix_hell
CRM-21595 re-fix CRM-21445
eileen [Sat, 23 Dec 2017 19:29:00 +0000 (08:29 +1300)]
CRM-21595 re-fix CRM-21445
Eileen McNaughton [Mon, 1 Jan 2018 09:16:47 +0000 (22:16 +1300)]
Merge pull request #11455 from JMAConsulting/CRM-20676-rc
CRM-20676: Tax applied repeatedly on edits of price set events
colemanw [Mon, 1 Jan 2018 04:19:05 +0000 (23:19 -0500)]
Merge pull request #11473 from jitendrapurohit/CRM-21559
CRM-21559 - Save button in Case Type not clickable
Jitendra Purohit [Mon, 1 Jan 2018 03:14:04 +0000 (08:44 +0530)]
CRM-21559 - Save button in Case Type not clickable
deb.monish [Wed, 20 Dec 2017 18:41:12 +0000 (00:11 +0530)]
CRM-20676: Tax applied repeatedly on edits of price set events
colemanw [Fri, 22 Dec 2017 15:19:16 +0000 (08:19 -0700)]
Merge pull request #11448 from civicrm/4.7.29-rc
4.7.29 rc
Tim Otten [Thu, 21 Dec 2017 08:34:39 +0000 (00:34 -0800)]
Merge pull request #11442 from civicrm/revert-10998-CRM-21197
Revert "CRM-21197 Convert from html to plain text AFTER token substitution has happened"
Tim Otten [Thu, 21 Dec 2017 04:42:54 +0000 (20:42 -0800)]
Merge pull request #11443 from seamuslee001/4-7-29-release-notes
Add in Release Notes for 4.7.29
Tim Otten [Thu, 21 Dec 2017 04:40:54 +0000 (20:40 -0800)]
Update 4.7.29 - Put in revised author list
Tim Otten [Thu, 21 Dec 2017 04:05:32 +0000 (20:05 -0800)]
Update 4.7.29.md
Seamus Lee [Thu, 21 Dec 2017 03:20:19 +0000 (14:20 +1100)]
Add in Release Notes for 4.7.29
Tim Otten [Thu, 21 Dec 2017 02:25:08 +0000 (18:25 -0800)]
Update stale DAO
Tim Otten [Thu, 21 Dec 2017 01:55:43 +0000 (17:55 -0800)]
Revert "CRM-21197 Convert from html to plain text AFTER token substitution has happened"
colemanw [Thu, 21 Dec 2017 01:09:15 +0000 (18:09 -0700)]
Merge pull request #11439 from tunbola/CRM-21584
CRM-21584: Add CrmRegion Tag to Contact Actions menu template
colemanw [Wed, 20 Dec 2017 22:12:52 +0000 (15:12 -0700)]
Merge pull request #11415 from JMAConsulting/CRM-21567
CRM-21567: Add email filter for Mail Bounce Report
Eileen McNaughton [Wed, 20 Dec 2017 20:40:55 +0000 (09:40 +1300)]
Merge pull request #11441 from civicrm/4.7.29-rc
4.7.29 rc merge to master
Eileen McNaughton [Wed, 20 Dec 2017 20:40:19 +0000 (09:40 +1300)]
Merge pull request #11427 from eileenmcnaughton/no_money_honey
CRM-21445 ensure pay_later processor is set so we do not get a fatal …
Tunbola Ogunwande [Wed, 20 Dec 2017 17:49:55 +0000 (18:49 +0100)]
CRM-21584: Add CrmRegion Tag to Contact Actions menu template
Mathieu Lu [Wed, 20 Dec 2017 14:53:25 +0000 (09:53 -0500)]
Merge pull request #10998 from michaelmcandrew/CRM-21197
CRM-21197 Convert from html to plain text AFTER token substitution has happened
Tim Otten [Sun, 17 Dec 2017 20:29:37 +0000 (13:29 -0700)]
install/index.php - Read PHP version once
This makes it a little easier to hack and simulate different PHP versions.
Tim Otten [Sun, 17 Dec 2017 20:28:53 +0000 (13:28 -0700)]
CRM/Upgrade/Incremental/General.php - Fix typos
Coleman Watts [Fri, 15 Dec 2017 18:42:22 +0000 (11:42 -0700)]
Increase minimum php version requirements
Eileen McNaughton [Tue, 19 Dec 2017 21:31:56 +0000 (10:31 +1300)]
Merge pull request #11437 from civicrm/4.7.29-rc
4.7.29 rc merge to master
Eileen McNaughton [Tue, 19 Dec 2017 21:31:11 +0000 (10:31 +1300)]
Merge pull request #11436 from mlutfy/4.7.29-rc-crm21431
CRM-21431: Edit Group: fix removal of group types.
Tim Otten [Tue, 19 Dec 2017 20:38:54 +0000 (13:38 -0700)]
Merge pull request #11416 from colemanw/phpversion
Increase minimum php version requirements
Mathieu Lutfy [Tue, 19 Dec 2017 17:23:17 +0000 (12:23 -0500)]
CRM-21431: Edit Group: fix removal of group types.
Monish Deb [Tue, 19 Dec 2017 15:16:10 +0000 (20:46 +0530)]
Merge pull request #11432 from eileenmcnaughton/payment_links
CRM-21577 add links to be able to add payments from the contribution …
eileen [Mon, 18 Dec 2017 08:13:34 +0000 (21:13 +1300)]
CRM-21445 ensure pay_later processor is set so we do not get a fatal on zero amount
eileen [Tue, 19 Dec 2017 01:36:08 +0000 (14:36 +1300)]
CRM-21577 add links to be able to add payments from the contribution block
Eileen McNaughton [Mon, 18 Dec 2017 22:40:27 +0000 (11:40 +1300)]
Merge pull request #11423 from totten/master-onchange
CRM-21568 - Move emptiness judgments from SettingsBag::setDb to InnoDBIndexer
Eileen McNaughton [Mon, 18 Dec 2017 22:39:45 +0000 (11:39 +1300)]
Merge pull request #11431 from eileenmcnaughton/merge
Merge
eileen [Mon, 18 Dec 2017 22:38:37 +0000 (11:38 +1300)]
Merge branch '4.7.29-rc' of https://github.com/civicrm/civicrm-core into merge
Change-Id: I1565e0bf1c32956d29bb56107b3f3eb57485d1f9
Eileen McNaughton [Mon, 18 Dec 2017 22:35:17 +0000 (11:35 +1300)]
Merge pull request #11412 from eileenmcnaughton/euro
CRM-21562 fix mis-saving when using Euro thousand separator
colemanw [Mon, 18 Dec 2017 21:58:07 +0000 (14:58 -0700)]
Merge pull request #11428 from yashodha/CRM-21575
CRM-21575 - Websites of same type are over-written
colemanw [Mon, 18 Dec 2017 21:46:52 +0000 (14:46 -0700)]
Merge pull request #11050 from eileenmcnaughton/cache
CRM-21229 improve static var management in group permission clause
colemanw [Mon, 18 Dec 2017 21:39:57 +0000 (14:39 -0700)]
Merge pull request #11405 from eileenmcnaughton/removal
CRM-21551 Add parameter to support skipping processing greetings when…
Eileen McNaughton [Mon, 18 Dec 2017 20:23:44 +0000 (09:23 +1300)]
Merge pull request #11077 from JMAConsulting/CRM-21245
CRM-21245: Incorrect Contribution status 'Pending Refund'
eileen [Fri, 15 Dec 2017 00:37:28 +0000 (13:37 +1300)]
CRM-21562 Fix line item mis-saving when using thousand separator
CRM-21562 Additional thousand separator fix on sales tax
CRM-21562 additional fixes for money formatting, found by adding deprecated
deb.monish [Fri, 6 Oct 2017 11:57:13 +0000 (17:27 +0530)]
CRM-21245: Incorrect Contribution status 'Pending Refund' and Add test of CRM-17151 ported from kainuk PR
yashodha [Mon, 18 Dec 2017 10:08:58 +0000 (15:38 +0530)]
CRM-21575 - Websites of same type are over-written
Tim Otten [Sun, 17 Dec 2017 20:29:37 +0000 (13:29 -0700)]
install/index.php - Read PHP version once
This makes it a little easier to hack and simulate different PHP versions.
Tim Otten [Sun, 17 Dec 2017 20:28:53 +0000 (13:28 -0700)]
CRM/Upgrade/Incremental/General.php - Fix typos
colemanw [Sun, 17 Dec 2017 13:25:20 +0000 (06:25 -0700)]
Merge pull request #11419 from octo-happiness/CRM-21538
CRM-21538: Field not found when sorting report by Case Type as a section header
Tim Otten [Sun, 17 Dec 2017 00:37:44 +0000 (17:37 -0700)]
Merge pull request #11421 from colemanw/jsonFormat
Remove php 5.3 shim for json formatting
Octo Hapiness [Sat, 16 Dec 2017 08:57:53 +0000 (09:57 +0100)]
CRM-21538: Field not found when sorting report by Case Type as a section header
Tim Otten [Sat, 16 Dec 2017 20:26:09 +0000 (13:26 -0700)]
CRM-21568 - Move emptiness judgments from SettingsBag::setDb to InnoDBIndexer
The `SettingsBag::setDb()` function calls any `on_change` listeners. It
originally used "dumb on change" behavior (where it calls the listeners
without comparing values). CRM-19610 had an issue where the `InnoDBIndexer`
was running a bit too often, so they tried to resolve it by
making the `SettingsBag::setDb()` more clever.
Unfortunately, that's been a bit bouncy, and the cleverness depends on one's
particular interpretation of 0 vs '0' vs '' vs NULL vs FALSE.
Before
------
All on-change listeners may be skipped if there's particular mix of emptiness
in the old/new values.
After
-----
The on-change listeners always fire. However, the specific listener
involved with CRM-19610 will now ignore some insignificant changes.
Related discussion: https://github.com/civicrm/civicrm-core/pull/11417
----------------------------------------
* CRM-21568:
https://issues.civicrm.org/jira/browse/CRM-21568
* CRM-19610:
https://issues.civicrm.org/jira/browse/CRM-19610
Coleman Watts [Sat, 16 Dec 2017 18:54:24 +0000 (11:54 -0700)]
Remove php 5.3 shim for json formatting
colemanw [Sat, 16 Dec 2017 17:46:14 +0000 (12:46 -0500)]
Merge pull request #11402 from JMAConsulting/CRM-21547
CRM-21547: Add UI order by options to Contact logging summary report
Tim Otten [Sat, 16 Dec 2017 04:31:05 +0000 (21:31 -0700)]
Merge pull request #11413 from seamuslee001/CRM-21534-29
CRM-21534 - Fix invocation of test for MariaDB
colemanw [Fri, 15 Dec 2017 23:22:37 +0000 (18:22 -0500)]
Merge pull request #11414 from JMAConsulting/CRM-21563
CRM-21563: Cannot search child tags on 'Manage Tag' page
Coleman Watts [Fri, 15 Dec 2017 18:42:22 +0000 (11:42 -0700)]
Increase minimum php version requirements
deb.monish [Fri, 15 Dec 2017 12:21:50 +0000 (17:51 +0530)]
CRM-21567: Add email filter for Mail Bounce Report
deb.monish [Fri, 15 Dec 2017 08:19:27 +0000 (13:49 +0530)]
CRM-21563: Cannot search child tags on 'Manage Tag' page
Seamus Lee [Sat, 9 Dec 2017 01:35:36 +0000 (12:35 +1100)]
CRM-21534 fix invokation of test for MariaDB
Tim Otten [Fri, 15 Dec 2017 02:12:48 +0000 (19:12 -0700)]
xml/version (etal) - Renumber 4.7.29 as 4.7.30
CiviCRM [Thu, 2 Nov 2017 09:53:50 +0000 (09:53 +0000)]
Set version to 4.7.29
Eileen McNaughton [Fri, 15 Dec 2017 00:02:31 +0000 (13:02 +1300)]
Merge pull request #11394 from colemanw/CRM-13123
CRM-13123 - Add serialization metadata to schema
Coleman Watts [Thu, 14 Dec 2017 22:50:21 +0000 (15:50 -0700)]
CRM-13123 - Add comments, remove comma option
Coleman Watts [Fri, 8 Dec 2017 21:52:51 +0000 (16:52 -0500)]
CRM-13123 - Add serialization metadata to schema
eileen [Thu, 14 Dec 2017 01:51:21 +0000 (14:51 +1300)]
CRM-21551 Add parameter to support skipping processing greetings when calling api contact.create
Eileen McNaughton [Thu, 14 Dec 2017 20:51:26 +0000 (09:51 +1300)]
Merge pull request #11409 from mattwire/CRM-21555_case_pseudoconstant
CRM-21555 Replace Case CRM_Core_OptionGroup with CRM_Core_PseudoConstant
colemanw [Thu, 14 Dec 2017 16:42:16 +0000 (09:42 -0700)]
Merge pull request #11410 from Jazz-Man/patch-1
CRM-21560 - CRM_Event_Form_Task fatal error
colemanw [Thu, 14 Dec 2017 15:31:19 +0000 (08:31 -0700)]
Merge pull request #11406 from cividesk/CRM-21552
CRM-21552 Dedupe rule form : get contact type name instead of label for validation
Jazz [Thu, 14 Dec 2017 13:59:04 +0000 (15:59 +0200)]
Update Task.php
Fatal error: Uncaught Error: Using $this when not in object context
Matthew Wire [Thu, 14 Dec 2017 13:13:41 +0000 (22:13 +0900)]
Replace CRM_Core_OptionGroup::getValue with CRM_Core_PseudoConstant::getKey for Case
Sunil Pawar [Thu, 14 Dec 2017 08:10:04 +0000 (13:40 +0530)]
Dedule rule form : get contact type name instead of label
Eileen McNaughton [Thu, 14 Dec 2017 02:43:00 +0000 (15:43 +1300)]
Merge pull request #11380 from JMAConsulting/CRM-21513
CRM-21513: Change fee selection for text price field on backoffice Event registration Not Creating Correct Financial Items
Eileen McNaughton [Thu, 14 Dec 2017 00:51:22 +0000 (13:51 +1300)]
Merge pull request #11403 from JKingsnorth/CRM-21548
[NFC] CRM-21548 Remove unused variable and param from CRM_Utils_Address::format
sunil pawar [Wed, 13 Dec 2017 21:51:26 +0000 (03:21 +0530)]
CRM-21532 add missing French state/departments (#11392)
* CRM-21532 add missing French state/departments
* get country id using name and iso code for state insert statement
colemanw [Wed, 13 Dec 2017 14:36:38 +0000 (09:36 -0500)]
Merge pull request #11400 from eileenmcnaughton/removal
CRM-21544 - Remove unused CRM_Contact_BAO_Contact_Optimizer class
JKingsnorth [Wed, 13 Dec 2017 14:19:19 +0000 (14:19 +0000)]
CRM-21548 Remove unused variable and param from CRM_Utils_Address::format
deb.monish [Wed, 13 Dec 2017 13:25:27 +0000 (18:55 +0530)]
CRM-21547: Add UI order by options to Contact logging summary report
Eileen McNaughton [Tue, 12 Dec 2017 22:31:05 +0000 (11:31 +1300)]
Merge pull request #11305 from jmcclelland/CRM-21465
CRM-21465 - avoid fatal error when clicking through pledge email.
eileen [Tue, 12 Dec 2017 20:37:12 +0000 (09:37 +1300)]
CRM-21544 - Remove unused CRM_Contact_BAO_Contact_Optimizer class
colemanw [Tue, 12 Dec 2017 18:13:09 +0000 (13:13 -0500)]
Merge pull request #11399 from JMAConsulting/CRM-19704
CRM-19704: mailing body stripped if image only
colemanw [Tue, 12 Dec 2017 18:09:36 +0000 (13:09 -0500)]
Merge pull request #11397 from totten/master-wpver
CRM-16241 - distmaker - Set version in WP zip files
colemanw [Tue, 12 Dec 2017 18:05:12 +0000 (13:05 -0500)]
Merge pull request #11396 from mukeshcompucorp/fix-page-structure
CRM-21539: Fixed structure for administrative pages
deb.monish [Tue, 12 Dec 2017 15:58:15 +0000 (21:28 +0530)]
CRM-19704: mailing body stripped if image only
Tim Otten [Tue, 12 Dec 2017 05:37:35 +0000 (21:37 -0800)]
CRM-16421 - distmaker - Simplify shared code
Tim Otten [Tue, 12 Dec 2017 05:17:03 +0000 (21:17 -0800)]
CRM-16421 - distmaker - Set version in WP zip files
colemanw [Mon, 11 Dec 2017 16:34:21 +0000 (11:34 -0500)]
Merge pull request #11395 from seamuslee001/CRM-21534
CRM-21534 - Fix invocation of test for MariaDB
colemanw [Mon, 11 Dec 2017 16:00:03 +0000 (11:00 -0500)]
Merge pull request #11386 from agileware/CIVICRM-754
CRM-21535: Custom file upload field not showing up when Viewing Activity from Case Report.
Mukesh Ram [Mon, 11 Dec 2017 13:31:37 +0000 (19:01 +0530)]
Fixed structure for administrative pages
Michael McAndrew [Mon, 11 Dec 2017 10:44:22 +0000 (10:44 +0000)]
Various changes / improvements to MailingSystemTest
Michael McAndrew [Mon, 11 Dec 2017 10:43:13 +0000 (10:43 +0000)]
Some &s have become encoded twice (not sure why). Running htmlspecialchars_decode twice decodes them.
Michael McAndrew [Mon, 11 Dec 2017 10:41:54 +0000 (10:41 +0000)]
Include some HTML tags in the sample HTML header and footer.
Mark Hanna [Sat, 9 Dec 2017 19:50:22 +0000 (13:50 -0600)]
Merge pull request #11381 from mydropwizard/crm-21526
CRM-21526: CRM_Utils_System_Drupal8::authenticate() should change the Drupal user
Seamus Lee [Sat, 9 Dec 2017 01:35:36 +0000 (12:35 +1100)]
CRM-21534 fix invokation of test for MariaDB
colemanw [Fri, 8 Dec 2017 20:34:18 +0000 (15:34 -0500)]
Merge pull request #11222 from jitendrapurohit/CRM-21380
CRM-21380: Add setting to block activity types from sending assignee …
colemanw [Fri, 8 Dec 2017 12:46:08 +0000 (07:46 -0500)]
Merge pull request #11389 from eileenmcnaughton/reportsM
CRM-19060 preliminary tidy up
Michael McAndrew [Fri, 8 Dec 2017 11:54:31 +0000 (11:54 +0000)]
only create 'template' for plain text version if plain text has been submitted
Monish Deb [Fri, 8 Dec 2017 06:02:41 +0000 (11:32 +0530)]
Merge pull request #11388 from MegaphoneJon/CRM-21531
CRM-21531 - replace regex with POSIX-compliant alternative for MariaD…
Jitendra Purohit [Fri, 8 Dec 2017 06:00:48 +0000 (11:30 +0530)]
use json encode for assigning smarty vars to js
eileen [Fri, 8 Dec 2017 00:39:38 +0000 (13:39 +1300)]
CRM-19060 preliminary extract code to store group by array
eileen [Thu, 7 Dec 2017 21:59:44 +0000 (10:59 +1300)]
CRM-19060 preliminary tidy up, remove redundant functions, use isTableSelected
eileen [Thu, 7 Dec 2017 21:55:28 +0000 (10:55 +1300)]
CRM-19060 preliminary tidy up, get unit tests running on report, optimise group filter
Jon goldberg [Thu, 7 Dec 2017 21:05:53 +0000 (16:05 -0500)]
CRM-21531 - replace regex with POSIX-compliant alternative for MariaDB compatibility
Eileen McNaughton [Thu, 7 Dec 2017 20:24:57 +0000 (09:24 +1300)]
Merge pull request #11387 from civicrm/4.7.28-rc
Update `master` with final `4.7.28` changes
Coleman Watts [Thu, 7 Dec 2017 17:33:50 +0000 (12:33 -0500)]
Rename variable for consistency