colemanw [Wed, 9 Mar 2016 20:38:25 +0000 (15:38 -0500)]
Merge pull request #7275 from agh1/petition-custom-fields
[fixed-for-master] Survey custom fields in petition UI
Eileen McNaughton [Mon, 7 Mar 2016 01:21:29 +0000 (14:21 +1300)]
Merge pull request #7930 from eileenmcnaughton/4.6
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
eileen [Tue, 23 Feb 2016 22:57:10 +0000 (11:57 +1300)]
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
colemanw [Fri, 4 Mar 2016 16:44:55 +0000 (11:44 -0500)]
Merge pull request #7911 from agh1/merge-screen-close-tag-46
CRM-15789 - contact merge: restore </div> that was accidentally deleted
Monish Deb [Fri, 4 Mar 2016 05:57:37 +0000 (11:27 +0530)]
Merge pull request #7912 from seamuslee001/CRM-18155-46
CRM-18155 Remove membership_type_id from legacyConvertFormValues
Seamus Lee [Fri, 4 Mar 2016 01:33:10 +0000 (01:33 +0000)]
CRM-18155 Remove membership_type_id from legacyConvertFormValues
Andrew Hunt [Thu, 3 Mar 2016 22:37:20 +0000 (17:37 -0500)]
CRM-15789 - contact merge: restore </div> that was accidentally deleted
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Monish Deb [Thu, 3 Mar 2016 09:36:59 +0000 (15:06 +0530)]
Merge pull request #7896 from cividesk/CRM-18130-4.6
CRM-18130: Custom CSS URL not working if aliased or rewritten
CiviCRM [Wed, 2 Mar 2016 09:37:05 +0000 (01:37 -0800)]
Update version to 4.6.15
Yashodha Chaku [Wed, 2 Mar 2016 07:23:25 +0000 (12:53 +0530)]
Merge pull request #7897 from totten/4.6-tcpdf
CRM-18098. Move TCPDF from packages to composer.
Tim Otten [Tue, 1 Mar 2016 02:24:22 +0000 (18:24 -0800)]
CRM-18098 - composer.json - Add tcpdf to include_path (remove me later)
This provides backward-compatibility with extensions that call
`require_once 'tcpdf/tcpdf.php'`.
This notation is deprecated, and we should remove tcpdf from the include-path in the future.
Tim Otten [Tue, 1 Mar 2016 01:58:18 +0000 (17:58 -0800)]
CRM-18098 - TCPDF - Re-include "Times New Roman"
It was present in `civicrm-packages`, and someone might miss it if we take it away.
Tim Otten [Tue, 1 Mar 2016 01:54:13 +0000 (17:54 -0800)]
CRM-18098 - TCPDF - Remove unnecessary require_once
With CRM-18098, we can use the autoloader. And the require_once doesn't
work because the file is no longer in the include_path.
Chris Burgess [Mon, 29 Feb 2016 22:22:04 +0000 (11:22 +1300)]
CRM-18098. Update composer.lock
Chris Burgess [Mon, 29 Feb 2016 21:02:37 +0000 (10:02 +1300)]
CRM-18098. Call tcpdf-cleanup.sh from composer.
Chris Burgess [Thu, 25 Feb 2016 14:20:41 +0000 (03:20 +1300)]
CRM-18098. Move TCPDF from packages to composer.
Tim Otten [Tue, 1 Mar 2016 23:53:26 +0000 (15:53 -0800)]
Merge pull request #7890 from totten/4.6-api-key
CRM-18112 - Additional permission for editing "api_key"
Nicolas Ganivet [Tue, 1 Mar 2016 20:00:37 +0000 (13:00 -0700)]
CRM-18130: Custom CSS URL not working if aliased or rewritten
Monish Deb [Tue, 1 Mar 2016 08:34:36 +0000 (14:04 +0530)]
Merge pull request #7840 from monishdeb/CRM-18026
CRM-18026 fix
Tim Otten [Fri, 26 Feb 2016 20:07:08 +0000 (12:07 -0800)]
CRM-18112 - Additional permission for editing "api_key"
Yashodha Chaku [Mon, 29 Feb 2016 04:09:27 +0000 (09:39 +0530)]
Merge pull request #7829 from seamuslee001/CRM-18066-46
CRM-18066 Include Display name as an option on CIviCRM relationship reports
Eileen McNaughton [Mon, 29 Feb 2016 02:15:40 +0000 (15:15 +1300)]
Merge pull request #7869 from JKingsnorth/CRM-17464-4.6
CRM-17464 remove deadlock inducing query (4.6)
eileenmcnaugton [Thu, 29 Oct 2015 08:26:04 +0000 (21:26 +1300)]
CRM-17464 remove deadlock inducing query
Signed-off-by: JKingsnorth <john@johnkingsnorth.co.uk>
colemanw [Mon, 22 Feb 2016 22:44:26 +0000 (17:44 -0500)]
Merge pull request #7838 from monishdeb/CRM-18063
CRM-18063 fix, exclude contact type and tags from legacy format list
colemanw [Mon, 22 Feb 2016 16:37:34 +0000 (11:37 -0500)]
Merge pull request #7820 from colemanw/CRM-18049
CRM-18049 - Backport api campaign permissions
deb.monish [Mon, 22 Feb 2016 10:46:43 +0000 (16:16 +0530)]
CRM-18026 fix
deb.monish [Mon, 22 Feb 2016 06:35:11 +0000 (12:05 +0530)]
CRM-18063 fix, exclude contact type and tags from legacy format list
Seamus Lee [Thu, 18 Feb 2016 20:12:03 +0000 (20:12 +0000)]
Include Display name as an option on CIviCRM relationship reports
CiviCRM [Wed, 17 Feb 2016 07:58:44 +0000 (23:58 -0800)]
Update version to 4.6.14
colemanw [Wed, 17 Feb 2016 02:15:33 +0000 (21:15 -0500)]
Merge pull request #7808 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix regression with views display of custom fields
Coleman Watts [Tue, 16 Feb 2016 22:51:07 +0000 (17:51 -0500)]
CRM-18049 - Backport api campaign permissions
JKingsnorth [Tue, 16 Feb 2016 15:13:16 +0000 (15:13 +0000)]
CRM-18019-4.6: Better solution for fixing array
Coleman Watts [Mon, 15 Feb 2016 14:48:57 +0000 (09:48 -0500)]
CRM-18034 Fix pass by reference
JKingsnorth [Mon, 15 Feb 2016 12:02:55 +0000 (12:02 +0000)]
CRM-18019: Fix regression with views display of custom fields
Eileen McNaughton [Mon, 15 Feb 2016 04:25:32 +0000 (17:25 +1300)]
Merge pull request #7805 from eileenmcnaughton/CRM-17718-install
CRM-17718 installments should NOT be mandatory on recur edit page
Eileen McNaughton [Mon, 15 Feb 2016 04:23:33 +0000 (17:23 +1300)]
Merge pull request #7804 from eileenmcnaughton/CRM-17718
CRM-17718 update repeattransaction to accept contribution_recur_id in…
eileenmcnaugton [Mon, 15 Feb 2016 00:13:05 +0000 (13:13 +1300)]
CRM-17718 installments should NOT be mandatory on recur edit page - this change is in 4.7 already
eileenmcnaughton [Wed, 16 Dec 2015 17:04:19 +0000 (17:04 +0000)]
CRM-17718 update repeattransaction to permit the financial_type_id to be passed in
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/BAO/ContributionRecur.php
eileenmcnaughton [Wed, 16 Dec 2015 16:25:37 +0000 (16:25 +0000)]
CRM-17718 update repeattransaction to accept contribution_recur_id instead of original_contribution_id
wq
I feel like passing in the contribution_recur_id actually makes more sense - the internals of which contribution is repeated should be 'core business' & consistent across processors.
Importantly it has been set here to repeat the latest rather than the earliest which is not as good as saving such things as line items against the recurring transaction but
better than using the earliest - ie. pick up changes over time
Conflicts:
tests/phpunit/api/v3/ContributionTest.php
Monish Deb [Fri, 12 Feb 2016 13:04:08 +0000 (18:34 +0530)]
Merge pull request #7793 from seamuslee001/CRM-18021-46
CRM-18021 Add in report viewing option for ab tests
Monish Deb [Fri, 12 Feb 2016 13:00:52 +0000 (18:30 +0530)]
Merge pull request #7795 from PalanteJon/CRM-17029
Crm-17029 4.6 - fix Add to Group profile setting doesn't work in petitions
Monish Deb [Fri, 12 Feb 2016 06:57:50 +0000 (12:27 +0530)]
Merge pull request #7621 from agileware/4.6-crm-17848
CRM-17848: Round tax amount when calculated for contribution pages.
Jon goldberg [Thu, 11 Feb 2016 23:17:59 +0000 (18:17 -0500)]
CRM-17029 - fix notices
Jon goldberg [Thu, 11 Feb 2016 22:49:50 +0000 (17:49 -0500)]
CRM-17029 - Add to Group profile setting wasn't working on petitions
Seamus Lee [Thu, 11 Feb 2016 10:15:58 +0000 (10:15 +0000)]
CRM-18021 Add in report viewing option for ab tests
colemanw [Thu, 11 Feb 2016 15:10:02 +0000 (10:10 -0500)]
Merge pull request #7790 from JKingsnorth/CRM-18019-4.6
CRM-18019: Fix display of checkbox values on event confirmation page
JKingsnorth [Thu, 11 Feb 2016 12:03:05 +0000 (12:03 +0000)]
CRM-18019: Fix display of checkbox values on event confirmation page
Yashodha Chaku [Thu, 11 Feb 2016 07:09:40 +0000 (12:39 +0530)]
Merge pull request #7778 from Stoob/patch-4
CRM-17703
colemanw [Wed, 10 Feb 2016 23:44:12 +0000 (18:44 -0500)]
Merge pull request #7784 from JKingsnorth/CRM-18013-4.6
CRM-18013: Fix default value issue
JKingsnorth [Wed, 10 Feb 2016 16:22:30 +0000 (16:22 +0000)]
CRM-18013: Fix default value issue
Stoob [Wed, 10 Feb 2016 05:28:50 +0000 (21:28 -0800)]
CRM-17703
https://github.com/civicrm/civicrm-core/pull/7460/files
colemanw [Tue, 9 Feb 2016 05:15:21 +0000 (00:15 -0500)]
Merge pull request #7751 from agh1/petition-uf-block-46
CRM-17969 petitions should use common profile block template
Monish Deb [Mon, 8 Feb 2016 13:35:05 +0000 (19:05 +0530)]
Merge pull request #7756 from monishdeb/CRM-17313
CRM-17313 fix
deb.monish [Mon, 8 Feb 2016 09:34:34 +0000 (15:04 +0530)]
remove group field from legacy list
Monish Deb [Mon, 8 Feb 2016 08:24:27 +0000 (13:54 +0530)]
Merge pull request #7699 from sunilpawar/CRM-17905
Fix for CRM-17905
colemanw [Sun, 7 Feb 2016 19:02:59 +0000 (14:02 -0500)]
Merge pull request #7712 from kcristiano/4.6
CRM-17593 - fix built in role 'administer users' to check for capabil…
deb.monish [Fri, 5 Feb 2016 17:13:54 +0000 (22:43 +0530)]
minor fix
deb.monish [Fri, 5 Feb 2016 16:09:54 +0000 (21:39 +0530)]
CRM-17313 fix
Andrew Hunt [Thu, 4 Feb 2016 18:42:30 +0000 (13:42 -0500)]
CRM-17969 petitions should use common profile block template
----------------------------------------
* CRM-17969: Free HTML field shows entry box in petitions
https://issues.civicrm.org/jira/browse/CRM-17969
Eileen McNaughton [Thu, 4 Feb 2016 01:26:56 +0000 (14:26 +1300)]
Merge pull request #7736 from seamuslee001/CRM-17650-4.6
CRM-17650 ensure that replyto_email is updated when re-using a previo…
Seamus Lee [Tue, 8 Dec 2015 06:14:39 +0000 (06:14 +0000)]
CRM-17650 ensure that replyto_email is updated when re-using a previous mailing and changing the from address.
Yashodha Chaku [Wed, 3 Feb 2016 12:13:05 +0000 (17:43 +0530)]
Merge pull request #7733 from yashodha/4.6-version-fix
Update version to 4.6.13
yashodha [Wed, 3 Feb 2016 10:47:37 +0000 (16:17 +0530)]
Update version to 4.6.13
colemanw [Wed, 3 Feb 2016 05:35:24 +0000 (22:35 -0700)]
Merge pull request #7730 from colemanw/CRM-17960-4.6
CRM-17960 - Handle redirects in popups
Coleman Watts [Wed, 3 Feb 2016 05:25:37 +0000 (22:25 -0700)]
CRM-17960 - Handle redirects in popups
Kevin Cristiano [Tue, 2 Feb 2016 18:50:25 +0000 (11:50 -0700)]
CRM-17593 -Update comment for change from role based permission to capabilties based permissions - Backport to 4.6
----------------------------------------
* CRM-17593: Certain Permissions are hard coded to 'Administrator' in CRM_Core_Permission_WordPress
https://issues.civicrm.org/jira/browse/CRM-17593
Yashodha Chaku [Tue, 2 Feb 2016 10:58:10 +0000 (16:28 +0530)]
Merge pull request #7706 from mlutfy/4.6-crm16801-1
CRM-16801: revert seedLanguage fix in the installer.
Kevin Cristiano [Mon, 1 Feb 2016 20:16:21 +0000 (13:16 -0700)]
CRM-17593 - fix built in role 'administer users' to check for capability of 'edit_users' rather than set at the administrator level- Backport to 4.6
----------------------------------------
* CRM-17593: Certain Permissions are hard coded to 'Administrator' in CRM_Core_Permission_WordPress
https://issues.civicrm.org/jira/browse/CRM-17593
Tim Otten [Sun, 31 Jan 2016 22:13:42 +0000 (15:13 -0700)]
Merge pull request #7702 from totten/4.6-getlink
CRM-17911 - Fix cxn "Settings" link on WordPress
Mathieu Lutfy [Sun, 31 Jan 2016 18:39:26 +0000 (13:39 -0500)]
CRM-16801: revert seedLanguage fix in the installer.
Mathieu Lutfy [Sun, 31 Jan 2016 18:10:19 +0000 (13:10 -0500)]
CRM-16801: fix seedLanguage in the installer.
Tim Otten [Sun, 31 Jan 2016 01:39:59 +0000 (18:39 -0700)]
CRM-17911 - crmCxn ManageCtrl - Use `page_name` instead of `page`
Tim Otten [Sun, 31 Jan 2016 01:26:37 +0000 (18:26 -0700)]
CRM-17911 - Cxn.getlink API - Accept `page` or `page_name`
sunil [Sat, 30 Jan 2016 11:48:11 +0000 (17:18 +0530)]
CRM-17905 added/removed white spaces
sunil [Sat, 30 Jan 2016 11:40:02 +0000 (17:10 +0530)]
Fix for CRM-17905
Monish Deb [Fri, 29 Jan 2016 05:44:06 +0000 (11:14 +0530)]
Merge pull request #7693 from eileenmcnaughton/4.6-monish
backporting changes of CRM-17836 in 4.6
monishdeb [Thu, 21 Jan 2016 19:56:57 +0000 (01:26 +0530)]
backporting changes of CRM-17836 in 4.6
----------------------------------------
* CRM-17836: custom fields attached to relationships are unsearchable
https://issues.civicrm.org/jira/browse/CRM-17836
Eileen McNaughton [Wed, 27 Jan 2016 19:40:17 +0000 (08:40 +1300)]
Merge pull request #7662 from seamuslee001/CRM-17854-4.6
CRM-17854 && CRM-17685 fix - CiviCRM DB Syntax Error when enabling lo…
Eileen McNaughton [Wed, 27 Jan 2016 07:05:06 +0000 (20:05 +1300)]
Merge pull request #7658 from eileenmcnaughton/sync
Further syncs between to align query class in 4.6 & master
Eileen McNaughton [Wed, 27 Jan 2016 06:43:01 +0000 (19:43 +1300)]
Merge pull request #7670 from eileenmcnaughton/CRM-17628-backport
CRM-17628 add qfKey to contribution search links
Eileen McNaughton [Wed, 27 Jan 2016 06:42:37 +0000 (19:42 +1300)]
Merge pull request #7669 from eileenmcnaughton/CRM-17118-campaign
CRM-17718 update repeattransaction api action to give precedence to c…
eileenmcnaugton [Mon, 25 Jan 2016 10:37:48 +0000 (23:37 +1300)]
Further syncs between to align query class in 4.6 & master
This is to help syncing, add function that is in master & will be required in 4.6 and sync function signature on buildQill function
eileen [Mon, 7 Dec 2015 03:51:33 +0000 (16:51 +1300)]
CRM-17628 add qfKey to contribution search links
eileenmcnaughton [Wed, 16 Dec 2015 16:00:34 +0000 (16:00 +0000)]
CRM-17718 update repeattransaction api action to give precedence to contribution_recur for campaign id
monishdeb [Fri, 15 Jan 2016 14:12:01 +0000 (19:42 +0530)]
CRM-17854 && CRM-17685 fix - CiviCRM DB Syntax Error when enabling logging
https://issues.civicrm.org/jira/browse/CRM-17685
https://issues.civicrm.org/jira/browse/CRM-17854
Monish Deb [Mon, 25 Jan 2016 19:49:38 +0000 (01:19 +0530)]
Merge pull request #7653 from eileenmcnaughton/4.6
Sync comments between master & 4.6 branches for easier patching
Eileen McNaughton [Mon, 25 Jan 2016 10:27:34 +0000 (23:27 +1300)]
Merge pull request #7652 from eileenmcnaughton/CRM-17764
CRM-17764 add pledge block region to main contribution page
Eileen McNaughton [Mon, 25 Jan 2016 09:11:56 +0000 (22:11 +1300)]
Merge pull request #7638 from monishdeb/CRM-17822
CRM-17822 fix - Export custom fields of type country (regression)
eileenmcnaugton [Mon, 25 Jan 2016 08:31:31 +0000 (21:31 +1300)]
Sync comments between master & 4.6 branches for easier patching
eileenmcnaugton [Mon, 25 Jan 2016 03:52:37 +0000 (16:52 +1300)]
CRM-17764 add pledge block region to main contribution page
Eileen McNaughton [Sun, 24 Jan 2016 20:54:01 +0000 (09:54 +1300)]
Merge pull request #7644 from lcdservices/CRM-17865-46
CRM-17865 set participant custom fields default on additional reg form
Brian Shaughnessy [Sat, 23 Jan 2016 21:22:23 +0000 (16:22 -0500)]
CRM-17865 set participant custom fields default on additional reg form
monishdeb [Fri, 22 Jan 2016 18:58:09 +0000 (00:28 +0530)]
CRM-17822 fix - Export custom fields of type country (regression)
https://issues.civicrm.org/jira/browse/CRM-17822
Francis Whittle [Wed, 20 Jan 2016 05:30:16 +0000 (16:30 +1100)]
CRM-17848: Round tax amount when calculated for contribution pages.
colemanw [Thu, 14 Jan 2016 15:12:35 +0000 (10:12 -0500)]
Merge pull request #7593 from PalanteJon/CRM-17273-4.6
CRM-17273 - CiviCRM Core - disallow editing location types from the C…
Jon goldberg [Thu, 14 Jan 2016 03:00:05 +0000 (22:00 -0500)]
CRM-17273 - CiviCRM Core - disallow editing location types from the Contact Edit screen
colemanw [Tue, 12 Jan 2016 14:10:01 +0000 (09:10 -0500)]
Merge pull request #7577 from seamuslee001/CRM-17802
CRM-17802 Fix default end and start times and switch to use !empty ra…
Seamus Lee [Tue, 12 Jan 2016 04:19:38 +0000 (04:19 +0000)]
Make start time midnight not midday woops
Seamus Lee [Mon, 11 Jan 2016 22:51:59 +0000 (22:51 +0000)]
CRM-17802 Fix default end and start times and switch to use !empty rather than isset
Eileen McNaughton [Mon, 11 Jan 2016 00:43:22 +0000 (13:43 +1300)]
Merge pull request #6990 from seamuslee001/CRM-17303-4.6
Crm 17303 4.6 Backport
projects / civicrm-core.git / log