Andrew Engelbrecht [Wed, 1 Feb 2017 23:21:28 +0000 (18:21 -0500)]
By default send cancel req. to payment processor
When cancelling a payment through the Civi interface, the cancellation
request should be sent to the payment processor by default. To that end,
I've set the "Yes" option to be selected by default on the recurring
contribution cancellation form.
When using a payment processor such as TrustCommerce, they need to know
about the cancellation in order to stop future payments.
Andrew Engelbrecht [Fri, 6 Jan 2017 21:42:21 +0000 (16:42 -0500)]
use old hackish fix for viewing recurring contribs
the method suggested by ruben did not succeed. the method i was using
prior does work for now, but it is not ideal. i've included that change
in this commit.
Andrew Engelbrecht [Wed, 4 Jan 2017 21:54:58 +0000 (16:54 -0500)]
added comment for fix of ambiguous column ref.
this commit adds a comment section near the changes made in the relevant
file changed in commit
b8d15d544ccc74365328ce59876071c43d848443
Andrew Engelbrecht [Wed, 4 Jan 2017 21:45:12 +0000 (16:45 -0500)]
fix display of contacts' recurring contributions
https://rt.gnu.org/Ticket/Display.html?id=
1176733
if you look at a contact, click contributions, then click on "view" next
to a recurring payment (not all users have these), then the server would
crash and give a backtrace. this patch fixes that issue.
the issue was due to a sort-by-id failing because multiple tables are
queried, more than one of which has an id column. therefore the "id"
column name was redundant and threw an SQL error. this patch specifies
the desired table with the specified id column.
i worked a bit on this patch and received help from ruben, who corrected
my less than perfect original patch.
Ruben Rodriguez [Fri, 9 Dec 2016 16:22:15 +0000 (11:22 -0500)]
Merge tag '4.6.24' of https://github.com/civicrm/civicrm-core into 4.6.24-fsf
Eileen McNaughton [Fri, 2 Dec 2016 00:49:45 +0000 (13:49 +1300)]
Merge pull request #9483 from colemanw/CRM-19709-lts
CRM-19709 fix html output (LTS)
Coleman Watts [Thu, 1 Dec 2016 22:07:01 +0000 (17:07 -0500)]
CRM-19709 - Fix html output in Common.js
Conflicts:
js/Common.js
Coleman Watts [Thu, 1 Dec 2016 22:06:39 +0000 (17:06 -0500)]
CRM-19709 - Fix double-escaped quicksearch results
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters
Eileen McNaughton [Tue, 29 Nov 2016 10:28:56 +0000 (23:28 +1300)]
Merge pull request #9462 from seamuslee001/CRM-19079
CRM-19079 condition profile edit permission check
Brian Shaughnessy [Thu, 14 Jul 2016 12:40:39 +0000 (08:40 -0400)]
CRM-19079 condition profile edit permission check
Eileen McNaughton [Wed, 23 Nov 2016 21:34:55 +0000 (10:34 +1300)]
Merge pull request #9439 from seamuslee001/CRM-19641-b-46
CRM-19641 Further Fix
Seamus Lee [Wed, 23 Nov 2016 02:46:33 +0000 (13:46 +1100)]
CRM-19641 Further Fix
Eileen McNaughton [Sat, 19 Nov 2016 03:53:51 +0000 (16:53 +1300)]
Merge pull request #9412 from seamuslee001/CRM-19562-46
CRM-19562
Seamus Lee [Fri, 18 Nov 2016 22:31:17 +0000 (09:31 +1100)]
Backport validateAll function to 4.6
Seamus Lee [Wed, 16 Nov 2016 03:56:05 +0000 (14:56 +1100)]
Fix test as per comments from Eileen
Seamus Lee [Wed, 16 Nov 2016 03:26:53 +0000 (14:26 +1100)]
CRM-19562
Eileen McNaughton [Wed, 16 Nov 2016 00:00:43 +0000 (13:00 +1300)]
Merge pull request #9396 from seamuslee001/CRM-19641-46
CRM-19641
Seamus Lee [Tue, 15 Nov 2016 19:37:04 +0000 (06:37 +1100)]
CRM-19641
Eileen McNaughton [Tue, 15 Nov 2016 21:05:29 +0000 (10:05 +1300)]
Merge pull request #9394 from seamuslee001/CRM-18493-46
Backport of CRM-18493
deb.monish [Tue, 15 Nov 2016 10:02:29 +0000 (15:32 +0530)]
minor optimization
Seamus Lee [Mon, 31 Oct 2016 21:06:33 +0000 (08:06 +1100)]
Fix Variable
Seamus Lee [Mon, 31 Oct 2016 21:05:44 +0000 (08:05 +1100)]
Fix Test skipping message
Seamus Lee [Tue, 25 Oct 2016 23:37:06 +0000 (10:37 +1100)]
CRM-18493 Ensure that sort param is valid for use in mysql
colemanw [Tue, 15 Nov 2016 17:17:58 +0000 (12:17 -0500)]
Merge pull request #9391 from davejenx/CRM-19431-46
CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::$_nullArray. - 4.6
Dave Jenkins [Tue, 15 Nov 2016 16:15:52 +0000 (16:15 +0000)]
CRM-19431 - CRM-19431: avoid pollution (in EntityTag) and use (in ContactType) of CRM_Core_DAO::$_nullArray.
Yashodha Chaku [Tue, 15 Nov 2016 06:34:22 +0000 (12:04 +0530)]
Merge pull request #9323 from konadave/CRM-19567-4.6
CRM-19567 FALSE amount owed warning
colemanw [Tue, 15 Nov 2016 02:03:23 +0000 (21:03 -0500)]
Merge pull request #9381 from KarinG/patch-7
Set a value for iDisplayLength - 4.6
Karin Gerritsen [Mon, 14 Nov 2016 03:23:55 +0000 (20:23 -0700)]
Set a value for iDisplayLength - 4.6
The default (if none is set) turns out to be 10. Eileen said (and I quote): "if you wanted to propose an increase in core to 25 that would be an easy sell I think" :-)
colemanw [Sat, 12 Nov 2016 21:13:27 +0000 (16:13 -0500)]
Merge pull request #9378 from colemanw/CRM-19640-backport
CRM-19640 - Add pre/post hooks to CustomField (backport)
Coleman Watts [Fri, 11 Nov 2016 21:28:26 +0000 (16:28 -0500)]
CRM-19640 - Add pre/post hooks to CustomField ops
Eileen McNaughton [Sun, 6 Nov 2016 21:07:26 +0000 (10:07 +1300)]
Merge pull request #9356 from KarinG/patch-5
Update DataSource.php - 4.6 PR
Karin Gerritsen [Sun, 6 Nov 2016 16:29:23 +0000 (09:29 -0700)]
Update DataSource.php
https://issues.civicrm.org/jira/browse/CRM-19607
CiviCRM [Wed, 2 Nov 2016 20:03:25 +0000 (13:03 -0700)]
Update version to 4.6.24
colemanw [Fri, 28 Oct 2016 19:18:58 +0000 (15:18 -0400)]
Merge pull request #9331 from colemanw/CRM-19551-4.6
CRM-19551 - Display multiple case activity attachments
Coleman Watts [Thu, 27 Oct 2016 18:59:53 +0000 (14:59 -0400)]
CRM-19551 - Display multiple case activity attachments
Conflicts:
CRM/Case/BAO/Case.php
David Reedy Jr [Wed, 26 Oct 2016 14:20:17 +0000 (09:20 -0500)]
CRM-19567 FALSE amount owed warning
Eileen McNaughton [Mon, 24 Oct 2016 01:46:52 +0000 (14:46 +1300)]
Merge pull request #9290 from jackrabbithanna/4.6
Fix for CRM-19537 -- backporting fix to make smartGroupCacheTimeout of 0 possible
Eileen McNaughton [Mon, 24 Oct 2016 01:39:23 +0000 (14:39 +1300)]
Merge pull request #9311 from cividesk/CRM-3795-4.6
CRM-3795: Full fix
Nicolas Ganivet [Sun, 23 Oct 2016 21:15:43 +0000 (15:15 -0600)]
Full fix: Bcc addresses no longer shown to recipients when PEAR mailer is not Mail_mail.
Eileen McNaughton [Thu, 20 Oct 2016 02:35:21 +0000 (15:35 +1300)]
Merge pull request #9300 from seamuslee001/CRM-19222
CRM-19222 Export: temp table field length at least 255 for strings
yashodha [Tue, 13 Sep 2016 10:41:43 +0000 (16:11 +0530)]
CRM-19222 Export: temp table field length at least 255 for strings
----------------------------------------
* CRM-19222: Data too long on export including custom field
https://issues.civicrm.org/jira/browse/CRM-19222
Mark Hanna [Wed, 19 Oct 2016 00:15:52 +0000 (19:15 -0500)]
backporting fix to make smartGroupCacheTimeout of 0 possible
Eileen McNaughton [Thu, 13 Oct 2016 18:17:03 +0000 (19:17 +0100)]
Merge pull request #9243 from mollux/CRM18549-4.6
CRM-18549 - Don't store empty array value of a setting as NULL.
Mattias Michaux [Thu, 13 Oct 2016 14:59:02 +0000 (16:59 +0200)]
Don't store empty array value of a setting as NULL.
Eileen McNaughton [Wed, 12 Oct 2016 13:39:21 +0000 (14:39 +0100)]
Merge pull request #9215 from elcapo/4.6
CRM-19418 Fixes showing cancelled contribution box on 4.6
Carlos Capote [Tue, 11 Oct 2016 17:40:59 +0000 (18:40 +0100)]
CRM-19418 Fixes showing cancelled contribution box on 4.6
Monish Deb [Thu, 6 Oct 2016 20:58:49 +0000 (02:28 +0530)]
Merge pull request #9176 from KarinG/patch-3
Porting back fuzionnz/CRM-18830
Karin Gerritsen [Wed, 5 Oct 2016 12:42:00 +0000 (06:42 -0600)]
Porting back fuzionnz/CRM-18830
CiviCRM [Wed, 5 Oct 2016 07:44:30 +0000 (00:44 -0700)]
Update version to 4.6.23
Yashodha Chaku [Tue, 4 Oct 2016 03:47:43 +0000 (09:17 +0530)]
Merge pull request #9163 from Nafhed/CRM-19406
CRM-18984 : Can't delete an import/export mapping
colemanw [Mon, 3 Oct 2016 20:57:27 +0000 (16:57 -0400)]
Merge pull request #9161 from monishdeb/CRM-19294-46
CRM-19294: Unable to upload files via a contribution page (backport PR)
deb.monish [Mon, 3 Oct 2016 12:13:27 +0000 (17:43 +0530)]
additional changes
deb.monish [Mon, 3 Oct 2016 08:11:17 +0000 (13:41 +0530)]
CRM-19294: Unable to upload files via a contribution page (backport 4.6 PR)
nganivet [Thu, 29 Sep 2016 16:50:04 +0000 (12:50 -0400)]
Fix for 4.6 (#9111)
* Fix for 4.6 (a few other places but non-important / too complex to refactor).
* Corrects styling
* Fix style warning
colemanw [Wed, 28 Sep 2016 18:09:53 +0000 (14:09 -0400)]
Merge pull request #9138 from cividesk/CRM-17991-4.6
CRM-17991: backport of 4.7 fix to 4.6
Nicolas Ganivet [Wed, 28 Sep 2016 16:13:09 +0000 (12:13 -0400)]
CRM-17991: Fix Safari JS bug in Contribution popups (affects soft credits, pledges)
yashodha [Thu, 23 Jun 2016 10:18:11 +0000 (15:48 +0530)]
CRM-18984 : Can't delete an import/export mapping
----------------------------------------
* CRM-18984: Can't delete an import/export mapping
https://issues.civicrm.org/jira/browse/CRM-18984
Signed-off-by: Nathan Brettell <nathanbrettell@gmail.com>
colemanw [Mon, 26 Sep 2016 23:31:31 +0000 (19:31 -0400)]
Merge pull request #9050 from seamuslee001/CRM-17789-46-1
CRM-17789 code cleanup for php7 for 4.6
colemanw [Mon, 26 Sep 2016 21:25:03 +0000 (17:25 -0400)]
Merge pull request #9064 from seamuslee001/CRM-19059-46
CRM-19059 - Upgrade dompdf to 0.7.* for 4.6
Eileen McNaughton [Sun, 18 Sep 2016 09:27:33 +0000 (21:27 +1200)]
Merge pull request #9062 from seamuslee001/CRM-19375
CRM-19375 Fix error in the where clause
Seamus Lee [Sat, 17 Sep 2016 22:00:20 +0000 (22:00 +0000)]
Further fixes to ensure that images are supported and to trim filename of extension as per CRM-19183
Seamus Lee [Sat, 17 Sep 2016 21:46:45 +0000 (21:46 +0000)]
CRM-19059 upgrade dompdf for 4.6
Eileen McNaughton [Sat, 17 Sep 2016 04:42:07 +0000 (16:42 +1200)]
Merge pull request #9054 from seamuslee001/fix_contribution_recepits
CRM-19373 Fix printing and sending contribution recepits
Seamus Lee [Fri, 16 Sep 2016 21:25:55 +0000 (07:25 +1000)]
CRM-19375 Fix error in the where clause
Seamus Lee [Fri, 16 Sep 2016 10:55:26 +0000 (10:55 +0000)]
Fix printing and sending contribution recepits
Seamus Lee [Thu, 15 Sep 2016 22:15:33 +0000 (08:15 +1000)]
CRM-17789 code cleanup for php7 for 4.6
Yashodha Chaku [Thu, 15 Sep 2016 08:42:02 +0000 (14:12 +0530)]
Merge pull request #9043 from seamuslee001/sl_upgrade_notice_fix-46
CRM-19370 - Fix upgrade message in 4.6.21 upgrade
Seamus Lee [Thu, 15 Sep 2016 06:23:30 +0000 (16:23 +1000)]
Fix english
Seamus Lee [Thu, 15 Sep 2016 06:18:05 +0000 (16:18 +1000)]
Fix up grade message in 4.6.21 upgrade
Eileen McNaughton [Wed, 14 Sep 2016 04:57:56 +0000 (16:57 +1200)]
Merge pull request #9032 from seamuslee001/CRM-19283-46
CRM-19283 Allow contribution forms to support Mastercard 2bin series
Seamus Lee [Tue, 13 Sep 2016 22:00:35 +0000 (08:00 +1000)]
Allow contribution forms to support Mastercard 2bin series
Eileen McNaughton [Mon, 12 Sep 2016 23:09:39 +0000 (09:09 +1000)]
Merge pull request #8987 from seamuslee001/CRM-18236
CRM-18236 stop schedule reminders from sending multiple reminders for…
Lisa Marie Maginnis [Thu, 8 Sep 2016 15:22:26 +0000 (11:22 -0400)]
Merged with 4.6.21, kept our hack to split clearing the contact_group_cache into smaller parts
CiviCRM [Wed, 7 Sep 2016 19:52:32 +0000 (12:52 -0700)]
Update version to 4.6.22
Seamus Lee [Tue, 6 Sep 2016 00:00:32 +0000 (00:00 +0000)]
CRM-18236 stop schedule reminders from sending multiple reminders for the same event
Eileen McNaughton [Mon, 5 Sep 2016 20:42:51 +0000 (08:42 +1200)]
Merge pull request #8966 from seamuslee001/CRM-19290-46
CRM-19290 Fix date creation in Karma test
Eileen McNaughton [Sun, 4 Sep 2016 02:19:04 +0000 (14:19 +1200)]
Merge pull request #8971 from KarinG/patch-2
English language/grammar - 4.6 branch
Karin Gerritsen [Thu, 1 Sep 2016 13:40:49 +0000 (07:40 -0600)]
English language/grammar - 4.6 branch
One of my clients would very much like to see this small English language/grammar edit. JIRA: https://issues.civicrm.org/jira/browse/CRM-19289 - Already fixed in 4.7
Eileen McNaughton [Thu, 1 Sep 2016 02:06:29 +0000 (14:06 +1200)]
Merge pull request #8957 from seamuslee001/port_totten_nags
CRM-15925 CRM-15928 Port changes from Totten
Seamus Lee [Wed, 31 Aug 2016 23:40:25 +0000 (09:40 +1000)]
CRM-19290 Fix date creation in Karma test
Tim Otten [Tue, 30 Aug 2016 08:03:15 +0000 (01:03 -0700)]
Merge pull request #8947 from seamuslee001/CRM-15928-upgrae
CRM-15928 - For upgraded sites, allow remote submissions by default
Seamus Lee [Tue, 30 Aug 2016 07:48:50 +0000 (17:48 +1000)]
CRM-15928 - Display warning if is enabled
Seamus Lee [Tue, 30 Aug 2016 07:43:46 +0000 (17:43 +1000)]
CRM-15925 - CRM/Upgrade - Add post-upgrade msg re: "import SQL datasource"
Seamus Lee [Tue, 30 Aug 2016 04:00:30 +0000 (14:00 +1000)]
CRM-15928 set allowing remote submissions on upgrade
Eileen McNaughton [Sat, 27 Aug 2016 03:23:49 +0000 (15:23 +1200)]
Merge pull request #8935 from cividesk/CRM-19261-4.6
CRM-19261: full fix
Nicolas Ganivet [Fri, 26 Aug 2016 07:23:31 +0000 (01:23 -0600)]
CRM-19261: full fix
Eileen McNaughton [Fri, 26 Aug 2016 02:43:05 +0000 (14:43 +1200)]
Merge pull request #8921 from seamuslee001/CRM-13640-46
CRM-13640 backport fix to 4.6
Eileen McNaughton [Fri, 26 Aug 2016 02:41:21 +0000 (14:41 +1200)]
Merge pull request #8932 from seamuslee001/CRM-15925
CRM-15925 4.6 Backport
Eileen McNaughton [Fri, 26 Aug 2016 02:41:03 +0000 (14:41 +1200)]
Merge pull request #8931 from seamuslee001/CRM-15928-46
CRM-15928 Backport fix for CRM-15928 to 4.6
Tim Otten [Tue, 23 Aug 2016 22:56:10 +0000 (15:56 -0700)]
CRM-15925 - CRM_Contact_Import_Form_DataSource - Enforce permissions
Tim Otten [Tue, 23 Aug 2016 22:55:29 +0000 (15:55 -0700)]
CRM-15925 - CRM_Import_DataSource_SQL - Declare required permission
Tim Otten [Tue, 23 Aug 2016 22:53:22 +0000 (15:53 -0700)]
CRM-15925 - CRM_Core_Permissions - Declare "import SQL datasource"
Seamus Lee [Thu, 25 Aug 2016 06:51:40 +0000 (16:51 +1000)]
Fix template variable
Seamus Lee [Wed, 24 Aug 2016 21:21:10 +0000 (07:21 +1000)]
CRM-15928 Backport fix for CRM-15928 to 4.6
Eileen McNaughton [Wed, 24 Aug 2016 01:28:31 +0000 (13:28 +1200)]
Merge pull request #8920 from seamuslee001/CRM-12132
Crm 12132
Seamus Lee [Wed, 24 Aug 2016 00:02:03 +0000 (10:02 +1000)]
backport unit test to 4.6
Seamus Lee [Tue, 23 Aug 2016 21:46:19 +0000 (07:46 +1000)]
Backport fix for CRM-13640 to 4.6
Seamus Lee [Tue, 23 Aug 2016 21:31:03 +0000 (07:31 +1000)]
Fix settings call