Tim Otten [Tue, 16 May 2017 02:31:06 +0000 (19:31 -0700)]
CRM-20600 - Purify HTML - ang/crmMailingAB/EditCtrl/edit.html
Tim Otten [Tue, 16 May 2017 02:30:32 +0000 (19:30 -0700)]
CRM-20600 - Purify HTML - ang/crmMailing/EmailBodyCtrl/tokenAlert.html
Tim Otten [Tue, 16 May 2017 02:27:04 +0000 (19:27 -0700)]
CRM-20600 - Purify HTML - ang/crmMailing/EditMailingCtrl/{wizard,workflow}.html
Tim Otten [Tue, 16 May 2017 02:24:30 +0000 (19:24 -0700)]
CRM-20600 - Purify HTML - ang/crmMailing/EditMailingCtrl/unified{,2}.html
Tim Otten [Tue, 16 May 2017 02:18:51 +0000 (19:18 -0700)]
CRM-20600 - Purify HTML - ang/crmMailing/EditMailingCtrl/2step.html
Tim Otten [Tue, 16 May 2017 02:06:00 +0000 (21:06 -0500)]
CRM-20600 - Purify HTML - ang/crmCxn/PermTable.html, ang/crmMailing/BlockPreview.html
Tim Otten [Tue, 16 May 2017 02:02:25 +0000 (21:02 -0500)]
CRM-20600 - Purify HTML - ang/crmUi/tabset.html, ang/crmUi/wizard.html
Eileen McNaughton [Thu, 18 May 2017 04:14:42 +0000 (16:14 +1200)]
Merge pull request #10361 from jitendrapurohit/CRM-20578
CRM-20578: Empty update of Activity assignee/target results into DB e…
Eileen McNaughton [Wed, 17 May 2017 22:07:05 +0000 (10:07 +1200)]
Merge pull request #10373 from seamuslee001/CRM-20487
CRM-20487 have pingback url use https
Seamus Lee [Wed, 17 May 2017 22:04:32 +0000 (08:04 +1000)]
CRM-20487 have pingback url use https
Eileen McNaughton [Wed, 17 May 2017 21:21:57 +0000 (09:21 +1200)]
Merge pull request #10354 from eileenmcnaughton/custom_date
CRM-20564 custom date fields in on-behalf-of forms broken
colemanw [Wed, 17 May 2017 17:23:41 +0000 (12:23 -0500)]
Merge pull request #10358 from JMAConsulting/CRM-20575
CRM-20575, allow custom code to set created_id
Jitendra Purohit [Wed, 17 May 2017 10:39:35 +0000 (16:09 +0530)]
move contact id validation to wrapper
Eileen McNaughton [Wed, 17 May 2017 06:56:45 +0000 (18:56 +1200)]
Merge pull request #10363 from PalanteJon/CRM-20581
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access C…
CiviCRM [Tue, 16 May 2017 23:54:23 +0000 (23:54 +0000)]
Set version to 4.7.21
Eileen McNaughton [Tue, 16 May 2017 21:57:37 +0000 (09:57 +1200)]
Merge pull request #10272 from eileenmcnaughton/search_contacts
CRM-19643 Remove unused reference to 'selectedSearchContactIds
Eileen McNaughton [Tue, 16 May 2017 21:48:23 +0000 (09:48 +1200)]
Merge pull request #10284 from eileenmcnaughton/group_api
CRM-19246 acl test for group.get api
Jon goldberg [Tue, 16 May 2017 17:59:38 +0000 (13:59 -0400)]
style fix
Jon goldberg [Tue, 16 May 2017 16:59:05 +0000 (12:59 -0400)]
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not 'Administer CiviCRM'
Eileen McNaughton [Tue, 16 May 2017 05:20:36 +0000 (17:20 +1200)]
Merge pull request #10339 from jitendrapurohit/CRM-20558
CRM-20558: Fix groupby initialisation issue
Jitendra Purohit [Mon, 15 May 2017 13:54:08 +0000 (19:24 +0530)]
CRM-20578: Empty update of Activity assignee/target results into DB error
Monish Deb [Mon, 15 May 2017 10:58:41 +0000 (16:28 +0530)]
Merge pull request #10359 from JMAConsulting/CRM-20576
CRM-20576, changed length of civicrm_batch.title to 255
Eileen McNaughton [Mon, 15 May 2017 07:43:37 +0000 (19:43 +1200)]
Merge pull request #10356 from JMAConsulting/CRM-20573
CRM-20573, fixed notice error
Pradeep Nayak [Mon, 15 May 2017 01:10:01 +0000 (06:40 +0530)]
CRM-20575, allow custom code to set created_id
----------------------------------------
* CRM-20575: Allow user to set created_id field for batch
https://issues.civicrm.org/jira/browse/CRM-20575
CRM-20575, removed white space
----------------------------------------
* CRM-20575: Allow user to set created_id field for batch
https://issues.civicrm.org/jira/browse/CRM-20575
colemanw [Mon, 15 May 2017 04:11:11 +0000 (23:11 -0500)]
Merge pull request #10330 from colemanw/CRM-20540
CRM-20540 - Add widcard setting to entityRef fields
Pradeep Nayak [Mon, 15 May 2017 01:25:11 +0000 (06:55 +0530)]
CRM-20576, changed length of civicrm_batch.title to 255
----------------------------------------
* CRM-20576: Increase length of civicrm_batch.title
https://issues.civicrm.org/jira/browse/CRM-20576
Pradeep Nayak [Mon, 15 May 2017 00:59:42 +0000 (06:29 +0530)]
CRM-20573, fixed notice error
----------------------------------------
* CRM-20573: User deprecated function: Deprecated function on View Participabt form
https://issues.civicrm.org/jira/browse/CRM-20573
eileen [Sun, 14 May 2017 22:31:35 +0000 (10:31 +1200)]
CRM-20564 custom date fields in on-behalf-of forms broken
Eileen McNaughton [Sun, 14 May 2017 22:28:01 +0000 (10:28 +1200)]
Merge pull request #10353 from seamuslee001/CRM-20238-tests
CRM-20238 (NFC) Add in tests of the ProcessInbound function for SMS a…
Seamus Lee [Sun, 14 May 2017 21:31:43 +0000 (07:31 +1000)]
(NFC) CRM-20238 Add in tests of the ProcessInbound function for SMS and replace depricated getValue function with the getKey as recommended
Rename test functions and extend the NoTo test
Eileen McNaughton [Sun, 14 May 2017 21:37:03 +0000 (09:37 +1200)]
Merge pull request #10320 from eileenmcnaughton/dao
CRM-20541 force connection to be populated when overcome by caching
Eileen McNaughton [Sun, 14 May 2017 20:54:00 +0000 (08:54 +1200)]
Merge pull request #10350 from seanmadsen/CRM-20570
CRM-20570 Add unit test for disabling of PCP
Eileen McNaughton [Sun, 14 May 2017 20:44:01 +0000 (08:44 +1200)]
Merge pull request #10173 from jitendrapurohit/CRM-18177
CRM-18177 - Do not update existing membership status if renewal payme…
Jitendra Purohit [Sun, 14 May 2017 06:49:15 +0000 (12:19 +0530)]
minor fixes
Jitendra Purohit [Mon, 17 Apr 2017 14:00:37 +0000 (19:30 +0530)]
CRM-18177 - Do not update existing membership status if renewal payment is failed
Sean Madsen [Sat, 13 May 2017 18:42:57 +0000 (13:42 -0500)]
CRM-20570 Add unit test for disabling of PCP
colemanw [Sat, 13 May 2017 14:19:55 +0000 (09:19 -0500)]
Merge pull request #10349 from kcristiano/15067
CRM-15067 use email addresses in profile if present Rebase PR#10079
Kevin Cristiano [Sat, 13 May 2017 13:15:22 +0000 (08:15 -0500)]
CRM-15067 fix formatting issues
----------------------------------------
* CRM-15067: Email should appear in the profile in which it is included, rather than always at the top of contribution page
https://issues.civicrm.org/jira/browse/CRM-15067
Kevin Cristiano [Sat, 13 May 2017 12:58:52 +0000 (07:58 -0500)]
CRM-15067 use email addresses in profile if present Rebase PR#10079
----------------------------------------
* CRM-15067: Email should appear in the profile in which it is included, rather than always at the top of contribution page
https://issues.civicrm.org/jira/browse/CRM-15067
Eileen McNaughton [Fri, 12 May 2017 20:57:44 +0000 (08:57 +1200)]
Merge pull request #10342 from highfalutin/patch-1
Add me to contributor-key.yml
Eileen McNaughton [Fri, 12 May 2017 20:56:56 +0000 (08:56 +1200)]
Merge pull request #10345 from kngs/patch-1
Add Karen Stevenson to contributor-key.yml
Eileen McNaughton [Fri, 12 May 2017 20:52:41 +0000 (08:52 +1200)]
Merge pull request #10343 from JMAConsulting/CRM-20566
CRM-20566: Fatal error on submit of 'Edit Contribution'
kngs [Fri, 12 May 2017 20:01:47 +0000 (16:01 -0400)]
Add Karen Stevenson to contributor-key.yml
deb.monish [Fri, 12 May 2017 18:44:56 +0000 (00:14 +0530)]
CRM-20566: Fatal error on submit of 'Edit Contribution'
highfalutin [Fri, 12 May 2017 18:41:24 +0000 (13:41 -0500)]
Update contributor-key.yml
Monish Deb [Fri, 12 May 2017 18:27:42 +0000 (23:57 +0530)]
Merge pull request #10204 from JMAConsulting/CRM-20037
CRM-20555: Incorrect balance amount is shown on participant view page if 'Deferred Revenue' is enabled
colemanw [Fri, 12 May 2017 16:30:03 +0000 (11:30 -0500)]
Merge pull request #10332 from yashodha/CRM-20552
CRM-20552 - Task for 'Add Relationship - to individual' is missing
colemanw [Fri, 12 May 2017 16:10:26 +0000 (11:10 -0500)]
Merge pull request #10336 from highfalutin/CRM-20418-htmltokens
CRM 20418: Make token insertion work correctly when wysiwig is not loaded on Message Template edit
Jitendra Purohit [Fri, 12 May 2017 11:22:54 +0000 (16:52 +0530)]
Fix groupby initialisation issue
Eileen McNaughton [Fri, 12 May 2017 04:24:57 +0000 (16:24 +1200)]
Merge pull request #7499 from seamuslee001/CRM-17754
CRM-17754 Include resent headers to ensure that SPF and probably DMAR…
Eileen McNaughton [Fri, 12 May 2017 01:41:14 +0000 (13:41 +1200)]
Merge pull request #10335 from jitendrapurohit/CRM-20508
CRM-20508: test fix for non-ascii chars in custom field
Eileen McNaughton [Thu, 11 May 2017 22:19:50 +0000 (10:19 +1200)]
Merge pull request #10338 from JMAConsulting/CRM-20560
CRM-20560, fixed join so that its pointed to correct financial type
Eileen McNaughton [Thu, 11 May 2017 22:19:21 +0000 (10:19 +1200)]
Merge pull request #10328 from arthuralmeidap/CRM-20508-fix-custom-field-label-non-ascii
CRM-20508 - Civicrm_Core - create field with non-ascii chars only
colemanw [Thu, 11 May 2017 21:25:43 +0000 (16:25 -0500)]
Combine jQuery selectors
colemanw [Thu, 11 May 2017 21:19:55 +0000 (16:19 -0500)]
Merge pull request #9864 from PalanteJon/CRM-19977
CRM-19977 - Update all fields manipulated by geocoding hook during Ba…
Pradeep Nayak [Thu, 11 May 2017 21:13:13 +0000 (02:43 +0530)]
CRM-20560, fixed join so that its pointed to correct financial type
----------------------------------------
* CRM-20560: Deferred Revenue report bug
https://issues.civicrm.org/jira/browse/CRM-20560
Arthur Almeida [Thu, 11 May 2017 21:03:24 +0000 (18:03 -0300)]
fixed coding standards
Eileen McNaughton [Thu, 11 May 2017 20:53:29 +0000 (08:53 +1200)]
Merge pull request #10337 from JMAConsulting/CRM-20559
CRM-20559, revenue recognition date should be set for event greater t…
Eileen McNaughton [Thu, 11 May 2017 20:50:47 +0000 (08:50 +1200)]
Merge pull request #10324 from jitendrapurohit/CRM-20546
CRM-20546: Multiple issues with creation of membership activities
Eileen McNaughton [Thu, 11 May 2017 20:46:16 +0000 (08:46 +1200)]
Merge pull request #10314 from eileenmcnaughton/nfc
NFC remove some unused variables.
Eileen McNaughton [Thu, 11 May 2017 20:39:45 +0000 (08:39 +1200)]
Merge pull request #10334 from JMAConsulting/CRM-20037-2
CRM-20037: minor fix
Pradeep Nayak [Thu, 11 May 2017 20:07:22 +0000 (01:37 +0530)]
CRM-20559, revenue recognition date should be set for event greater than current month
----------------------------------------
* CRM-20559: Revenue account is Deferred revenue rather than Revenue.
https://issues.civicrm.org/jira/browse/CRM-20559
Tim Otten [Thu, 11 May 2017 19:00:17 +0000 (14:00 -0500)]
Merge pull request #10197 from GinkgoFJG/CRM-20458
CRM-20458: Added civi.dao.preDelete event and event class.
Arthur Almeida [Thu, 11 May 2017 17:34:22 +0000 (14:34 -0300)]
removed debug statement
Noah Miller [Thu, 11 May 2017 16:42:43 +0000 (11:42 -0500)]
CRM-20418: Make token insertion work correctly when wysiwig is not loaded on Message Template edit
Jitendra Purohit [Wed, 12 Apr 2017 09:53:07 +0000 (15:23 +0530)]
CRM-20418 - Not able to select Tokens from dropdown on Message Template
Arthur Almeida [Thu, 11 May 2017 14:53:55 +0000 (11:53 -0300)]
CRM-20508 - fixed creating custom fields when all chars are non-ascii on Label field
Jitendra Purohit [Thu, 11 May 2017 13:40:17 +0000 (19:10 +0530)]
CRM-20508: test fix for non-ascii chars in custom field
deb.monish [Thu, 11 May 2017 12:41:20 +0000 (18:11 +0530)]
CRM-20037: minor fix
Eileen McNaughton [Thu, 11 May 2017 04:25:21 +0000 (16:25 +1200)]
Merge pull request #10319 from eileenmcnaughton/report
CRM-20539 Do not heed dao default for field when setting defaults on report
yashodha [Thu, 11 May 2017 04:11:30 +0000 (09:41 +0530)]
CRM-20552 - Task for 'Add Relationship - to individual' is missing
Eileen McNaughton [Thu, 11 May 2017 03:00:12 +0000 (15:00 +1200)]
Merge pull request #10325 from lcdservices/CRM-20549
CRM-20549 no limit on event permission check api call
colemanw [Wed, 10 May 2017 23:55:26 +0000 (19:55 -0400)]
Merge pull request #10331 from colemanw/CRM-20419
CRM-20419 - Fix javascript error
colemanw [Wed, 10 May 2017 23:13:25 +0000 (19:13 -0400)]
Merge pull request #10326 from jmcclelland/CRM-20550
CRM-20550 - ensure all programatically added menus appear.
colemanw [Wed, 10 May 2017 23:08:14 +0000 (19:08 -0400)]
Merge pull request #10297 from francescbassas/patch-10
CRM-20518 Default participant status not set when status name not mat…
Coleman Watts [Wed, 10 May 2017 23:04:00 +0000 (18:04 -0500)]
CRM-20419 - Fix javascript error
Coleman Watts [Wed, 10 May 2017 20:35:25 +0000 (15:35 -0500)]
CRM-20540 - Add widcard setting to entityRef fields
colemanw [Wed, 10 May 2017 19:48:50 +0000 (15:48 -0400)]
Merge pull request #10302 from kryptothesuperdog/CRM-20517
CRM-20517 - fix profile contact_sub_type issue
colemanw [Wed, 10 May 2017 16:53:37 +0000 (12:53 -0400)]
Merge pull request #10159 from colemanw/CRM-20425
CRM-20425 - Configure inbound email activity status
colemanw [Wed, 10 May 2017 16:35:31 +0000 (12:35 -0400)]
Merge pull request #10276 from jitendrapurohit/CRM-20494
CRM-20494 - skip use of cache while fetching contacts with external i…
Brian Shaughnessy [Wed, 10 May 2017 16:30:26 +0000 (12:30 -0400)]
CRM-20549 also remove limit in getLocationEvents
Brian Shaughnessy [Wed, 10 May 2017 15:04:37 +0000 (11:04 -0400)]
CRM-20549 no limit on event permission check api call
Jamie McClelland [Wed, 10 May 2017 15:03:22 +0000 (11:03 -0400)]
CRM-20550 - ensure all programatically added menus appear.
Jitendra Purohit [Wed, 10 May 2017 10:55:46 +0000 (16:25 +0530)]
Additional fixes related to creation of activities on membership signup/renewal
Monish Deb [Fri, 3 Feb 2017 05:54:23 +0000 (11:24 +0530)]
minor fixes
Monish Deb [Tue, 13 Dec 2016 12:26:22 +0000 (17:56 +0530)]
unit test fix
Monish Deb [Mon, 12 Dec 2016 18:28:39 +0000 (23:58 +0530)]
additional improvement
Monish Deb [Thu, 1 Dec 2016 14:59:43 +0000 (20:29 +0530)]
optimization - move addActivity call from Membership's create to add …
Monish Deb [Tue, 29 Nov 2016 12:33:47 +0000 (18:03 +0530)]
CRM-19678: Create membership signup activity instead of Membership Renewal on Pay later
Eileen McNaughton [Tue, 9 May 2017 23:27:02 +0000 (11:27 +1200)]
Merge pull request #10301 from JMAConsulting/CRM-20510
CRM-20510: Petition signature doesn't show as an activity type for scheduled reminder
Eileen McNaughton [Tue, 9 May 2017 23:07:08 +0000 (11:07 +1200)]
Merge pull request #10322 from seamuslee001/CRM-20432
CRM-20532 Fix issue where cannot get information on a single extensio…
Seamus Lee [Tue, 9 May 2017 21:54:29 +0000 (07:54 +1000)]
Add test of retriving multiple extensions and fix test for Jenkins
Eileen McNaughton [Tue, 9 May 2017 21:38:57 +0000 (09:38 +1200)]
Merge pull request #10321 from eileenmcnaughton/token
CRM-19876 add test to try to replicate token issue
Seamus Lee [Tue, 9 May 2017 10:13:20 +0000 (20:13 +1000)]
Updates following review by Eileen including using get_options_from_params and adding an isset test to the ['key']
Eileen McNaughton [Tue, 9 May 2017 19:52:28 +0000 (07:52 +1200)]
Merge pull request #10260 from eileenmcnaughton/cont_soft
CRM-20036, CRM-20018 Don't retrieve all soft contributions if not needed.
Seamus Lee [Tue, 9 May 2017 09:58:59 +0000 (19:58 +1000)]
CRM-20532 Fix issue where cannot get information on a single extension with extension.get api and ensure that Fields specified in return key are supported
eileen [Tue, 9 May 2017 09:40:42 +0000 (21:40 +1200)]
Towards testing CRM-19876
This is a commit to establish a testing path for the EmailCommon form. Nothing other than the absence of fatals
is currently tested
eileen [Tue, 9 May 2017 08:52:04 +0000 (20:52 +1200)]
Minor readability adjustments
eileen [Tue, 9 May 2017 08:21:23 +0000 (20:21 +1200)]
CRM-19876 add test to try to replicate token issue
eileen [Tue, 9 May 2017 05:45:43 +0000 (17:45 +1200)]
CRM-20541 force connection to be populated when overcome by caching
projects / civicrm-core.git / log