Eileen McNaughton [Thu, 4 Jan 2018 02:20:35 +0000 (15:20 +1300)]
Merge pull request #11484 from civicrm/4.7.30-rc
4.7.30 rc
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
colemanw [Wed, 3 Jan 2018 03:30:21 +0000 (22:30 -0500)]
Merge pull request #11478 from mukeshcompucorp/fix-page-structure
CRM-21618: Fix page structure
Mukesh Ram [Tue, 2 Jan 2018 06:22:12 +0000 (11:52 +0530)]
CRM-21618: Remove redundant attribute
Mukesh Ram [Tue, 2 Jan 2018 05:28:25 +0000 (10:58 +0530)]
CRM-21618: Fix page structure
Eileen McNaughton [Tue, 2 Jan 2018 03:31:29 +0000 (16:31 +1300)]
Merge pull request #11465 from jitendrapurohit/CRM-21612
CRM-21612: Membership Payment not recorded for recurring contribution…
Eileen McNaughton [Mon, 1 Jan 2018 20:33:30 +0000 (09:33 +1300)]
Merge pull request #11475 from civicrm/4.7.30-rc
4.7.30 rc
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
colemanw [Mon, 1 Jan 2018 03:56:29 +0000 (22:56 -0500)]
Merge pull request #11472 from colemanw/CRM-13123
CRM-13123 - Fix serialization metadata for uf group type field
Jitendra Purohit [Mon, 1 Jan 2018 03:14:04 +0000 (08:44 +0530)]
CRM-21559 - Save button in Case Type not clickable
Coleman Watts [Sun, 31 Dec 2017 20:01:57 +0000 (15:01 -0500)]
CRM-13123 - Fix serialization metadata for uf group type field
colemanw [Sun, 31 Dec 2017 19:49:54 +0000 (14:49 -0500)]
Merge pull request #11470 from twomice/CRM-18300_correct_hardcoded_profile_names
Fix for one cause of CRM-18300.
Allen Shaw [Sun, 31 Dec 2017 02:01:11 +0000 (20:01 -0600)]
Fix for one cause of CRM-18300.
colemanw [Sat, 30 Dec 2017 21:34:57 +0000 (16:34 -0500)]
Merge pull request #11466 from coolbit/CRM-21602
Crm 21602
colemanw [Sat, 30 Dec 2017 16:11:31 +0000 (11:11 -0500)]
Merge pull request #11467 from JMAConsulting/CRM-21613
CRM-21613: Search issues on 'Manage Tag' page
deb.monish [Fri, 29 Dec 2017 19:28:38 +0000 (00:58 +0530)]
CRM-21613: Search issues on 'Manage Tag' page
Monish Deb [Sat, 30 Dec 2017 12:43:51 +0000 (18:13 +0530)]
Merge pull request #11469 from colemanw/CRM-21614
CRM-21614 - Tag UI doesn't appear to respect reserved tags permission
Coleman Watts [Fri, 29 Dec 2017 20:44:50 +0000 (15:44 -0500)]
CRM-21614 - Tag UI doesn't appear to respect reserved tags permission
Monish Deb [Fri, 29 Dec 2017 18:05:32 +0000 (23:35 +0530)]
Merge pull request #10815 from lcdservices/CRM-21020
CRM-21020 add context details to alterMailContent hook
CB [Fri, 29 Dec 2017 16:22:26 +0000 (16:22 +0000)]
Fixed #CRM-21602: Added CRM.$ instead of $ for two pages Petition and Survey when jQuery noConflict is not initiated
colemanw [Fri, 29 Dec 2017 16:00:40 +0000 (09:00 -0700)]
Merge pull request #11458 from JMAConsulting/CRM-8140
CRM-8140: Not possible to select fields for export when using Custom Searches
colemanw [Fri, 29 Dec 2017 15:04:14 +0000 (08:04 -0700)]
Merge pull request #11434 from JO0st/CRM-21580
CRM-21580 - fix exporting financial batch fails when label of batch statuses changed
Jitendra Purohit [Fri, 29 Dec 2017 06:12:02 +0000 (11:42 +0530)]
CRM-21612: Membership Payment not recorded for recurring contribution when status label is changed
Monish Deb [Thu, 28 Dec 2017 10:23:00 +0000 (15:53 +0530)]
Merge pull request #11457 from mukeshcompucorp/fix-page-structure
CRM-21599: Added missing structure in templates
JO0st [Thu, 28 Dec 2017 08:08:16 +0000 (09:08 +0100)]
CRM-21580 get exportstatusid based on name in stead of value
colemanw [Wed, 27 Dec 2017 21:09:29 +0000 (14:09 -0700)]
Merge pull request #11418 from colemanw/daoCleanup
Reformat DAO files to pass linting and use short array syntax
Coleman Watts [Sat, 16 Dec 2017 16:46:22 +0000 (09:46 -0700)]
Cleanup old dao snapshot file
Coleman Watts [Sat, 16 Dec 2017 07:52:50 +0000 (00:52 -0700)]
Cleanup CRM_Core_DAO
Coleman Watts [Sat, 16 Dec 2017 06:13:33 +0000 (23:13 -0700)]
Reformat DAO files to pass linting and use short array syntax
Monish Deb [Wed, 27 Dec 2017 16:26:49 +0000 (21:56 +0530)]
Merge pull request #11433 from octo-happiness/CRM-20866
CRM-20866: Soft credit appearance inconsistent in contribution search
Monish Deb [Wed, 27 Dec 2017 15:22:27 +0000 (20:52 +0530)]
Merge pull request #11446 from twomice/CRM-21589_repeat_contribution_report_sort
Fix CRM-21589: "Repeat Contributions" report ignores sort.
deb.monish [Tue, 26 Dec 2017 19:28:54 +0000 (00:58 +0530)]
CRM-8140: Not possible to select fields for export when using Custom Searches
Mukesh Ram [Tue, 26 Dec 2017 13:15:02 +0000 (18:45 +0530)]
CRM-21599: Fix title label
Mukesh Ram [Tue, 26 Dec 2017 09:34:27 +0000 (15:04 +0530)]
CRM-21599-add-missing-structure-in-templates
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 [Sun, 24 Dec 2017 12:46:46 +0000 (05:46 -0700)]
Merge pull request #11371 from MiyaNoctem/CRM-21520-action-to-add-contacts-to-case
CRM-21520: Implement Search Action to Add Contacts to Case
Tim Otten [Sat, 23 Dec 2017 03:56:39 +0000 (19:56 -0800)]
Merge pull request #11451 from colemanw/assertGreaterThanOrEqual
Params to assertGreaterThanOrEqual in api_v3_CaseTest were in wrong order
colemanw [Fri, 22 Dec 2017 21:32:22 +0000 (14:32 -0700)]
Merge pull request #11401 from JMAConsulting/CRM-21546
CRM-21546: Implement unique opens filter for mailing opened report
colemanw [Fri, 22 Dec 2017 19:20:50 +0000 (12:20 -0700)]
Merge pull request #11452 from civicrm/4.7.30-rc
4.7.30 rc
Coleman Watts [Fri, 22 Dec 2017 18:19:10 +0000 (13:19 -0500)]
Params to assertGreaterThanOrEqual in api_v3_CaseTest were in wrong order
colemanw [Fri, 22 Dec 2017 15:40:27 +0000 (08:40 -0700)]
Merge pull request #11449 from JMAConsulting/CRM-21593
CRM-21593: New order by options for WalkList Report
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
deb.monish [Fri, 22 Dec 2017 13:22:42 +0000 (18:52 +0530)]
CRM-21593: New order by options for WalkList Report
deb.monish [Fri, 22 Dec 2017 09:19:37 +0000 (14:49 +0530)]
minor fix
deb.monish [Wed, 13 Dec 2017 12:53:04 +0000 (18:23 +0530)]
CRM-21546: Implement unique opens filter for mailing opened report
colemanw [Thu, 21 Dec 2017 21:29:11 +0000 (14:29 -0700)]
Merge pull request #10393 from JMAConsulting/exportBatch
[ready for core team to review] CRM-20614 Don't download export file until asked
Allen Shaw [Thu, 21 Dec 2017 18:30:15 +0000 (12:30 -0600)]
Fix CRM-21589: "Repeat Contributions" report ignores sort.
Camilo Rodriguez [Thu, 21 Dec 2017 11:59:39 +0000 (11:59 +0000)]
CRM-21520: Remove Unneeded Change to Menu XML and Refactor Redirect
CiviCRM [Thu, 21 Dec 2017 08:48:26 +0000 (08:48 +0000)]
Set version to 4.7.31
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 …
Octo Hapiness [Tue, 19 Dec 2017 04:46:00 +0000 (05:46 +0100)]
CRM-20866: Soft credit appearance inconsistent in contribution search
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
projects / civicrm-core.git / log