colemanw [Wed, 11 Jan 2017 22:03:22 +0000 (17:03 -0500)]
Merge pull request #9651 from fuzionnz/CRM-19844-hook_only_when_success
Fire hook_civicrm_emailProcessor('activity') if Activity,create successful
colemanw [Wed, 11 Jan 2017 21:23:58 +0000 (16:23 -0500)]
Merge pull request #9595 from totten/master-extbatch-env
Civi\API\ExternalBatch - Verify that $_ENV is working
colemanw [Wed, 11 Jan 2017 21:02:28 +0000 (16:02 -0500)]
Merge pull request #9664 from konadave/CRM-19853
CRM-19853 replace interval controls with numeric
colemanw [Wed, 11 Jan 2017 19:52:25 +0000 (14:52 -0500)]
Merge pull request #9637 from omarabuhussein/CRM-19832-searchtask-hook
CRM-19832: Ensure that searchTasks hook get invoked once
colemanw [Wed, 11 Jan 2017 16:41:37 +0000 (11:41 -0500)]
Merge pull request #9660 from colemanw/CRM-19769
CRM-19769 - Add colorContrast js function
David Reedy Jr [Wed, 11 Jan 2017 16:09:02 +0000 (10:09 -0600)]
CRM-19853 set minimum value to zero
David Reedy Jr [Wed, 11 Jan 2017 15:31:44 +0000 (09:31 -0600)]
CRM-19853 number attributes
Yashodha Chaku [Wed, 11 Jan 2017 06:45:34 +0000 (12:15 +0530)]
Merge pull request #9653 from jmcclelland/CRM-19847
Crm 19847
David Reedy Jr [Wed, 11 Jan 2017 03:26:58 +0000 (21:26 -0600)]
CRM-19853 replace interval controls with numeric
Jamie McClelland [Tue, 10 Jan 2017 17:52:43 +0000 (12:52 -0500)]
CRM-19847: Style fixes
Jamie McClelland [Tue, 10 Jan 2017 17:46:21 +0000 (12:46 -0500)]
CRM-19847: ensure we get all parts of the query, not just the values
Coleman Watts [Tue, 10 Jan 2017 04:19:44 +0000 (23:19 -0500)]
CRM-19769 - Add colorContrast js function
colemanw [Tue, 10 Jan 2017 03:36:50 +0000 (22:36 -0500)]
Merge pull request #9503 from agh1/same-match-honoree
CRM-19725 CiviContribute: exclude donor from potential honoree dedupe matches
Eileen McNaughton [Tue, 10 Jan 2017 03:33:51 +0000 (16:33 +1300)]
Merge pull request #9659 from seamuslee001/php-comment-fix
Comment Fixes
Eileen McNaughton [Tue, 10 Jan 2017 03:25:14 +0000 (16:25 +1300)]
Merge pull request #9658 from eileenmcnaughton/comments
Comments
Seamus Lee [Tue, 10 Jan 2017 02:54:25 +0000 (13:54 +1100)]
Fix return for contribution api call
Seamus Lee [Tue, 10 Jan 2017 02:07:23 +0000 (13:07 +1100)]
Remove duplicated doc bloc comments
Eileen McNaughton [Tue, 10 Jan 2017 02:03:02 +0000 (15:03 +1300)]
Merge pull request #9657 from totten/master-docblocks
(NFC) Civi/*, CRM_Utils_SQL_Select - Fix various warnings
Seamus Lee [Tue, 10 Jan 2017 02:02:41 +0000 (13:02 +1100)]
Comment Fixes
eileen [Tue, 10 Jan 2017 02:02:21 +0000 (15:02 +1300)]
A few more comment fixes. Remove unused var rather than document it
eileen [Tue, 10 Jan 2017 01:54:13 +0000 (14:54 +1300)]
Clarify return val, fix casing on a couple of function calls
eileen [Tue, 10 Jan 2017 01:36:00 +0000 (14:36 +1300)]
Further comment fixes
eileen [Tue, 10 Jan 2017 01:20:56 +0000 (14:20 +1300)]
Further comment fixes
eileen [Tue, 10 Jan 2017 00:14:52 +0000 (13:14 +1300)]
Add comment blocks
Tim Otten [Tue, 10 Jan 2017 01:17:26 +0000 (17:17 -0800)]
Merge pull request #9656 from eileenmcnaughton/comments
Add comment blocks
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/Payment - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/Token - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/Test - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/Core - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/CCase - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:44:59 +0000 (16:44 -0800)]
Civi/API - Fix various PHPStorm warnings
Tim Otten [Tue, 10 Jan 2017 00:09:47 +0000 (16:09 -0800)]
CRM_Utils_SQL_Select - Add docblocks
eileen [Mon, 9 Jan 2017 23:51:50 +0000 (12:51 +1300)]
Fix comments on DAO files
eileen [Mon, 9 Jan 2017 23:45:32 +0000 (12:45 +1300)]
Add comment blocks
colemanw [Mon, 9 Jan 2017 19:16:39 +0000 (14:16 -0500)]
Merge pull request #9411 from seamuslee001/CRM-19509
CRM-19509 Apply standard database attributes to reports and standardi…
Jamie McClelland [Mon, 9 Jan 2017 18:55:36 +0000 (13:55 -0500)]
CRM-19847 - never redirect user to a snippet URL.
Jamie McClelland [Mon, 9 Jan 2017 18:54:21 +0000 (13:54 -0500)]
CRM-19847 - refactor so managing the query is easier.
Yashodha Chaku [Mon, 9 Jan 2017 12:20:27 +0000 (17:50 +0530)]
Merge pull request #9560 from aydun/CRM-19754
CRM-19754 case role relationships created with wrong direction
Chris Burgess [Mon, 9 Jan 2017 04:52:06 +0000 (17:52 +1300)]
CRM-19844: Fire hook_civicrm_emailProcessor('activity') only in event of Activity API success.
If this is triggered when the Activity API call was unsuccessful, it can lead to the mailbox processing being blocked by the rejected email.
Further emails may not be processed.
colemanw [Mon, 9 Jan 2017 03:15:40 +0000 (22:15 -0500)]
Merge pull request #9586 from alifrumin/caselinks
CRM-19806 make CiviCase only call formlinks once to create action links
colemanw [Mon, 9 Jan 2017 02:05:53 +0000 (21:05 -0500)]
Merge pull request #9596 from eileenmcnaughton/performance
CRM-19811 fix one instance of referring to LOWER() & comment others.
colemanw [Mon, 9 Jan 2017 01:12:03 +0000 (20:12 -0500)]
Merge pull request #9646 from eileenmcnaughton/report
CRM-19839 Declare class used on developer tab of CiviCRM reports
colemanw [Mon, 9 Jan 2017 01:07:04 +0000 (20:07 -0500)]
Merge pull request #9605 from ErichBSchulz/patch-4
allow descendant classes to access the cache array
colemanw [Mon, 9 Jan 2017 00:19:35 +0000 (19:19 -0500)]
Merge pull request #9594 from alifrumin/crm19807
CRM-19807 MySQL error when adding contacts on a report to a group
colemanw [Mon, 9 Jan 2017 00:07:52 +0000 (19:07 -0500)]
Merge pull request #9600 from colemanw/CRM-19769
CRM-19769 - Show title and more colors for tags
Coleman Watts [Fri, 30 Dec 2016 21:12:37 +0000 (16:12 -0500)]
CRM-19769 - Show title and more colors for tags
colemanw [Sun, 8 Jan 2017 21:00:51 +0000 (16:00 -0500)]
Merge pull request #9649 from colemanw/CRM-19829
CRM-19829 - Add sugar methods for window.localStorage
Eileen McNaughton [Sun, 8 Jan 2017 20:23:57 +0000 (09:23 +1300)]
Merge pull request #9632 from yashodha/CRM-19795
CRM-19795: Contribution page confirmation screen undefined index pay_…
Eileen McNaughton [Sun, 8 Jan 2017 20:23:14 +0000 (09:23 +1300)]
Merge pull request #9634 from jitendrapurohit/CRM-19803
CRM-19803 - test to check owed/refund details in view payments
Coleman Watts [Sat, 7 Jan 2017 00:29:25 +0000 (19:29 -0500)]
CRM-19829 - Add sugar methods for window.localStorage
eileenmcnaugton [Fri, 6 Jan 2017 04:21:43 +0000 (17:21 +1300)]
CRM-19839 Declare class used on developer tab of CiviCRM reports
colemanw [Thu, 5 Jan 2017 17:42:34 +0000 (12:42 -0500)]
Merge pull request #9566 from totten/master-19690-layout
CRM-19690 - crmMailing - Pick editor layout using template_type
Monish Deb [Thu, 5 Jan 2017 15:42:59 +0000 (21:12 +0530)]
Merge pull request #9598 from JMAConsulting/CRM-19585-7
[ready-for-core-team-review]CRM-19585, fix to add proportional entries in civicrm_entity_financial_trxn table for sales tax
colemanw [Thu, 5 Jan 2017 05:33:30 +0000 (00:33 -0500)]
Merge pull request #9619 from totten/master-19690-enable
CRM-19690 - Enable FlexMailer (if present)
colemanw [Thu, 5 Jan 2017 05:30:22 +0000 (00:30 -0500)]
Merge pull request #9617 from totten/master-19824
CRM-19824 - Container::loadContainer - Always compile listeners
colemanw [Thu, 5 Jan 2017 05:20:05 +0000 (00:20 -0500)]
Merge pull request #9624 from colemanw/CRM-19829
CRM-19829 - Add crmThrottle angular util
Coleman Watts [Wed, 4 Jan 2017 03:43:59 +0000 (22:43 -0500)]
CRM-19829 - Add test
Coleman Watts [Tue, 3 Jan 2017 21:28:11 +0000 (16:28 -0500)]
CRM-19829 - Add crmThrottle angular util
Tim Otten [Wed, 4 Jan 2017 21:17:57 +0000 (13:17 -0800)]
Merge pull request #9629 from colemanw/CRM-19770
CRM-19770 - Add is_star column to civicrm_activity
Tim Otten [Wed, 4 Jan 2017 20:07:16 +0000 (12:07 -0800)]
Merge pull request #9601 from civicrm/4.7.15-rc
4.7.15 rc
Tim Otten [Wed, 4 Jan 2017 18:08:03 +0000 (10:08 -0800)]
Merge pull request #9628 from agh1/release-notes-4.7.15
Release notes 4.7.15
colemanw [Wed, 4 Jan 2017 17:15:34 +0000 (12:15 -0500)]
Merge pull request #9630 from colemanw/4.7.15-rc
Backport CRM-19799 to 4.7.15
omar abu hussein [Wed, 4 Jan 2017 14:57:00 +0000 (14:57 +0000)]
CRM-19832: Ensure that searchTasks hook get invoked once
This ensure that searchTasks hook for diffrent civicrm entites will only get called once and prevent
action items added by this hook from appearing twice in the search actions menu.
Monish Deb [Wed, 4 Jan 2017 13:06:45 +0000 (18:36 +0530)]
Merge pull request #9618 from totten/master-19826
CRM-19826 - CRM_Extension_System - Fix extra slash in `vendor` URLs
jitendrapurohit [Wed, 4 Jan 2017 10:50:42 +0000 (16:20 +0530)]
CRM-19803 test to check owed/refund details in view payments
yashodha [Wed, 4 Jan 2017 11:20:50 +0000 (16:50 +0530)]
CRM-19795: minor fix
Monish Deb [Wed, 4 Jan 2017 10:51:08 +0000 (16:21 +0530)]
Merge pull request #9592 from kainukempowerment/CRM-19803
Replaced inner with left joins to show refunds CRM-19803
Yashodha Chaku [Wed, 4 Jan 2017 06:52:15 +0000 (12:22 +0530)]
Merge pull request #9607 from yashodha/update-year
fix header
yashodha [Wed, 4 Jan 2017 06:33:00 +0000 (12:03 +0530)]
CRM-19795: Contribution page confirmation screen undefined index pay_later_receipt
Monish Deb [Wed, 4 Jan 2017 05:54:03 +0000 (11:24 +0530)]
Merge pull request #9620 from jitendrapurohit/CRM-19706
CRM-19706 - Fix setDefault on status id smart group formvalues
Pradeep Nayak [Wed, 28 Dec 2016 21:11:16 +0000 (02:41 +0530)]
CRM-19799, set line item in form layer
----------------------------------------
* CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level
https://issues.civicrm.org/jira/browse/CRM-19799
Pradeep Nayak [Mon, 26 Dec 2016 22:37:26 +0000 (04:07 +0530)]
CRM-19799, fixed contribution params to include line items
----------------------------------------
* CRM-19799: LineItems incorrect at both Contribution Level and Financial Accounts Level
https://issues.civicrm.org/jira/browse/CRM-19799
Coleman Watts [Wed, 4 Jan 2017 05:09:22 +0000 (00:09 -0500)]
Move upgrade tasks to the correct version
Fixes misplaced upgrade steps that should be in 4.7.16 instead of 4.7.15.
Andrew Hunt [Wed, 4 Jan 2017 04:50:36 +0000 (23:50 -0500)]
Release notes: wrap nicely
Andrew Hunt [Wed, 4 Jan 2017 04:44:03 +0000 (23:44 -0500)]
Release notes: completed manual notes for 4.7.15
Coleman Watts [Wed, 4 Jan 2017 04:07:36 +0000 (23:07 -0500)]
CRM-19770 - Add is_star column to civicrm_activity
Andrew Hunt [Wed, 4 Jan 2017 02:41:36 +0000 (21:41 -0500)]
Release notes: manual notes for features
Andrew Hunt [Wed, 4 Jan 2017 02:23:56 +0000 (21:23 -0500)]
Release notes: organized 4.7.15 notes
Andrew Hunt [Wed, 4 Jan 2017 02:06:29 +0000 (21:06 -0500)]
Release notes: generated for 4.7.15
Andrew Hunt [Wed, 4 Jan 2017 01:47:38 +0000 (20:47 -0500)]
Release notes: added 4.7.15 contributors to key
colemanw [Tue, 3 Jan 2017 21:00:02 +0000 (16:00 -0500)]
Merge pull request #9609 from colemanw/CRM-19816
CRM-19816 - Improve activity search filters
Alice Frumin [Tue, 3 Jan 2017 16:19:34 +0000 (11:19 -0500)]
no longer using separate more links
Pradeep Nayak [Tue, 3 Jan 2017 14:29:46 +0000 (19:59 +0530)]
CRM-19585, added test to check if line items are proportinally assigned when PI is changed for contribution having tax
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Tue, 3 Jan 2017 14:17:39 +0000 (19:47 +0530)]
CRM-19585, added test for createProportionalFinancialEntries
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Tue, 3 Jan 2017 13:53:27 +0000 (19:23 +0530)]
CRM-19585, moved set of code into function anad added test for getLastFinancialItemIds()
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Tue, 3 Jan 2017 13:33:39 +0000 (19:03 +0530)]
CRM-19585, added test for createProportionalEntry()
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Tue, 3 Jan 2017 13:32:52 +0000 (19:02 +0530)]
CRM-19585, added test for getSalesTaxFinancialAccounts()
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
jitendrapurohit [Tue, 3 Jan 2017 10:54:59 +0000 (16:24 +0530)]
Fix setDefault on status id smart group formvalues
Pradeep Nayak [Fri, 30 Dec 2016 22:02:54 +0000 (03:32 +0530)]
CRM-19585, minor fix
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Fri, 30 Dec 2016 13:27:24 +0000 (18:57 +0530)]
CRM-19585, Generalized code, added fix to add entries in civicrm_entity_financial_trxn table for tax
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Fri, 30 Dec 2016 13:26:58 +0000 (18:56 +0530)]
CRM-19585, moved set of code into function
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Fri, 30 Dec 2016 12:34:17 +0000 (18:04 +0530)]
CRM-19585, added function to retrieve sales tax financial Account
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Monish Deb [Tue, 3 Jan 2017 11:54:02 +0000 (17:24 +0530)]
Merge pull request #9578 from jitendrapurohit/CRM-18591
CRM-18591: Fix group_type param in creating group
Monish Deb [Tue, 3 Jan 2017 11:44:29 +0000 (17:14 +0530)]
Merge pull request #9597 from monishdeb/CRM-19624
CRM-19624: Exclude / Include by privacy radio buttons gets reset on Smartgroup re-editing
Monish Deb [Tue, 3 Jan 2017 11:39:33 +0000 (17:09 +0530)]
Merge pull request #9577 from JMAConsulting/AmountPR
[ready-for-core-team-review]CRM-19800, Incorrect Amount recorded in civicrm_financial_trxn table
Tim Otten [Sat, 3 Dec 2016 03:19:20 +0000 (19:19 -0800)]
CRM-19690 - Enable FlexMailer (if present)
FlexMailer (https://github.com/civicrm/org.civicrm.flexmailer/) is a
refactoring of the email-delivery logic from the Mailing BAOs. The primary
goal is to make the email-delivery logic more extensible by exposing a
better set of events for extension-authors. Sadly, the original code is a
bit toxic (originally lacking in tests; thick with many features; using some
quirky dataflows), which means:
1. Any refactoring of it poses a high risk.
2. The refactoring should ideally be done with iteration/validation as
an optional extension.
This patch aims to be the bare-minimum core patch required to facilitate a
better 'leap by extension'. The main priorities are:
1. Minimize risk -- no impact on existing users who can continue using existing logic.
2. Enable iteration/testing/deployment of an optional extension in real-world scenarios.
3. Keep any core hacks clear and isolated - don't rashly commit to new, public APIs.
jitendrapurohit [Tue, 3 Jan 2017 10:13:01 +0000 (15:43 +0530)]
add unit test
Tim Otten [Tue, 20 Dec 2016 22:05:31 +0000 (14:05 -0800)]
CRM-19826 - CRM_Extension_System - Fix extra slash in `vendor` URLs
If you install an extension under `$cmsRoot/vendor/org.example.foo`, the
resulting URL contains an extraneous `/` (eg
`http://example.org//vendor/org.example.foo`). (In Windows, I suspect it's
even worse because it uses DIRECTORY_SEPARATOR in the URl -- eg
`http://example.org/\vendor/org.example.foo`.)
This patch checks for and removes the extraneous slash -- and always
constructs the URL with the appropriate delimiter (`/`).
Problem observed in `dmaster`.
Tim Otten [Tue, 3 Jan 2017 07:54:43 +0000 (23:54 -0800)]
CRM-19824 - Container::loadContainer - Always compile listeners
In the typical (cache-enabled) flow, the container is compiled to identify
any services tagged with `kernel.event_subscriber`. However, if you disable
caching, then it skipped compilation, and it failed to identify all the
listeners.
With this patch, we always detect the listeners -- even if caching is
disabled.
(This issue identified while working on tests for CRM-19690.
Yashodha Chaku [Tue, 3 Jan 2017 05:51:21 +0000 (11:21 +0530)]
Merge pull request #9610 from JMAConsulting/CRM-19817
CRM-19817, fixed warnings and export for wordpress cms