Edsel [Wed, 8 Feb 2017 14:33:22 +0000 (20:03 +0530)]
CRM-19964 Added unit test
----------------------------------------
* CRM-19964: Event registration creates contribution without line item
https://issues.civicrm.org/jira/browse/CRM-19964
Pradeep Nayak [Wed, 8 Feb 2017 13:50:22 +0000 (19:20 +0530)]
CRM-19964, added validation to select atleast one price option when record contribution is checked
----------------------------------------
* CRM-19964: Event registration creates contribution without line item
https://issues.civicrm.org/jira/browse/CRM-19964
Pradeep Nayak [Fri, 3 Feb 2017 12:04:10 +0000 (17:34 +0530)]
CRM-19964, Fixed notice errors
----------------------------------------
* CRM-19964: Event registration creates contribution without line item
https://issues.civicrm.org/jira/browse/CRM-19964
Pradeep Nayak [Fri, 3 Feb 2017 12:03:20 +0000 (17:33 +0530)]
CRM-19964, fixed line item variable to filter empty values
----------------------------------------
* CRM-19964: Event registration creates contribution without line item
https://issues.civicrm.org/jira/browse/CRM-19964
Eileen McNaughton [Wed, 8 Feb 2017 03:45:51 +0000 (16:45 +1300)]
Merge pull request #9771 from seanmadsen/master
remove markdown files in /docs
Tim Otten [Tue, 7 Feb 2017 23:30:31 +0000 (15:30 -0800)]
Merge pull request #9785 from totten/master-perm-msgtpl
civicrm_webtest.install - Restore access to edit message templates and tags
colemanw [Tue, 7 Feb 2017 18:44:08 +0000 (13:44 -0500)]
Merge pull request #9787 from colemanw/CRM-19943
CRM-19943 - New manage tags UI with jstree
colemanw [Tue, 7 Feb 2017 18:06:26 +0000 (13:06 -0500)]
Merge pull request #9766 from jitendrapurohit/CRM-19956
CRM-19956: Fix case getlist api with 'id' and 'case_id' param
Coleman Watts [Mon, 6 Feb 2017 18:15:01 +0000 (13:15 -0500)]
CRM-19943 - Add maximum height to contact tag tree and fix spacing
Yashodha Chaku [Tue, 7 Feb 2017 12:55:55 +0000 (18:25 +0530)]
Merge pull request #9800 from yashodha/CRM-19883
CRM-19883: add priority to filter
Eileen McNaughton [Tue, 7 Feb 2017 08:09:07 +0000 (21:09 +1300)]
Merge pull request #9799 from eileenmcnaughton/enotice
CRM-19815 enotice fix & tidy ups related to previous PR
yashodha [Tue, 7 Feb 2017 04:23:00 +0000 (09:53 +0530)]
CRM-19883: add priority to filter
eileen [Mon, 9 Jan 2017 00:20:08 +0000 (13:20 +1300)]
CRM-19815 minor tidy ups, reduce switch clause,remove unused var
eileen [Mon, 2 Jan 2017 00:04:09 +0000 (13:04 +1300)]
CRM-19815 preliminary tidy-up adjust confusing switch logic to 'opt-in'
eileen [Wed, 4 Jan 2017 21:46:50 +0000 (10:46 +1300)]
CRM-19830 remove handling on campaign_id in favour of metadata-based.
This is no longer required because the main metadatabased function is handling it.
eileen [Tue, 7 Feb 2017 03:24:16 +0000 (16:24 +1300)]
Test tidy ups, formatting, casing
eileen [Tue, 7 Feb 2017 03:22:26 +0000 (16:22 +1300)]
CRM-19815 fix for e-notice regression from setting uniquename on check_number
Eileen McNaughton [Tue, 7 Feb 2017 03:38:00 +0000 (16:38 +1300)]
Merge pull request #9798 from eileenmcnaughton/examples
Update Test generated examples
eileen [Tue, 7 Feb 2017 02:09:36 +0000 (15:09 +1300)]
Test classes tidy up.
Mostly replacing instances of callAPIAndDocument with callAPISuccess where they are overwriting
other test generated examples. I put this down to copy and paste
eileen [Tue, 7 Feb 2017 00:55:46 +0000 (13:55 +1300)]
Update Test generated examples
m
colemanw [Mon, 6 Feb 2017 20:50:04 +0000 (15:50 -0500)]
Merge pull request #9765 from monishdeb/CRM-19938
CRM-19938: Make Civi to CMS email sync optional
Coleman Watts [Mon, 6 Feb 2017 18:03:02 +0000 (13:03 -0500)]
CRM-19943 - Add deselect button
Coleman Watts [Mon, 6 Feb 2017 17:42:11 +0000 (12:42 -0500)]
CRM-19943 - Enforce 'administer Tagsets' permission in UI
Coleman Watts [Sat, 4 Feb 2017 22:50:20 +0000 (17:50 -0500)]
CRM-19943 - Update navigation menu
Coleman Watts [Sat, 4 Feb 2017 22:41:56 +0000 (17:41 -0500)]
CRM-19943 - Enforce 'administer reserved tags' permission in UI
Coleman Watts [Sat, 4 Feb 2017 05:08:39 +0000 (00:08 -0500)]
CRM-19943 - Merge multiple tags from new UI
Coleman Watts [Fri, 3 Feb 2017 05:10:14 +0000 (00:10 -0500)]
CRM-19943 - New manage tags UI with jstree
Coleman Watts [Tue, 31 Jan 2017 04:10:20 +0000 (23:10 -0500)]
CRM-19943 - Install the new version of jstree
We can keep the old version around in /packages.
It's not loaded globally, so there aren't any conflicts in having both.
Coleman Watts [Mon, 30 Jan 2017 20:14:27 +0000 (15:14 -0500)]
CRM-19943 - Improve contact tag UI
Eileen McNaughton [Mon, 6 Feb 2017 08:32:10 +0000 (21:32 +1300)]
Merge pull request #9792 from h-c-c/CRM-19945
fix and test for CRM-19945
Peter Hartmann [Mon, 6 Feb 2017 04:56:52 +0000 (23:56 -0500)]
remove whitespace
Peter Hartmann [Mon, 6 Feb 2017 04:28:35 +0000 (23:28 -0500)]
fix and test for CRM-19945
Tim Otten [Sun, 5 Feb 2017 23:39:46 +0000 (15:39 -0800)]
civicrm_webtest.install - Restore access to manage tags
This affects demo builds and (theoretically) other test systems.
Tim Otten [Sat, 4 Feb 2017 20:17:03 +0000 (12:17 -0800)]
civicrm_webtest.install - Restore access to edit message templates
This affects demo builds and (theoretically) other test systems.
colemanw [Fri, 3 Feb 2017 17:23:57 +0000 (12:23 -0500)]
Merge pull request #9711 from KarinG/master
CRM-19908 - Fundamental Fixes for TaxMath Calculations 4.7
Monish Deb [Fri, 3 Feb 2017 12:32:21 +0000 (18:02 +0530)]
minor changes
deb.monish [Thu, 2 Feb 2017 11:18:57 +0000 (16:48 +0530)]
CRM-19938: Make Civi to CMS email sync optional
Monish Deb [Fri, 3 Feb 2017 07:27:17 +0000 (12:57 +0530)]
Merge pull request #9754 from lcdservices/CRM-19947
CRM-19947 fix file link on custom multi profile edit form
Monish Deb [Fri, 3 Feb 2017 05:35:39 +0000 (11:05 +0530)]
Merge pull request #9764 from monishdeb/CRM-19918
CRM-19918: Price field 'Active on' date ignored in Edit Event Registration > 'Change Selections'
jitendrapurohit [Thu, 2 Feb 2017 11:24:39 +0000 (16:54 +0530)]
CRM-19956: Fix case getlist api with 'id' and 'case_id' param
Eileen McNaughton [Fri, 3 Feb 2017 01:25:10 +0000 (14:25 +1300)]
Merge pull request #9767 from monishdeb/CRM-19957
CRM-19957: DB Syntax Error on all Search Form submission
Sean Madsen [Fri, 3 Feb 2017 00:36:10 +0000 (17:36 -0700)]
/docs - removing markdown files that are now in the Developer Guide
Monish Deb [Thu, 2 Feb 2017 15:04:17 +0000 (20:34 +0530)]
Merge pull request #9730 from jitendrapurohit/CRM-19924
CRM-19924: Unsubscribe from a mailing sent to a parent group silently…
Brian Shaughnessy [Thu, 2 Feb 2017 14:28:33 +0000 (09:28 -0500)]
CRM-19947 adjust url condition
Monish Deb [Thu, 2 Feb 2017 12:49:50 +0000 (18:19 +0530)]
Merge pull request #9690 from jitendrapurohit/CRM-19887
CRM-19887: Activity Summary report gives DB error on sort by email
deb.monish [Thu, 2 Feb 2017 12:25:04 +0000 (17:55 +0530)]
CRM-19957: DB Syntax Error on all Search Form submission
Monish Deb [Thu, 2 Feb 2017 09:41:57 +0000 (15:11 +0530)]
Merge pull request #9674 from h-c-c/CRM-19873
Fix for CRM-19873
deb.monish [Thu, 2 Feb 2017 08:01:43 +0000 (13:31 +0530)]
CRM-19918: Price field 'Active on' date ignored in Edit Event Registration > 'Change Selections'
Peter Hartmann [Thu, 2 Feb 2017 05:47:59 +0000 (00:47 -0500)]
adds test for CRM-19873 patch
Eileen McNaughton [Thu, 2 Feb 2017 00:27:34 +0000 (13:27 +1300)]
Merge pull request #9718 from eileenmcnaughton/cont2
CRM-19830 CRM-19815 clean up on contribution search
Eileen McNaughton [Thu, 2 Feb 2017 00:15:59 +0000 (13:15 +1300)]
Merge pull request #9763 from eileenmcnaughton/price_forms
Price forms fixes: part of CRM-19517 + cleanup & symptom fix for CRM-19953
Eileen McNaughton [Wed, 1 Feb 2017 21:43:57 +0000 (10:43 +1300)]
Merge pull request #9762 from fuzionnz/CRM-19793-payment_processor_exception_redirect
CRM-19793: payment processor exception redirect
eileen [Wed, 1 Feb 2017 20:44:26 +0000 (09:44 +1300)]
CRM-19953 only get (potentially slow) entity data if return not set
eileen [Wed, 1 Feb 2017 03:49:42 +0000 (16:49 +1300)]
CRM-19953 remove call to getUsedBy from delete.
This function is only ever called from Price_Page_Set, which does not proceed to the price set delete
if there are price sets, so that call is redundant
eileen [Wed, 1 Feb 2017 01:54:38 +0000 (14:54 +1300)]
CRM-19953 refactor getUsedFor to break down & comment heavily.
This does not change the functionality - it just improves readability and ensures that the slow part is marked and
future direction for the function is suggested
eileen [Wed, 1 Feb 2017 01:10:32 +0000 (14:10 +1300)]
CRM-19953 preliminary tidy up.
Fix comments, spelling, unused variables
Seamus Lee [Wed, 1 Feb 2017 20:13:28 +0000 (09:13 +1300)]
CRM-19517 add price field value check and ability to edit them
Chris Burgess [Wed, 1 Feb 2017 20:42:56 +0000 (09:42 +1300)]
CRM-19793: Log payment processor exception message to debug log.
Monish Deb [Wed, 1 Feb 2017 11:51:36 +0000 (17:21 +0530)]
Merge pull request #9753 from chanunc/master
Fix against PHP warning; Notice: Array to string conversion
Monish Deb [Wed, 1 Feb 2017 06:58:02 +0000 (12:28 +0530)]
Merge pull request #9758 from lcdservices/CRM-19955
CRM-19955 file display in contact record
Brian Shaughnessy [Wed, 1 Feb 2017 02:06:21 +0000 (21:06 -0500)]
CRM-19955 file display in contact record
Eileen McNaughton [Tue, 31 Jan 2017 22:35:32 +0000 (11:35 +1300)]
Merge pull request #9680 from h-c-c/CRM-19881
Fix for CRM 19881: Clobbered time for receive_date and trxn_date
Monish Deb [Tue, 31 Jan 2017 12:46:51 +0000 (18:16 +0530)]
Merge pull request #9732 from jitendrapurohit/CRM-19926
CRM-19926: Include child groups when filtered with parent group in Reports
Brian Shaughnessy [Mon, 30 Jan 2017 22:58:45 +0000 (17:58 -0500)]
CRM-19947 fix file link on custom multi profile edit form
colemanw [Mon, 30 Jan 2017 20:45:51 +0000 (15:45 -0500)]
Merge pull request #9752 from monishdeb/CRM-18427
CRM-18427: Custom data didn't got populated upon subsequent submission
colemanw [Mon, 30 Jan 2017 19:53:20 +0000 (14:53 -0500)]
Merge pull request #9587 from colemanw/CRM-19802
CRM-19802 - Fix more translated strings in tpls
colemanw [Mon, 30 Jan 2017 19:46:41 +0000 (14:46 -0500)]
Merge pull request #9704 from seamuslee001/CRM-19871
CRM-19871 CRM-19898 Fix issue where changing weight of a membership t…
Chanun Chirattikanon [Mon, 30 Jan 2017 16:49:36 +0000 (16:49 +0000)]
Fix against PHP warning; Notice: Array to string conversion
deb.monish [Mon, 30 Jan 2017 13:23:20 +0000 (18:53 +0530)]
CRM-18427: Custom data didn't got populated upon subsequent submission
Monish Deb [Mon, 30 Jan 2017 05:56:04 +0000 (11:26 +0530)]
Merge pull request #9731 from jitendrapurohit/CRM-19927
CRM-19927: Error message when 'Add to Group' is pressed with no group…
colemanw [Sat, 28 Jan 2017 21:36:14 +0000 (16:36 -0500)]
Merge pull request #9744 from JMAConsulting/CRM-19936
CRM-19936, initialized array for line items
Pradeep Nayak [Fri, 27 Jan 2017 12:21:37 +0000 (17:51 +0530)]
CRM-19936, initialized array for line items
----------------------------------------
* CRM-19936: Membership line items are doubled when a membersip is renewed using online contribution page
https://issues.civicrm.org/jira/browse/CRM-19936
KarinG [Wed, 25 Jan 2017 16:29:03 +0000 (09:29 -0700)]
Add PHPUnit Test - testSubmitContributionPageWithPriceSetQuantity.
colemanw [Wed, 25 Jan 2017 16:04:48 +0000 (11:04 -0500)]
Merge pull request #9735 from jitendrapurohit/CRM-19930-test
CRM-19930: Test toArray() function with param
colemanw [Wed, 25 Jan 2017 14:59:30 +0000 (09:59 -0500)]
Merge pull request #9668 from colemanw/CRM-19864
CRM-19864 - Set url to backend for getting started widget
colemanw [Wed, 25 Jan 2017 14:41:34 +0000 (09:41 -0500)]
Merge pull request #9733 from kurund/CRM-19929
CRM-19929: added missing pre hooks for entity tags
Kurund Jalmi [Wed, 25 Jan 2017 13:09:43 +0000 (18:39 +0530)]
CRM-19929: also add pre hook for delete
Kurund Jalmi [Wed, 25 Jan 2017 12:53:08 +0000 (18:23 +0530)]
CRM-19929: also add pre hook for delete
jitendrapurohit [Wed, 25 Jan 2017 10:56:01 +0000 (16:26 +0530)]
CRM-19930: Test toArray() function with param
Kurund Jalmi [Wed, 25 Jan 2017 10:28:00 +0000 (15:58 +0530)]
CRM-19929: added missing pre hooks for entity tags
jitendrapurohit [Wed, 25 Jan 2017 09:34:37 +0000 (15:04 +0530)]
CRM-19926: Include child groups when filtered with parent group
jitendrapurohit [Wed, 25 Jan 2017 09:18:21 +0000 (14:48 +0530)]
CRM-19927: Error message when 'Add to Group' is pressed with no group selected
jitendrapurohit [Wed, 25 Jan 2017 09:10:40 +0000 (14:40 +0530)]
CRM-19924: Unsubscribe from a mailing sent to a parent group silently fails
eileen [Wed, 25 Jan 2017 05:15:16 +0000 (18:15 +1300)]
CRM-19830 finish converting check_number to being standard (incl unique named rather than half & half)
eileen [Tue, 24 Jan 2017 02:01:36 +0000 (15:01 +1300)]
CRM-19830 declare address_id & contribution_recur_id, financial_type_id as exportable to reduce special handling
eileen [Tue, 24 Jan 2017 03:36:39 +0000 (16:36 +1300)]
CRM-19830 minor refactor on ORDER BY to facilitate further CRM-19815 fixed.
The larger part of this is simply the removal of an IF not obsolete due to the early return clause
Tim Otten [Wed, 25 Jan 2017 05:41:03 +0000 (21:41 -0800)]
Set version to 4.7.17
colemanw [Wed, 25 Jan 2017 01:58:36 +0000 (20:58 -0500)]
Merge pull request #9727 from eileenmcnaughton/BAO_Updates
CRM-19925 Bao updates
eileen [Wed, 25 Jan 2017 00:13:34 +0000 (13:13 +1300)]
CRM-19925 Updated DAO files
Eileen McNaughton [Wed, 25 Jan 2017 00:14:44 +0000 (13:14 +1300)]
Merge pull request #9722 from eileenmcnaughton/comments
Comment fixes plus fix inconsistent unused return bool
eileen [Tue, 24 Jan 2017 21:56:30 +0000 (10:56 +1300)]
CRM-19925 Add Entity data and date format data to fields array on DAO.
Per ticket this is intended to reduce in-code calculations by effectively
caching some commonly used data into the DAO. In many cases civicrm
compiles a large fields array & then twists itself up trying to distinguish the
fields from each other. This makes the entity info readily available.
Also moved to metadata is the format of core date fields.
Eileen McNaughton [Tue, 24 Jan 2017 22:54:38 +0000 (11:54 +1300)]
Merge pull request #9720 from eileenmcnaughton/new_tests
[nfc] Updated test generated examples
Eileen McNaughton [Tue, 24 Jan 2017 20:36:59 +0000 (09:36 +1300)]
Merge pull request #9721 from eileenmcnaughton/cont4
Remove unused var, comments & clean up & refactor caching function
colemanw [Tue, 24 Jan 2017 19:09:46 +0000 (14:09 -0500)]
Merge pull request #9705 from colemanw/CRM-19778
CRM-19778 - Case statuses per case type & caseType config ui improvements
Coleman Watts [Sun, 22 Jan 2017 02:52:20 +0000 (21:52 -0500)]
CRM-19723 - CaseType Config UI improvements: icons, popups, labels
When adding a new role or activity type, use a popup to allow more robust configuration.
Show activty type icons.
Show activity type labels instead of machine names.
Coleman Watts [Sat, 21 Jan 2017 04:06:55 +0000 (23:06 -0500)]
CRM-19778 - Limit statuses in 'change case status' activity
Coleman Watts [Sat, 21 Jan 2017 03:44:34 +0000 (22:44 -0500)]
Cleanup redundant caching
Coleman Watts [Sat, 21 Jan 2017 03:18:22 +0000 (22:18 -0500)]
CRM-19778 - Limit statuses in 'open case' activity
Coleman Watts [Sat, 21 Jan 2017 02:33:57 +0000 (21:33 -0500)]
Case form code cleanup
Coleman Watts [Fri, 20 Jan 2017 23:52:07 +0000 (18:52 -0500)]
CRM-19778 - Configuration ui for case statuses per case-type