k054 [Thu, 4 Feb 2016 22:27:14 +0000 (17:27 -0500)]
Merge tag '4.6.12' of https://github.com/civicrm/civicrm-core into 4.6.12-fsf
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
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.
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`
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
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
colemanw [Fri, 8 Jan 2016 18:23:58 +0000 (13:23 -0500)]
Merge pull request #7559 from eileenmcnaughton/cividesk-housekeeping
Getting started for 4.6
Coleman Watts [Fri, 8 Jan 2016 12:49:35 +0000 (07:49 -0500)]
Fix upgrade callback
sunil [Fri, 31 Jul 2015 12:02:15 +0000 (17:32 +0530)]
Getting started for 4.6
removed unwanted code
getting started should available for new users
Getting started changes
Getting started changes
Eileen McNaughton [Fri, 8 Jan 2016 01:40:25 +0000 (14:40 +1300)]
Merge pull request #7479 from BorislavZlatanov/patch-3
Partial fix for CRM-17734
Eileen McNaughton [Thu, 7 Jan 2016 23:54:49 +0000 (12:54 +1300)]
Merge pull request #7554 from rohankatkar/4.6-Test-fixes
Webtests Fixes for 4.6
CiviCRM [Thu, 7 Jan 2016 23:42:02 +0000 (15:42 -0800)]
Merge branch 'helenagarcia90-4.6-enable-button' into 4.6
CiviCRM [Thu, 7 Jan 2016 23:32:20 +0000 (15:32 -0800)]
Merge branch '4.6-enable-button' of https://github.com/helenagarcia90/civicrm-core into helenagarcia90-4.6-enable-button
Web Access [Thu, 7 Jan 2016 13:11:58 +0000 (18:41 +0530)]
Webtests Fixes for 4.6
Tim Otten [Thu, 7 Jan 2016 02:21:43 +0000 (18:21 -0800)]
Merge pull request #7544 from totten/4.6-cxn-ui
CRM-16173, CRM-16831 - Register "System Settings => Connections" link
CiviCRM [Wed, 6 Jan 2016 01:18:14 +0000 (17:18 -0800)]
Regen civicrm_generated.mysql
CiviCRM [Wed, 6 Jan 2016 01:18:03 +0000 (17:18 -0800)]
CRM-16173 - civicrm_navigation.tpl - Register "System Settings => Connections" link
CiviCRM [Wed, 6 Jan 2016 01:06:19 +0000 (17:06 -0800)]
CRM-16173 - 4.6.12.mysql.tpl - Register "System Settings => Connections" link
CiviCRM [Wed, 6 Jan 2016 00:58:57 +0000 (16:58 -0800)]
CRM-16173 - crmCxn - Display explanation
CiviCRM [Wed, 6 Jan 2016 08:35:58 +0000 (00:35 -0800)]
Update version to 4.6.12
Eileen McNaughton [Tue, 5 Jan 2016 20:23:24 +0000 (09:23 +1300)]
Merge pull request #7536 from eileenmcnaughton/backport-apis
Backport apis
eileen [Tue, 5 Jan 2016 11:06:33 +0000 (00:06 +1300)]
Backport metadata titles
Change-Id: Id10f05c8f890ba35a9b2f225a57b6de65f26269b
Yashodha Chaku [Tue, 5 Jan 2016 06:18:45 +0000 (11:48 +0530)]
Merge pull request #7464 from seamuslee001/CRM-17727-4.6-core
CRM-17727 Improve relationship report by adding in end_date check for active re…
eileen [Thu, 31 Dec 2015 03:49:34 +0000 (16:49 +1300)]
Backport EntityFinancialTrxn api
eileen [Tue, 29 Dec 2015 05:32:24 +0000 (18:32 +1300)]
Backport FinancialTrxn api
Tim Otten [Mon, 4 Jan 2016 19:58:48 +0000 (11:58 -0800)]
Merge pull request #7527 from totten/4.6-system-get
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
Yashodha Chaku [Mon, 4 Jan 2016 06:42:28 +0000 (12:12 +0530)]
Merge pull request #7487 from yashodha/CRM-17735
CRM-17735: Payment fields fail to reappear on donation page after usi…
CiviCRM [Mon, 4 Jan 2016 01:42:45 +0000 (17:42 -0800)]
System.get API - Return whitelisted settings
CiviCRM [Sun, 3 Jan 2016 23:46:13 +0000 (15:46 -0800)]
System.get API - Report on OS, httpd, multilanguage, multidomain, sapi
colemanw [Tue, 29 Dec 2015 22:02:52 +0000 (17:02 -0500)]
Merge pull request #7506 from monishdeb/testFailures
CRM-17673 fix - Update recurring billing details: update page fails
monishdeb [Tue, 29 Dec 2015 09:22:44 +0000 (14:52 +0530)]
CRM-17673 fix - Update recurring billing details: update page fails
https://issues.civicrm.org/jira/browse/CRM-17673
Tim Otten [Mon, 21 Dec 2015 23:31:44 +0000 (15:31 -0800)]
Merge pull request #7486 from totten/4.6-cxn-check
CRM-16173 - Display alert for local/private sites.
yashodha [Mon, 21 Dec 2015 11:34:51 +0000 (17:04 +0530)]
CRM-17735: Payment fields fail to reappear on donation page after using enter key in 'other amount' text box
----------------------------------------
* CRM-17735: Payment fields fail to reappear on donation page after using enter key in "other amount" text box
https://issues.civicrm.org/jira/browse/CRM-17735
Tim Otten [Mon, 21 Dec 2015 03:31:35 +0000 (19:31 -0800)]
Merge pull request #7484 from totten/4.6-dompdf
CRM-17733. Update to DOMPDF 0.6.2
CiviCRM [Mon, 21 Dec 2015 03:05:27 +0000 (19:05 -0800)]
CRM-16173 - Display alert for local/private sites.
Chris Burgess [Fri, 18 Dec 2015 19:05:10 +0000 (08:05 +1300)]
CRM-17733. Update to DOMPDF 0.6.2
Tim Otten [Sun, 20 Dec 2015 21:44:51 +0000 (13:44 -0800)]
Merge pull request #7481 from totten/4.6-pumpernickle
CRM-16173 - crmCxn - When reconnecting, display the *new* details/perms
Seamus Lee [Thu, 17 Dec 2015 19:57:50 +0000 (19:57 +0000)]
Improve relationship report by adding in end_date check for active relationships and also by adding in filters for relationship start and end dates
Switch to using is_valid test as per 4.7
CiviCRM [Sat, 19 Dec 2015 04:08:46 +0000 (20:08 -0800)]
CRM-16173 - crmCxn - When reconnecting, display the *new* details/permissions.
Borislav Zlatanov [Fri, 18 Dec 2015 21:21:36 +0000 (23:21 +0200)]
Partial fix for CRM-17734
Dave Greenberg [Thu, 17 Dec 2015 17:59:15 +0000 (09:59 -0800)]
Merge pull request #7458 from davecivicrm/CRM-17702
CRM-17702 - fix for 4.6.
Dave Greenberg [Thu, 17 Dec 2015 01:51:54 +0000 (17:51 -0800)]
CRM-17702 - fix for 4.6.
----------------------------------------
* CRM-17702: Validation broken on back-end membership form for membership price set with quantity field
https://issues.civicrm.org/jira/browse/CRM-17702
Dave Greenberg [Sat, 12 Dec 2015 00:07:06 +0000 (16:07 -0800)]
Merge pull request #7435 from mlutfy/46-crm17695
CRM-17695: ts() fixes.
Mathieu Lutfy [Fri, 11 Dec 2015 16:21:40 +0000 (11:21 -0500)]
CRM-17695: ts() fixes.
Dave Greenberg [Wed, 9 Dec 2015 18:13:29 +0000 (10:13 -0800)]
Merge pull request #7293 from JKingsnorth/CRM-17585-4.6
CRM-17584 and CRM-17585: Fixes for JS on merge screen
Eileen McNaughton [Mon, 7 Dec 2015 21:46:47 +0000 (10:46 +1300)]
Merge pull request #7380 from eileenmcnaughton/CRM-11338
CRM-11338 backport exception class
Monish Deb [Mon, 7 Dec 2015 15:07:07 +0000 (20:37 +0530)]
Merge pull request #7400 from jitendrapurohit/CRM-17656
CRM-17656 - Cannot edit activities with custom fields in popup from a…
jitendrapurohit [Mon, 7 Dec 2015 07:24:59 +0000 (12:54 +0530)]
CRM-17656 - Cannot edit activities with custom fields in popup from a search results screen
Tim Otten [Mon, 7 Dec 2015 03:38:06 +0000 (19:38 -0800)]
Merge pull request #7388 from totten/4.6-cxn-proxy
CiviConnect - Proxy support; UI tweaks; System.get improvements
eileenmcnaugton [Fri, 4 Dec 2015 07:36:52 +0000 (20:36 +1300)]
CRM-11338 backport exception class
Change-Id: Id4ca37d589e0d21074cae140935e28d18de2d59e
Tim Otten [Sat, 5 Dec 2015 23:56:53 +0000 (15:56 -0800)]
System.get API - Return current PHP + MySQL time
Tim Otten [Sat, 5 Dec 2015 23:50:52 +0000 (15:50 -0800)]
System.get API - Return MySQL settings
Tim Otten [Sat, 5 Dec 2015 22:09:43 +0000 (14:09 -0800)]
System.get API - Return CMS version
Tim Otten [Sat, 5 Dec 2015 23:51:29 +0000 (15:51 -0800)]
crmCxnManageCtrl - Style rows
Tim Otten [Sat, 5 Dec 2015 22:05:01 +0000 (14:05 -0800)]
crmCxnManageCtrl - Consistently show app name in dialog titles
Tim Otten [Sat, 5 Dec 2015 22:00:52 +0000 (14:00 -0800)]
crmCxnManageCtrl - Provide informational dialog
Tim Otten [Sat, 5 Dec 2015 21:43:36 +0000 (13:43 -0800)]
crmCxnManageCtrl - Display appId and appUrl
Tim Otten [Sat, 5 Dec 2015 21:31:49 +0000 (13:31 -0800)]
crmCxn - Add "Reconnect" option
Tim Otten [Sat, 5 Dec 2015 21:13:38 +0000 (13:13 -0800)]
crmCxnManageCtrl - Style rows. Move links into dropdown.
Tim Otten [Sat, 5 Dec 2015 04:58:34 +0000 (20:58 -0800)]
CRM_Cxn_BAO_Cxn::createRegistrationClient - Support proxies
Tim Otten [Sat, 5 Dec 2015 04:57:19 +0000 (20:57 -0800)]
composer.json - Update civicrm/civicrm-cxn-rpc
Dave Greenberg [Fri, 4 Dec 2015 19:31:27 +0000 (11:31 -0800)]
Merge pull request #7178 from jmcclelland/CRM-17493
CRM-17493 - fix import of checkbox'ed data
Eileen McNaughton [Fri, 4 Dec 2015 05:41:36 +0000 (18:41 +1300)]
Merge pull request #7375 from agh1/hook-civicrm-alterprintheader
Add regions for report headers
Dave Greenberg [Thu, 3 Dec 2015 23:48:27 +0000 (15:48 -0800)]
Merge pull request #7357 from jitendrapurohit/CRM-17504-46
4.6 Backport Case Activity report fix
Coleman Watts [Thu, 3 Dec 2015 19:41:37 +0000 (14:41 -0500)]
Fix broken table in languages other than English
Table layout was broken because code was relying on english label "Soft Credit For".
There may well be a better way to do this, but at least it's not as broken as before.
Conflicts:
templates/CRM/Contribute/Form/Selector.tpl
Andrew Hunt [Thu, 3 Dec 2015 19:44:41 +0000 (14:44 -0500)]
CRM-17658 PDFs: rename pdf-header region to export-document-header
----------------------------------------
* CRM-17658: Can't alter header of PDF report
https://issues.civicrm.org/jira/browse/CRM-17658
Andrew Hunt [Thu, 3 Dec 2015 17:46:36 +0000 (12:46 -0500)]
CRM-17658 Reports: add new region for default report HTML header
Andrew Hunt [Thu, 3 Dec 2015 17:29:00 +0000 (12:29 -0500)]
CRM-17658 PDFs: add new region 'pdf-header' in head of PDFs
Eileen McNaughton [Thu, 3 Dec 2015 10:17:27 +0000 (23:17 +1300)]
Merge pull request #7364 from eileenmcnaughton/CRM-17653
CRM-17653 save contribution_recur_id to back office contribution on r…
eileenmcnaugton [Thu, 3 Dec 2015 01:59:35 +0000 (14:59 +1300)]
CRM-17653 save contribution_recur_id to back office contribution on recurring renewal
Dave Greenberg [Thu, 3 Dec 2015 00:51:22 +0000 (16:51 -0800)]
Merge pull request #7337 from eileenmcnaughton/CRM-17636-46
CRM-17636 fix for items not being recorded correctly (modified_date, …
jitendrapurohit [Wed, 2 Dec 2015 09:07:35 +0000 (14:37 +0530)]
minor fix
jitendrapurohit [Wed, 2 Dec 2015 08:39:04 +0000 (14:09 +0530)]
4.6 Backport Case Activity report fix
projects / civicrm-core.git / log