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
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
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 03:26:22 +0000 (15:26 +1200)]
Minor extraction for code legibility
eileen [Tue, 9 May 2017 03:12:35 +0000 (15:12 +1200)]
CRM-20539 Do not heed dao default for field when setting defaults on reports
colemanw [Tue, 9 May 2017 00:08:24 +0000 (20:08 -0400)]
Merge pull request #10318 from seamuslee001/CRM-20537
CRM-20537 Make the case_id, contact_id index on civicrm_case_contact …
Seamus Lee [Mon, 8 May 2017 21:42:34 +0000 (07:42 +1000)]
CRM-20537 Make the case_id, contact_id index on civicrm_case_contact unique following check with Coleman
Eileen McNaughton [Mon, 8 May 2017 20:25:05 +0000 (08:25 +1200)]
Merge pull request #10317 from jitendrapurohit/CRM-15984
Fix CRM-15984: "Add campaign field on Email activity form"
Jitendra Purohit [Mon, 8 May 2017 11:54:04 +0000 (17:24 +0530)]
minor fix
Allen Shaw [Wed, 25 Jan 2017 18:13:27 +0000 (12:13 -0600)]
Fix CRM-15984: "Add campaign field on Email activity form"
eileen [Sun, 7 May 2017 03:09:56 +0000 (15:09 +1200)]
NFC remove some unused variables.
The is never used and without it the others are not required either.
This is probably copy & paste from other functions that has not been made to work,
but I don't think leaving non-functional code there is a good step towards
identifying & fixing whatever problem exists
Eileen McNaughton [Sat, 6 May 2017 20:32:12 +0000 (08:32 +1200)]
Merge pull request #10313 from JMAConsulting/CRM-20530
CRM-20530: bookkeeping report at fails at credit card name filter
deb.monish [Sat, 6 May 2017 18:30:16 +0000 (00:00 +0530)]
CRM-20530: bookkeeping report at fails at credit card name filter
Eileen McNaughton [Sat, 6 May 2017 08:29:32 +0000 (20:29 +1200)]
Merge pull request #10307 from lcdservices/CRM-20526
CRM-20526 include currency in contrib recent items list
Eileen McNaughton [Sat, 6 May 2017 08:26:02 +0000 (20:26 +1200)]
Merge pull request #10311 from JMAConsulting/CRM-20530
CRM-20530: Bookkeeping transaction report fails at acct credit filter
Eileen McNaughton [Sat, 6 May 2017 08:25:39 +0000 (20:25 +1200)]
Merge pull request #10309 from totten/master-cv
APIExplorer - Add cv and hyperlinks
Eileen McNaughton [Sat, 6 May 2017 08:24:02 +0000 (20:24 +1200)]
Merge pull request #10312 from seamuslee001/template_upgrade_stable
NFC Add in function to check if Foreign key is there to make upgrade …
Eileen McNaughton [Sat, 6 May 2017 08:21:45 +0000 (20:21 +1200)]
Merge pull request #10310 from JMAConsulting/CRM-20527
CRM-20527: batch data entry does not retain currency
Seamus Lee [Sat, 6 May 2017 06:50:18 +0000 (16:50 +1000)]
Add in Upgrade helper function and change style as per comments from Eileen
Seamus Lee [Sat, 6 May 2017 03:02:35 +0000 (13:02 +1000)]
NFC Add in function to check if Foreign key is there to make upgrade more stable
deb.monish [Sat, 6 May 2017 02:28:31 +0000 (07:58 +0530)]
CRM-20530: Bookkeeping transaction report fails at acct credit filter
deb.monish [Thu, 4 May 2017 08:04:55 +0000 (13:34 +0530)]
CRM-20510: Petition signature doesn't show as an activity type for scheduled reminder
deb.monish [Sat, 6 May 2017 02:01:38 +0000 (07:31 +0530)]
CRM-20527: batch data entry does not retain currency
Tim Otten [Fri, 5 May 2017 21:20:06 +0000 (16:20 -0500)]
APIExplorer - Hyperlinks for CLI tools
Tim Otten [Fri, 5 May 2017 20:59:15 +0000 (15:59 -0500)]
APIExplorer - Display cv
Brian Shaughnessy [Fri, 5 May 2017 02:09:09 +0000 (22:09 -0400)]
CRM-20526 include currency in contrib recent items list
Tim Otten [Thu, 4 May 2017 21:41:46 +0000 (16:41 -0500)]
Merge pull request #10300 from civicrm/4.7.19-rc
Merge forward (4.7.19-rc => master)
deb.monish [Fri, 21 Apr 2017 06:47:48 +0000 (12:17 +0530)]
CRM-20037: Change contributions tab to show balance due
Monish Deb [Thu, 4 May 2017 12:13:37 +0000 (17:43 +0530)]
Merge pull request #10295 from eileenmcnaughton/tpl
Towards CRM-20037 edit template to be more flexible.
kryptothesuperdog [Thu, 4 May 2017 10:56:03 +0000 (11:56 +0100)]
CRM-20517 - fix profile contact_sub_type issue
eileen [Wed, 3 May 2017 11:17:48 +0000 (23:17 +1200)]
Towards CRM-20037 edit template to be more flexible.
This commit changes the way the Selector.tpl is structured to be 'driven' by the array,
meaning that if people alter the order, or the array, their changes are more easily reflected in the tpl.
I've kind of ignored the soft credit fields but this does set a direction for setting them in
and not having special handling in the tpl - ie. replace {if }
with columnHeader wrangling
Tim Otten [Thu, 4 May 2017 06:44:15 +0000 (01:44 -0500)]
distmaker/utils/repo-report.php - Fix style. Add Joomla and D8.
Monish Deb [Thu, 4 May 2017 05:35:53 +0000 (11:05 +0530)]
Merge pull request #10294 from eileenmcnaughton/recur
CRM-20513 Fix recur status update & et next recur date based on payme…
colemanw [Thu, 4 May 2017 05:15:24 +0000 (01:15 -0400)]
Merge pull request #10264 from jitendrapurohit/CRM-20171
CRM-20171: Use loadXML() instead of load() for reading xml files.
colemanw [Thu, 4 May 2017 04:56:03 +0000 (00:56 -0400)]
Merge pull request #10152 from agh1/crm-20419
CRM-20419 jQuery.isEmptyObject misused
francescbassas [Wed, 3 May 2017 18:46:57 +0000 (20:46 +0200)]
CRM-20518 Default participant status not set when status name not matches localized string 'Registered'
Eileen McNaughton [Wed, 3 May 2017 17:57:26 +0000 (05:57 +1200)]
Merge pull request #10296 from JMAConsulting/CRM-20515
CRM-20515: otice errors on dmaster for add petition
Coleman Watts [Thu, 13 Apr 2017 15:05:32 +0000 (11:05 -0400)]
CRM-20425 - Configure inbound email activity status
Monish Deb [Wed, 3 May 2017 15:38:33 +0000 (21:08 +0530)]
Merge pull request #10192 from jitendrapurohit/CRM-20452
CRM-20452: Fatal Error on saving Organisation Info when geocoding is …
deb.monish [Wed, 3 May 2017 15:28:15 +0000 (20:58 +0530)]
CRM-20515: otice errors on dmaster for add petition
Jitendra Purohit [Tue, 2 May 2017 12:39:34 +0000 (18:09 +0530)]
replace load with loadXML()
eileen [Tue, 27 Sep 2016 02:37:36 +0000 (15:37 +1300)]
CRM-20513 Fix recur status update & et next recur date based on payment date not current date.
The code to set a recurring sequence to Completed when all contributions received turned out
to be flawed. This fixes that.
This commit extends the test on how dates are being extended. I didn't replicate the problem
I was expecting to see but it makes sense that recurring transactions could be imported on
a different day to the current one and that date is the important one
Eileen McNaughton [Wed, 3 May 2017 06:05:07 +0000 (18:05 +1200)]
Merge pull request #10293 from civicrm/4.7.19-rc
4.7.19 rc