Alice Frumin [Tue, 11 Jul 2017 21:29:39 +0000 (17:29 -0400)]
CRM-12167: Start Implementation of Visibility per Price Option
template updates
php updates
adding column to upgrader and xml
some improvements from comparing to current price field visibility id approach
Yashodha Chaku [Mon, 25 Sep 2017 13:24:47 +0000 (18:54 +0530)]
Merge pull request #10834 from jitendrapurohit/CRM-20999
CRM-20999 - Fix multiple auto_renew id on contribution live page
Eileen McNaughton [Mon, 25 Sep 2017 00:02:52 +0000 (13:02 +1300)]
Merge pull request #10996 from omarabuhussein/CRM-21195-Adding-icons-to-navigation-menu
CRM-21195: Adding the ability to add and show icons on top navigation menu items
Eileen McNaughton [Sun, 24 Sep 2017 21:35:33 +0000 (10:35 +1300)]
Merge pull request #11024 from jackrabbithanna/CRM-21220
spacing fix CRM-21220
Mark Hanna [Sun, 24 Sep 2017 18:46:55 +0000 (13:46 -0500)]
spacing fix CRM-21220
Eileen McNaughton [Sun, 24 Sep 2017 05:58:00 +0000 (18:58 +1300)]
Merge pull request #11023 from civicrm/4.7.25-rc
4.7.25 rc
Eileen McNaughton [Sun, 24 Sep 2017 00:33:57 +0000 (13:33 +1300)]
Merge pull request #10977 from jitendrapurohit/CRM-21160
CRM-21160 - Make event_type_id available in event message templates
Eileen McNaughton [Sat, 23 Sep 2017 23:14:15 +0000 (12:14 +1300)]
Merge pull request #11020 from mattwire/CRM-21216_getMembershipTypesByOrg_to_api
CRM-21216 Replace member_BAO_membershiptype_getMembershipTypesByOrg with API eq…
Eileen McNaughton [Sat, 23 Sep 2017 23:06:24 +0000 (12:06 +1300)]
Merge pull request #11003 from JMAConsulting/CRM-21199
CRM-21199, removed JS to hide invoice page setting
Eileen McNaughton [Sat, 23 Sep 2017 22:48:42 +0000 (11:48 +1300)]
Merge pull request #11013 from davejenx/CRM-16836
CRM-16836 - make Basic Search form group select respect ACLs
Eileen McNaughton [Sat, 23 Sep 2017 20:29:52 +0000 (09:29 +1300)]
Merge pull request #11008 from lcdservices/CRM-21205
CRM-21205 use proper currency in batch list
Matthew Wire [Fri, 22 Sep 2017 19:31:01 +0000 (20:31 +0100)]
Replace member_BAO_membershiptype_getMembershipTypesByOrg with API equivalent
Dave Jenkins [Thu, 21 Sep 2017 12:10:27 +0000 (13:10 +0100)]
CRM-16836 - make Basic Search form group select respect ACLs
Brian Shaughnessy [Wed, 20 Sep 2017 20:53:14 +0000 (16:53 -0400)]
CRM-21205 use proper currency in batch list
colemanw [Wed, 20 Sep 2017 20:05:15 +0000 (16:05 -0400)]
Merge pull request #10990 from seamuslee001/CRM-21006
CRM-21006 Ensure that Buttons are correctly displayed
Monish Deb [Wed, 20 Sep 2017 11:14:44 +0000 (16:44 +0530)]
Merge pull request #11002 from seanmadsen/CRM-21022
CRM-21022 - Parameterize variables in SQL query
Monish Deb [Wed, 20 Sep 2017 10:57:27 +0000 (16:27 +0530)]
Merge pull request #10993 from seamuslee001/CRM-21123
CRM-21123 Ensure that the selectedChild on message templates is one o…
Eileen McNaughton [Wed, 20 Sep 2017 09:16:34 +0000 (21:16 +1200)]
Merge pull request #10983 from JMAConsulting/CRM-21189
CRM-21189 - Add permission for Close and reopen Batch
Seamus Lee [Tue, 19 Sep 2017 03:23:29 +0000 (13:23 +1000)]
CRM-21123 Ensure that the selectedChild on message templates is one of allowed types
CRM-21123 Put the array into the if statement
deb.monish [Mon, 18 Sep 2017 11:44:53 +0000 (17:14 +0530)]
Add preUpgrade message
Pradeep Nayak [Thu, 3 Aug 2017 17:19:40 +0000 (22:49 +0530)]
CRM-21189, updated code to respect new permission on batches
----------------------------------------
* CRM-21189: Add permission for Close and reopen Batch
https://issues.civicrm.org/jira/browse/CRM-21189
Pradeep Nayak [Thu, 3 Aug 2017 17:09:11 +0000 (22:39 +0530)]
CRM-21189, added new permissions
----------------------------------------
* CRM-21189: Add permission for Close and reopen Batch
https://issues.civicrm.org/jira/browse/CRM-21189
colemanw [Wed, 20 Sep 2017 02:17:36 +0000 (22:17 -0400)]
Merge pull request #10994 from seamuslee001/CRM-20906
CRM-20906 Validate the extension key is of general standard
Yashodha Chaku [Wed, 20 Sep 2017 02:04:31 +0000 (07:34 +0530)]
CRM-21170 - Provide option to filter by contact id & external id (#10966)
* CRM-21170 - Provide option to filter by contact id & external id
Sean Madsen [Wed, 20 Sep 2017 00:07:02 +0000 (18:07 -0600)]
CRM-21006 - Escape all title and alt attributes
This commit opportunistically adds HTML output encoding to all Smarty
variables any time they appear within an HTML `title` or `alt`
attribute. Why? Because this helps us prevent XSS and is very very
unlikely to cause any unwanted side effects.
Code locations found by searching the `templates` directory for:
(title|alt)=(['"])((?!\2).)*\{\$((?!(\|(escape|crmDate))|\}).)+\}((?!\2).)*\2
Seamus Lee [Tue, 19 Sep 2017 00:28:46 +0000 (10:28 +1000)]
CRM-21006 Ensure that Buttons are correctly displayed
Eileen McNaughton [Wed, 20 Sep 2017 01:08:32 +0000 (13:08 +1200)]
Merge pull request #10989 from seamuslee001/CRM-21014
CRM-21014 Ensure that preimum name is EOU
Pradeep Nayak [Tue, 19 Sep 2017 22:52:56 +0000 (04:22 +0530)]
CRM-21199, removed JS to hide invoice page setting
----------------------------------------
* CRM-21199: Remove dependancy for 'Default invoice payment page'
https://issues.civicrm.org/jira/browse/CRM-21199
Seamus Lee [Tue, 19 Sep 2017 22:50:58 +0000 (08:50 +1000)]
CRM-21014 only modify the alt tags
Seamus Lee [Tue, 19 Sep 2017 22:45:33 +0000 (08:45 +1000)]
Move to using CRM_Utils_Rule and CRM_Utils_Type::validate as per Sean's comments
Seamus Lee [Tue, 19 Sep 2017 22:16:29 +0000 (08:16 +1000)]
CRM-20906 Add in unit test of Extenion check
Sean Madsen [Tue, 19 Sep 2017 21:54:09 +0000 (15:54 -0600)]
CRM-20906 - Fix regex for validating extension key
Seamus Lee [Tue, 19 Sep 2017 04:40:09 +0000 (14:40 +1000)]
CRM-20906 Validate the extension key is of general standard
Eileen McNaughton [Tue, 19 Sep 2017 22:35:06 +0000 (10:35 +1200)]
Merge pull request #10992 from seamuslee001/CRM-20907
CRM-20907 Ensure that contact_type is valid in deduperules
Eileen McNaughton [Tue, 19 Sep 2017 21:44:19 +0000 (09:44 +1200)]
Merge pull request #10974 from highfalutin/CRM-21174-upgrade-menu-module_data
CRM-21174: Do not try to write civicrm_menu.module_data if it doesn't exist yet
Sean Madsen [Tue, 19 Sep 2017 21:11:35 +0000 (15:11 -0600)]
CRM-21022 - Parameterize variables in SQL query
Monish Deb [Tue, 19 Sep 2017 20:43:40 +0000 (02:13 +0530)]
Merge pull request #11001 from seanmadsen/CRM-20895
CRM-20895 - Encode display of search criteria
Sean Madsen [Tue, 19 Sep 2017 20:26:02 +0000 (14:26 -0600)]
CRM-20895 - Encode display of search criteria
Omar abu hussein [Tue, 19 Sep 2017 13:39:53 +0000 (14:39 +0100)]
CRM-21195: Fixing the code style
Omar abu hussein [Tue, 19 Sep 2017 13:36:10 +0000 (14:36 +0100)]
CRM-21195: a little improvment
Monish Deb [Tue, 19 Sep 2017 13:17:53 +0000 (18:47 +0530)]
Merge pull request #10935 from eileenmcnaughton/dd
CRM-21134 fix enotices in payment processor code assignment.
Mathieu Lu [Tue, 19 Sep 2017 12:48:31 +0000 (08:48 -0400)]
Merge pull request #10997 from francescbassas/CRM-21196
CRM-21196 - Event Income Details and Income Count Summary report localization
Omar abu hussein [Tue, 19 Sep 2017 12:45:37 +0000 (13:45 +0100)]
CRM-21195: Using DAO instead of direct SQL when building navigation menu
Francesc Bassas i Bullich [Tue, 19 Sep 2017 11:08:39 +0000 (13:08 +0200)]
CRM-21196 - Event reports localization
Omar abu hussein [Tue, 19 Sep 2017 08:25:41 +0000 (09:25 +0100)]
CRM-21195: Adding the ability to add icons to menu items
Eileen McNaughton [Tue, 19 Sep 2017 08:07:30 +0000 (20:07 +1200)]
Merge pull request #10978 from jitendrapurohit/CRM-21117
CRM-21117: Line item not shown when paying later using membership priceset
Eileen McNaughton [Tue, 19 Sep 2017 08:01:12 +0000 (20:01 +1200)]
Merge pull request #10991 from seamuslee001/CRM-21011
CRM-21011 Sort out tag descriptions when displaying better
Monish Deb [Tue, 19 Sep 2017 06:22:38 +0000 (11:52 +0530)]
Merge pull request #10982 from eileenmcnaughton/trxn_currency
CRM-21187 Fix handling of currency when updating a contribution to be…
Seamus Lee [Tue, 19 Sep 2017 04:57:56 +0000 (14:57 +1000)]
CRM-20907 only throw Execption if contactType is set in the Ruquest
Yashodha Chaku [Tue, 19 Sep 2017 04:53:53 +0000 (10:23 +0530)]
Merge pull request #10857 from adixon/CRM-21063
CRM-21063 Add date to survey/details report
Seamus Lee [Tue, 19 Sep 2017 01:16:16 +0000 (11:16 +1000)]
CRM-20907 Ensure that contact_type is valid in deduperules
Seamus Lee [Tue, 19 Sep 2017 00:58:38 +0000 (10:58 +1000)]
CRM-21011 Sort out tag descriptions when displaying better
Seamus Lee [Tue, 19 Sep 2017 00:07:53 +0000 (10:07 +1000)]
CRM-21014 Ensure that preimum name is EOU
eileen [Fri, 1 Sep 2017 23:49:00 +0000 (11:49 +1200)]
CRM-21134 fix enotices in payment processor code assignment.
This is generally a code tidy up to push out the principles we have been implementing (ie.
the idea that the processors define their fields. The code can cause e-notices in extensions as is
because it is prescriptive about fields.
I removed the ANDing in the tpl because actually we are not looking to match numbers like 2
2 is the number we have hard-coded for direct debits (we should be using an option group but that
is another story
eileen [Thu, 14 Sep 2017 23:51:47 +0000 (11:51 +1200)]
CRM-21187 Fix handling of currency when updating a contribution to be completed.
This is replicable via the api & potentially other flows. The currency id
of NULL is not accepted in financialTrxn BAO without it replacing with a
default, which is not appropriate on an update.
colemanw [Sun, 17 Sep 2017 00:25:13 +0000 (20:25 -0400)]
Merge pull request #10984 from colemanw/CRM-21127
CRM-21127 - Fix return properties in api.Event.get
Eileen McNaughton [Fri, 15 Sep 2017 23:50:51 +0000 (11:50 +1200)]
Merge pull request #10981 from jitendrapurohit/CRM-21183
CRM-21183: Updating Partially paid contribution to Completed doesn't …
Eileen McNaughton [Fri, 15 Sep 2017 23:43:22 +0000 (11:43 +1200)]
Merge pull request #10985 from colemanw/CRM-21178
CRM-21178 - Make custom field of type Link clickable
Coleman Watts [Fri, 15 Sep 2017 14:31:53 +0000 (10:31 -0400)]
CRM-21178 - Make custom field of type Link clickable
Coleman Watts [Fri, 15 Sep 2017 13:41:05 +0000 (09:41 -0400)]
CRM-21127 - Fix return properties in api.Event.get
Monish Deb [Fri, 15 Sep 2017 13:18:30 +0000 (18:48 +0530)]
Merge pull request #10980 from eileenmcnaughton/qa
CRM-20750 follow up fix from QA
colemanw [Fri, 15 Sep 2017 13:05:45 +0000 (09:05 -0400)]
Merge pull request #10964 from yashodha/CRM-21169
CRM-21169 - Fix broken inline edit for profiles
colemanw [Fri, 15 Sep 2017 00:56:31 +0000 (20:56 -0400)]
Merge pull request #10979 from colemanw/CRM-21182
CRM-21182 - Activity API: Fetch case fields via the join syntax
Coleman Watts [Thu, 14 Sep 2017 21:47:26 +0000 (17:47 -0400)]
CRM-21182 - Add test for fetching case fields in activity.get
Jitendra Purohit [Thu, 14 Sep 2017 13:23:05 +0000 (18:53 +0530)]
Minor fixes
Jitendra Purohit [Thu, 14 Sep 2017 12:02:09 +0000 (17:32 +0530)]
CRM-21183: Updating Partially paid contribution to Completed doesn't update membership
Eileen McNaughton [Wed, 13 Sep 2017 22:10:05 +0000 (10:10 +1200)]
Merge pull request #10680 from JMAConsulting/CRM-20889
CRM-20889 : Toggle check_number field on backoffice form as payment form fields
Eileen McNaughton [Wed, 13 Sep 2017 21:54:28 +0000 (09:54 +1200)]
Merge pull request #10970 from JMAConsulting/CRM-20276
CRM-20276, fixed code to store correct value in financial item table …
eileen [Wed, 13 Sep 2017 21:25:09 +0000 (09:25 +1200)]
CRM-20750 follow up fix from QA
In pr #10920 @sunilpawar spotted this error
colemanw [Wed, 13 Sep 2017 19:28:37 +0000 (15:28 -0400)]
Merge pull request #10920 from eileenmcnaughton/pi
CRM-20750: Incorrect financial trxn entries when payment instrument i…
Coleman Watts [Wed, 13 Sep 2017 15:09:50 +0000 (11:09 -0400)]
CRM-21182 - Activity API: Fetch case fields via the join syntax
Jitendra Purohit [Wed, 13 Sep 2017 12:10:42 +0000 (17:40 +0530)]
add unit test
Jitendra Purohit [Tue, 29 Aug 2017 05:19:15 +0000 (10:49 +0530)]
CRM-21117: Enable useForMember for pending membership signup
Jitendra Purohit [Wed, 13 Sep 2017 10:14:41 +0000 (15:44 +0530)]
add unit test
Pradeep Nayak [Tue, 12 Sep 2017 08:43:41 +0000 (14:13 +0530)]
fixed jenkins style
Pradeep Nayak [Mon, 11 Sep 2017 12:58:07 +0000 (18:28 +0530)]
CRM-20276, fixed code to store correct value in financial item table for amount when contribution amount is changed
----------------------------------------
* CRM-20276: When editing a contribution the value in civicrm_financial_item_amount is not updated
https://issues.civicrm.org/jira/browse/CRM-20276
deb.monish [Wed, 13 Sep 2017 08:33:19 +0000 (14:03 +0530)]
fix payment type label
deb.monish [Thu, 31 Aug 2017 19:31:31 +0000 (01:01 +0530)]
additional fix to load selected payment instrument field on edit
deb.monish [Mon, 17 Jul 2017 12:09:12 +0000 (17:39 +0530)]
CRM-20889: Toggle check_number field on backoffice form as payment form fields
Pradeep Nayak [Thu, 13 Jul 2017 20:02:12 +0000 (01:32 +0530)]
CRM-20869, removed cruft code for check number
----------------------------------------
* CRM-20869: Remove cruft code for check number
https://issues.civicrm.org/jira/browse/CRM-20869
Eileen McNaughton [Wed, 13 Sep 2017 07:41:58 +0000 (19:41 +1200)]
Merge pull request #10976 from eileenmcnaughton/4.7.25-rc
4.7.25 rc
eileen [Wed, 13 Sep 2017 07:35:31 +0000 (19:35 +1200)]
Merge branch '4.7.25-rc' of https://github.com/civicrm/civicrm-core
Tim Otten [Tue, 12 Sep 2017 22:08:22 +0000 (15:08 -0700)]
Merge pull request #10975 from eileenmcnaughton/4.7.25-rc
CRM-21175 fix fatal error on multiple custom field import.
eileen [Tue, 12 Sep 2017 06:53:02 +0000 (18:53 +1200)]
CRM-21175 fix fatal error on multiple custom field import.
Additional test is tangental....
Monish Deb [Tue, 12 Sep 2017 16:56:02 +0000 (22:26 +0530)]
Merge pull request #10439 from jitendrapurohit/CRM-20657
CRM-20657: get all participant ids if multiple contacts register from…
Noah Miller [Tue, 12 Sep 2017 14:40:24 +0000 (07:40 -0700)]
Store menu item fields other than module_data
Noah Miller [Tue, 12 Sep 2017 03:29:53 +0000 (20:29 -0700)]
Do not try to write civicrm_menu.module_data if it doesn't exist yet
Eileen McNaughton [Tue, 12 Sep 2017 13:00:34 +0000 (01:00 +1200)]
Merge pull request #10838 from jmcclelland/CRM-16964
CRM-16964: ensure FILL works on import with custom fields.
Tim Otten [Mon, 11 Sep 2017 21:45:23 +0000 (14:45 -0700)]
Merge pull request #10952 from civicrm/michaelmcandrew-patch-1
Fixing type (missing function call) in example for hook_civicrm_alterAngular
Eileen McNaughton [Mon, 11 Sep 2017 21:41:01 +0000 (09:41 +1200)]
Merge pull request #10973 from civicrm/4.7.25-rc
4.7.25 rc
Tim Otten [Mon, 11 Sep 2017 21:35:39 +0000 (14:35 -0700)]
Merge pull request #10963 from eileenmcnaughton/cleanup
[NFC] comments clean up in test classes.
Eileen McNaughton [Mon, 11 Sep 2017 21:27:42 +0000 (09:27 +1200)]
Merge pull request #10972 from totten/4.7.25-rc-tpl
CRM-18231 - Cleanup `environment` example in `civicrm.settings.php.template`
Tim Otten [Mon, 11 Sep 2017 18:45:35 +0000 (11:45 -0700)]
CRM-18231 - civicrm.settings.php.template - Remove extra whitespace
Tim Otten [Mon, 11 Sep 2017 18:42:34 +0000 (11:42 -0700)]
CRM-18231 - civicrm.settings.php.template - Move `global` declaration
When using the example snippets in the settings file, it's easy to
accidentally leave `global $civicrm_setting` commented out -- which is
fairly confusing/mysterious way to have your settings ignored.
There's no cost to declaring `global $civicrm_setting` by default in new
config files.
Tim Otten [Mon, 11 Sep 2017 18:40:26 +0000 (11:40 -0700)]
CRM-18231 - civicrm.settings.php.template - Fix broken `environment` example
The expression `CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME` does not
work within `civicrm.settings.php` because the classloader has not been
initialized yet. This file is just supposed to store the data needed for
bootstrap.
Monish Deb [Mon, 11 Sep 2017 12:57:08 +0000 (18:27 +0530)]
Merge pull request #10922 from eileenmcnaughton/tpl
CRM-21125 allow class assignment on report row links
Monish Deb [Mon, 11 Sep 2017 12:40:27 +0000 (18:10 +0530)]
Merge pull request #10969 from yashodha/CRM-21172
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
yashodha [Mon, 11 Sep 2017 09:32:11 +0000 (15:02 +0530)]
CRM-21172 - Fix 'Edit Contact Information' link on contact dashboard
Michael McAndrew [Mon, 11 Sep 2017 09:27:30 +0000 (10:27 +0100)]
Update Hook.php
Eileen McNaughton [Mon, 11 Sep 2017 09:11:24 +0000 (21:11 +1200)]
Merge pull request #10968 from civicrm/4.7.25-rc
4.7.25 rc
projects / civicrm-core.git / log