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
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
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.
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 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
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.
colemanw [Fri, 13 Jan 2017 02:55:09 +0000 (21:55 -0500)]
Merge pull request #9673 from seamuslee001/CRM-19831
CRM-19831 Fix the loading of child groups
Seamus Lee [Thu, 12 Jan 2017 20:37:40 +0000 (07:37 +1100)]
CRM-19831 Fix the loading of child groups
colemanw [Thu, 12 Jan 2017 20:11:03 +0000 (15:11 -0500)]
Merge pull request #8916 from cividesk/CRM-19256-4.7
CRM-19256: Add permission hook
Coleman Watts [Thu, 12 Jan 2017 16:24:55 +0000 (11:24 -0500)]
CRM-17663 repair null dashlet names
See http://civicrm.stackexchange.com/questions/16644
deb.monish [Thu, 12 Jan 2017 14:29:17 +0000 (19:59 +0530)]
alternative way to handle custom field token
Chris Burgess [Tue, 10 Jan 2017 07:30:35 +0000 (13:00 +0530)]
add unit test
Chris Burgess [Tue, 10 Jan 2017 03:58:35 +0000 (09:28 +0530)]
fix for greeting token
deb.monish [Tue, 3 Jan 2017 12:39:45 +0000 (18:09 +0530)]
CRM-18141: Scheduled reminders for activities not rendering custom field tokens
jitendrapurohit [Thu, 12 Jan 2017 09:51:23 +0000 (15:21 +0530)]
CRM-19172: Fix onbehalf contact id on membership signup
Yashodha Chaku [Thu, 12 Jan 2017 06:07:40 +0000 (11:37 +0530)]
Merge pull request #9667 from mlutfy/master-crm19860
CRM-19860: Event participant batch update: respect "options per line" setting for radio buttons
colemanw [Thu, 12 Jan 2017 03:37:33 +0000 (22:37 -0500)]
Merge pull request #9633 from jaapjansma/CRM-19831
Fixed CRM-19831
colemanw [Wed, 11 Jan 2017 22:41:04 +0000 (17:41 -0500)]
CRM-19827 Avoid unnecessary core_resources processing during ajax calls (#9623)
* CRM-19827 Avoid unnecessary core_resources processing during ajax calls
* CRM-19827 - Add unit test for isAjaxMode
* CRM-19827 - Test fix
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
Mathieu Lutfy [Wed, 11 Jan 2017 21:29:26 +0000 (16:29 -0500)]
CRM-19860: Event participant batch update: respect "options per line" setting for radio buttons
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_…
projects / civicrm-core.git / log