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 [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
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
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
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
Monish Deb [Tue, 3 Jan 2017 05:48:11 +0000 (11:18 +0530)]
minor fix
Pradeep Nayak [Mon, 2 Jan 2017 11:13:00 +0000 (16:43 +0530)]
CRM-19817, fixed warnings and export for wordpress cms
----------------------------------------
* CRM-19817: Notice error fails membership export
https://issues.civicrm.org/jira/browse/CRM-19817
Monish Deb [Mon, 2 Jan 2017 10:23:31 +0000 (15:53 +0530)]
Merge pull request #9575 from jitendrapurohit/CRM-19761
CRM-19761: Add unit test and some fixes
Yashodha Chaku [Mon, 2 Jan 2017 10:00:14 +0000 (15:30 +0530)]
Merge pull request #9606 from yashodha/CRM-19783
CRM-19783 - Accessibility Error - CiviCRM Subscription Page
Yashodha Chaku [Mon, 2 Jan 2017 09:51:22 +0000 (15:21 +0530)]
Merge pull request #9591 from AppChecker/master
CRM-19805: comparing instead of assigning
Pradeep Nayak [Fri, 30 Dec 2016 07:33:36 +0000 (13:03 +0530)]
CRM-19800, fixed JS for parsing money field
----------------------------------------
* CRM-19800: Incorrect Amount recorded in civicrm_financial_trxn table
https://issues.civicrm.org/jira/browse/CRM-19800
Pradeep Nayak [Sun, 25 Dec 2016 19:17:41 +0000 (00:47 +0530)]
CRM-19800, added test
----------------------------------------
* CRM-19800: Incorrect Amount recorded in civicrm_financial_trxn table
https://issues.civicrm.org/jira/browse/CRM-19800
Pradeep Nayak [Sun, 25 Dec 2016 17:49:31 +0000 (23:19 +0530)]
CRM-19800, cleaned money for amount fields
----------------------------------------
* CRM-19800: Incorrect Amount recorded in civicrm_financial_trxn table
https://issues.civicrm.org/jira/browse/CRM-19800
Pradeep Nayak [Sun, 25 Dec 2016 17:18:42 +0000 (22:48 +0530)]
CRM-19800, cleaned money for total amount
----------------------------------------
* CRM-19800: Incorrect Amount recorded in civicrm_financial_trxn table
https://issues.civicrm.org/jira/browse/CRM-19800
Monish Deb [Mon, 2 Jan 2017 07:26:32 +0000 (12:56 +0530)]
Merge pull request #9576 from JMAConsulting/CRM-19585-2
[ready-for-core-team-review]CRM-19585, added function to calculate net amount if contribution has…
Monish Deb [Mon, 2 Jan 2017 07:26:09 +0000 (12:56 +0530)]
Merge pull request #9608 from jitendrapurohit/memtestfix
Fix startdate for testMembershipJoinDateFixed
Coleman Watts [Mon, 2 Jan 2017 06:32:41 +0000 (01:32 -0500)]
CRM-19816 - Improve activity search filters
jitendrapurohit [Mon, 2 Jan 2017 06:20:06 +0000 (11:50 +0530)]
Fix startdate for testMembershipJoinDateFixed
colemanw [Mon, 2 Jan 2017 06:19:17 +0000 (01:19 -0500)]
Merge pull request #9603 from colemanw/loc_event_id
Add select2 class to loc_event_id
yashodha [Mon, 2 Jan 2017 04:43:20 +0000 (10:13 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:38:18 +0000 (10:08 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:36:05 +0000 (10:06 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:32:51 +0000 (10:02 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:31:24 +0000 (10:01 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:29:46 +0000 (09:59 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:28:19 +0000 (09:58 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:27:35 +0000 (09:57 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:26:25 +0000 (09:56 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:25:33 +0000 (09:55 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:24:05 +0000 (09:54 +0530)]
fix year in headers
yashodha [Mon, 2 Jan 2017 04:11:11 +0000 (09:41 +0530)]
Accessibility Error - CiviCRM Subscription Page
Coleman Watts [Sun, 1 Jan 2017 01:10:09 +0000 (20:10 -0500)]
Add select2 class to loc_event_id
colemanw [Fri, 30 Dec 2016 22:20:00 +0000 (17:20 -0500)]
Merge pull request #9599 from colemanw/CRM-19812
CRM-19812 - Display related contact names in activity.get api
Coleman Watts [Fri, 30 Dec 2016 20:35:10 +0000 (15:35 -0500)]
CRM-19812 - Display related contact names in activity.get api
deb.monish [Fri, 30 Dec 2016 10:42:25 +0000 (16:12 +0530)]
CRM-19624: Exclude / Include by privacy radio buttons gets reset on Smartgroup re-editing
Monish Deb [Fri, 30 Dec 2016 10:17:17 +0000 (15:47 +0530)]
Merge pull request #9536 from twomice/CRM-19447_activity_details_search
CRM-19447 activity details search
deb.monish [Fri, 30 Dec 2016 09:26:53 +0000 (14:56 +0530)]
additional changes
Allen Shaw [Wed, 28 Dec 2016 22:58:16 +0000 (16:58 -0600)]
CRM-19447: Retain legacy code to avoid regressions; add tests.
Monish Deb [Fri, 30 Dec 2016 07:37:18 +0000 (13:07 +0530)]
Merge pull request #9584 from JMAConsulting/CRM-19804
[ready-for-core-team-review]CRM-19804, added pre and post hook invokation for FinancialAccount
Tim Otten [Thu, 29 Dec 2016 23:35:20 +0000 (15:35 -0800)]
Merge pull request #9573 from totten/master-inheritdoc
(NFC) CRM_*_Tokens - Reduce redundant docs
colemanw [Thu, 29 Dec 2016 18:05:19 +0000 (13:05 -0500)]
Merge pull request #9593 from colemanw/CRM-19810
CRM-19810 - Add api joins on optionValue table
Coleman Watts [Thu, 29 Dec 2016 17:22:36 +0000 (12:22 -0500)]
CRM-19810 - Add api joins on optionValue table
Pradeep Nayak [Thu, 29 Dec 2016 11:28:05 +0000 (16:58 +0530)]
CRM-19585, fixed rebase error
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Mon, 26 Dec 2016 10:56:13 +0000 (16:26 +0530)]
CRM-19585, fixed notice error
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Pradeep Nayak [Fri, 23 Dec 2016 14:10:38 +0000 (19:40 +0530)]
CRM-19585, added function to calculate net amount if contribution has tax amount
added test for the same
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
CRM-19585, removed space
----------------------------------------
* CRM-19585: Sales tax issue
https://issues.civicrm.org/jira/browse/CRM-19585
Monish Deb [Thu, 29 Dec 2016 10:51:38 +0000 (16:21 +0530)]
Merge pull request #9580 from JMAConsulting/CRM-19799
[ready-for-core-team-review]CRM-19799, fixed contribution params to include line items
Monish Deb [Thu, 29 Dec 2016 09:49:30 +0000 (15:19 +0530)]
Merge pull request #9590 from JMAConsulting/CRM-19585-6
[ready-for-core-team-review]CRM-19585, fixed tax issues
Allen Shaw [Wed, 14 Dec 2016 03:16:15 +0000 (21:16 -0600)]
CRM-19447: Added doc-blocks to unit test methods.
Allen Shaw [Wed, 14 Dec 2016 03:14:46 +0000 (21:14 -0600)]
CRM-19447: Add unit tests for api v3 activity.get by subject and by details.
Allen Shaw [Wed, 14 Dec 2016 02:50:20 +0000 (20:50 -0600)]
Fix CRM-19447: "Improve Activity Subject/Details text search to be similiar to Notes Subject/Body"
Allen Shaw [Wed, 14 Dec 2016 01:46:39 +0000 (19:46 -0600)]
Towards CRM-19447 (activity search by subject/details): basic functionality
appchecker [Thu, 29 Dec 2016 08:11:07 +0000 (11:11 +0300)]
CRM-19805: comparing instead of assigning
appchecker [Thu, 29 Dec 2016 08:10:43 +0000 (11:10 +0300)]
CRM-19805: comparing instead of assigning
projects / civicrm-core.git / log