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
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…
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
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
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
eileen [Tue, 24 Jan 2017 09:59:48 +0000 (22:59 +1300)]
Comment fixes plus fix inconsistent unused return bool
eileen [Tue, 24 Jan 2017 01:08:27 +0000 (14:08 +1300)]
Towards CRM-19815 refactor cached clause to use Civi:Statics
eileen [Tue, 24 Jan 2017 00:25:12 +0000 (13:25 +1300)]
Towards CRM-19815 Comment fixes & test tidy-up
eileen [Tue, 24 Jan 2017 02:15:29 +0000 (15:15 +1300)]
Remove unused var
eileen [Tue, 24 Jan 2017 08:16:04 +0000 (21:16 +1300)]
Update test examples.
This is not an exhaustive update. It covers a good chunk of the common changes but a lot of copy & paste means the examples are being overwritten by other tests. I have removed some of that
Eileen McNaughton [Tue, 24 Jan 2017 06:50:25 +0000 (19:50 +1300)]
Merge pull request #9678 from GinkgoFJG/CRM-19877-joomla-setting-create
CRM-19877: Blacklisted params extraneously passed by Joomla to the settings API.
Kurund Jalmi [Tue, 24 Jan 2017 06:20:57 +0000 (11:50 +0530)]
Merge pull request #9708 from litespeedmarc/CRM-19906
CRM-19906 - allow @ on drupal users
Kurund Jalmi [Tue, 24 Jan 2017 06:20:21 +0000 (11:50 +0530)]
Merge pull request #9713 from jitendrapurohit/CRM-19895
CRM-19895: membership renewal page style collapsed if email disabled
colemanw [Tue, 24 Jan 2017 00:35:20 +0000 (19:35 -0500)]
Merge pull request #9703 from colemanw/CRM-19897
CRM-19897 - Remove reference to nonexistant permission
colemanw [Tue, 24 Jan 2017 00:33:03 +0000 (19:33 -0500)]
Merge pull request #9714 from colemanw/CRM-19829
CRM-19829 - Attachment API: return icons
Eileen McNaughton [Tue, 24 Jan 2017 00:25:43 +0000 (13:25 +1300)]
Merge pull request #9717 from eileenmcnaughton/comments
[nfc] Comment fixes, remove one unused var, declare visibility
eileen [Mon, 23 Jan 2017 23:39:51 +0000 (12:39 +1300)]
Comment fixes
eileen [Mon, 23 Jan 2017 23:39:10 +0000 (12:39 +1300)]
Fix visibility on legacy functions
eileen [Mon, 23 Jan 2017 23:38:46 +0000 (12:38 +1300)]
Remove unused variable
Eileen McNaughton [Mon, 23 Jan 2017 23:23:29 +0000 (12:23 +1300)]
Merge pull request #9716 from eileenmcnaughton/nfc-cont
[NFC] add comments & extract function in contribution search
Coleman Watts [Mon, 23 Jan 2017 22:46:31 +0000 (17:46 -0500)]
CRM-19829 - Move icon classes to data file
Coleman Watts [Mon, 23 Jan 2017 15:56:46 +0000 (10:56 -0500)]
CRM-19829 - Attachment API: return icons
eileen [Tue, 10 Jan 2017 03:23:04 +0000 (16:23 +1300)]
Comment fixes
eileen [Sun, 8 Jan 2017 20:35:43 +0000 (09:35 +1300)]
CRM-19815 tidy test & lock in return of financial_type
eileen [Wed, 4 Jan 2017 05:17:54 +0000 (18:17 +1300)]
CRM-19830 add test to lock in test contract
eileen [Wed, 4 Jan 2017 02:46:49 +0000 (15:46 +1300)]
CRM-19815 extract soft credit fields for readability
jitendrapurohit [Mon, 23 Jan 2017 09:43:42 +0000 (15:13 +0530)]
CRM-19895: membership renewal page style collapsed if email disabled
Kurund Jalmi [Mon, 23 Jan 2017 06:52:36 +0000 (12:22 +0530)]
Merge pull request #9699 from jitendrapurohit/CRM-19003
CRM-19003: Profile listing doesn't produce expected results when rang…
Kurund Jalmi [Mon, 23 Jan 2017 06:09:05 +0000 (11:39 +0530)]
Merge pull request #9579 from omarabuhussein/CRM-19801-fix-relationship-saving
CRM-19801: Fixing changing a relationship type from A to B or vice versa
Kurund Jalmi [Mon, 23 Jan 2017 06:08:24 +0000 (11:38 +0530)]
Merge pull request #9709 from seamuslee001/CRM-19907
CRM-19907 Fix error where show events setting is NULL
colemanw [Mon, 23 Jan 2017 03:27:33 +0000 (22:27 -0500)]
Merge pull request #9707 from colemanw/CRM-19723
CRM-19723 iconPicker style tweak
Seamus Lee [Mon, 23 Jan 2017 02:34:56 +0000 (02:34 +0000)]
CRM-19907 Fix error where show events setting is NULL
litespeedmarc [Mon, 23 Jan 2017 02:01:07 +0000 (21:01 -0500)]
CRM-19906 - allow @ on drupal users
Coleman Watts [Mon, 23 Jan 2017 01:25:16 +0000 (20:25 -0500)]
CRM-19723 iconPicker style tweak
colemanw [Mon, 23 Jan 2017 00:58:03 +0000 (19:58 -0500)]
Merge pull request #9706 from colemanw/iconPicker
iconPicker style improvements
Coleman Watts [Sun, 22 Jan 2017 21:45:45 +0000 (16:45 -0500)]
iconPicker style improvements
Seamus Lee [Sat, 21 Jan 2017 22:39:04 +0000 (09:39 +1100)]
CRM-19871 CRM-19898 Fix issue where changing weight of a membership type changes the default membership type for contribution pages
Kurund Jalmi [Sat, 21 Jan 2017 17:13:13 +0000 (22:43 +0530)]
Merge pull request #9698 from jitendrapurohit/CRM-19842
CRM-19842-Can't delete a dedupe rule
Kurund Jalmi [Sat, 21 Jan 2017 17:07:54 +0000 (22:37 +0530)]
Merge pull request #9695 from jitendrapurohit/CRM-19875
CRM-19875: Search builder: Fatal error when searching custom field of…
Kurund Jalmi [Sat, 21 Jan 2017 17:07:18 +0000 (22:37 +0530)]
Merge pull request #9697 from jitendrapurohit/CRM-19794
CRM-19794: Wrong fields displayed when setting a price set for a cont…
Kurund Jalmi [Sat, 21 Jan 2017 17:05:52 +0000 (22:35 +0530)]
Merge pull request #9700 from jitendrapurohit/tagfix
typo fix in New Tag Form.
Coleman Watts [Sat, 21 Jan 2017 04:33:20 +0000 (23:33 -0500)]
CRM-19897 - Remove reference to nonexistant permission
Tim Otten [Fri, 20 Jan 2017 06:39:57 +0000 (22:39 -0800)]
Merge pull request #9701 from fuzionnz/docfix-case_mgmt_setup_url
Docs fix: update for changed URL of Case Management > Setup page.
Chris Burgess [Fri, 20 Jan 2017 04:49:09 +0000 (17:49 +1300)]
Docs fix: update for changed URL of Case Management > Setup page.
jitendrapurohit [Thu, 19 Jan 2017 13:18:03 +0000 (18:48 +0530)]
typo fix in Manage Tag page
jitendrapurohit [Thu, 19 Jan 2017 11:58:02 +0000 (17:28 +0530)]
CRM-19003: Profile listing doesn't produce expected results when range-searching custom date field
omar abu hussein [Thu, 19 Jan 2017 12:21:52 +0000 (12:21 +0000)]
CRM-19801: Fix inablitiy of changing (current employer) checkbox of relationship
jitendrapurohit [Thu, 19 Jan 2017 10:43:10 +0000 (16:13 +0530)]
CRM-19842-Can't delete a dedupe rule
jitendrapurohit [Thu, 19 Jan 2017 10:35:34 +0000 (16:05 +0530)]
CRM-19794: Wrong fields displayed when setting a price set for a contribution page
colemanw [Thu, 19 Jan 2017 03:32:29 +0000 (22:32 -0500)]
Merge pull request #9696 from colemanw/CRM-19893
CRM-19893 - Tweak optionValue template to show grouping field if present
Coleman Watts [Thu, 19 Jan 2017 03:30:45 +0000 (22:30 -0500)]
CRM-19893 - Tweak optionValue template to show grouping field if present
jitendrapurohit [Wed, 18 Jan 2017 11:53:33 +0000 (17:23 +0530)]
CRM-19875: Search builder: Fatal error when searching custom field of type country
colemanw [Wed, 18 Jan 2017 03:56:11 +0000 (22:56 -0500)]
Merge pull request #9693 from totten/master-browser-cache
CRM_Extension_Browser - Allow different cache files for different feeds
colemanw [Wed, 18 Jan 2017 03:44:28 +0000 (22:44 -0500)]
Merge pull request #9689 from totten/master-tmpl
CRM-19690 - Task_AdhocMailing - Use highest-priority template type
colemanw [Wed, 18 Jan 2017 02:16:10 +0000 (21:16 -0500)]
Merge pull request #9691 from jmcclelland/CRM-19890
CRM-19890 - ensure we are only listing the active case manager
Tim Otten [Tue, 17 Jan 2017 22:30:27 +0000 (14:30 -0800)]
CRM_Extension_Browser - Allow different cache files for different feeds
The motivation here is to support these two different CLI commands:
```
cv dl myextension
cv dl myextension --dev
```
The two commands differ in that they pull from different feeds -- e.g. the
stable feed `https://civicrm.org/extdir/ver={ver}|cms={uf}` vs the
developmental feed `https://civicrm.org/extdir/ver={ver}|cms={uf}|status=`.
However, this creates the real possibility that the user might go back/forth
among different feeds (omitting/enabling the `--dev` option per whim).
Jamie McClelland [Tue, 17 Jan 2017 22:01:53 +0000 (17:01 -0500)]
CRM-19890 - ensure we are only listing the active case manager
Yashodha Chaku [Tue, 17 Jan 2017 10:27:34 +0000 (15:57 +0530)]
Merge pull request #9687 from yashodha/CRM-19883
CRM-19883 - Activity Priority Field is Not Included in Advanced Searc…
Tim Otten [Tue, 17 Jan 2017 09:41:39 +0000 (01:41 -0800)]
CRM-19690 - Task_AdhocMailing - Use highest-priority template type
If you perform a contact search and create a new mailing, it would use
`template_type=traditional`, even if another template type had greater
priority. With this patch, it respects the priority.
Note: I considered changing the default in Mailing.create API to always
match most-preferred template-type. However, that would break some existing
API consumers (e.g. headless consumers or ones who define their own UI).
For external API-based integrations, we should preserve the default
semantics of `body_text`/`body_html` by defaulting to
`template_type=traditional`.
The preference in CRM-19690 is that any use-case based on the screen
`civicrm/a/#/mailing/{id}` should have its default determined by weight.
yashodha [Tue, 17 Jan 2017 07:08:44 +0000 (12:38 +0530)]
minor fix
yashodha [Mon, 16 Jan 2017 09:25:54 +0000 (14:55 +0530)]
CRM-19883 - Activity Priority Field is Not Included in Advanced Search or Activity Reports
Yashodha Chaku [Tue, 17 Jan 2017 03:45:51 +0000 (09:15 +0530)]
Merge pull request #9661 from monishdeb/CRM-18141
CRM-8526, CRM-19786, CRM-18141, CRM-19757 : Fix Schedule Reminder tokens
colemanw [Mon, 16 Jan 2017 19:13:11 +0000 (14:13 -0500)]
Merge pull request #9672 from colemanw/CRM-17663
CRM-17663 repair null dashlet names
Yashodha Chaku [Mon, 16 Jan 2017 09:28:26 +0000 (14:58 +0530)]
Merge pull request #9681 from jitendrapurohit/CRM-19884
CRM-19884: DB Error on Activity Details Report
Yashodha Chaku [Mon, 16 Jan 2017 09:16:51 +0000 (14:46 +0530)]
Merge pull request #9669 from jitendrapurohit/CRM-19172
CRM-19172: Fix onbehalf contact id on membership signup
jitendrapurohit [Mon, 16 Jan 2017 06:06:03 +0000 (11:36 +0530)]
CRM-19884: DB Error on Activity Details Report
colemanw [Fri, 13 Jan 2017 23:39:10 +0000 (18:39 -0500)]
Merge pull request #9675 from agileware/CRM-19874
CRM-19874: Allow overriding sort in the getlist API without clobbering pager
Frank J. Gómez [Fri, 13 Jan 2017 23:04:24 +0000 (18:04 -0500)]
CRM-19877: Blacklisted params extraneously passed by Joomla to the settings API.
deb.monish [Fri, 13 Jan 2017 14:00:22 +0000 (19:30 +0530)]
extended unit test to asset contact custom field token
Yashodha Chaku [Fri, 13 Jan 2017 12:38:39 +0000 (18:08 +0530)]
Merge pull request #9677 from yashodha/CRM-19863
CRM-19863 - 'item_name' unnecessarily truncated when passed to PayPal
deb.monish [Fri, 13 Jan 2017 12:18:50 +0000 (17:48 +0530)]
greeeting token and handle multi-value custom field fixes
yashodha [Fri, 13 Jan 2017 10:59:22 +0000 (16:29 +0530)]
CRM-19863 - 'item_name' unnecessarily truncated when passed to PayPal
Francis Whittle [Fri, 13 Jan 2017 06:41:38 +0000 (17:41 +1100)]
CRM-19874: Allow overriding sort in the getlist API without clobbering pager
----------------------------------------
* CRM-19874: Allow overriding sort in the getlist API without clobbering pager
https://issues.civicrm.org/jira/browse/CRM-19874
Logan Bear [Fri, 13 Jan 2017 02:55:50 +0000 (21:55 -0500)]
CRM-19707 CiviContribute Assigns Payment Processor ID correctly (#9481)
* CRM-19707 CiviContribute Assigns Payment Processor ID correctly
Original code used Payment Processor Type ID for PayPal. New code
looks up actual Payment Processor ID, instead.
* Corrected coding standards
Removed white space
* Revert "Corrected coding standards"
This reverts commit
6f8109650736ccb20ee08328f208c3852742b71e.
* Revert "CRM-19707 CiviContribute Assigns Payment Processor ID correctly"
This reverts commit
597e639e632ae793c422a2f5ce6c41e44c70b29e.
* CRM-19707
Created function to get Payment Processing ID and called it in the two
locations needed
* Corrected Coding Standards
I’m still learning
* Corrected function call
Misnamed Processor as Processing
* Forgot this
It’s been a while, Forgot the this-> to call the proper function.
* Still trying removed this
Attempting to get through the errors
* self, not this
Still learning OO PHP. This should finally fix it.