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
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
Eileen McNaughton [Wed, 2 Dec 2015 02:26:29 +0000 (15:26 +1300)]
Merge pull request #7340 from eileenmcnaughton/CRM-17394-helper
CRM-17641backport Civi class helpers
colemanw [Wed, 2 Dec 2015 01:39:09 +0000 (20:39 -0500)]
Merge pull request #7352 from seamuslee001/CRM-17637
CRM-17637 Reduce checktime out to 1s instead of 5 to avoide slowdown …
Seamus Lee [Wed, 2 Dec 2015 01:35:38 +0000 (01:35 +0000)]
CRM-17637 Reduce checktime out to 1s instead of 5 to avoide slowdown in remote servers
colemanw [Wed, 2 Dec 2015 01:35:11 +0000 (20:35 -0500)]
Merge pull request #7351 from colemanw/crm-public
crm-public fix select2 height
Coleman Watts [Wed, 2 Dec 2015 01:34:45 +0000 (20:34 -0500)]
crm-public fix select2 height
Eileen McNaughton [Tue, 1 Dec 2015 07:22:38 +0000 (20:22 +1300)]
Merge pull request #7270 from eileenmcnaughton/CRM-17611
CRM-17611 do not set dummy trxn_id on declines and do not attempt to …
jitendrapurohit [Wed, 23 Sep 2015 09:58:53 +0000 (15:28 +0530)]
include civi.php in distmaker
eileen [Tue, 1 Dec 2015 01:42:38 +0000 (14:42 +1300)]
CRM-17394 backport Civi class to support utf names fix
This makes it easier to backport 'bits & pieces' that use the 4.7 helpers
Change-Id: Iad9f68a4f6b0188c981ead707fa2bcf2b3dca3b7
eileenmcnaughton [Mon, 30 Nov 2015 05:40:50 +0000 (05:40 +0000)]
CRM-17636 fix for items not being recorded correctly (modified_date, invoice_id, is_email_receipt. Partial fix on contribution_status_id - covers setting to pending but not yet updating to In Progress
Conflicts:
CRM/Member/Form/MembershipRenewal.php
Monish Deb [Fri, 27 Nov 2015 13:03:14 +0000 (18:33 +0530)]
Merge pull request #7314 from jitendrapurohit/CRM-17596
CRM-17595 and CRM-17596 -- Case Export Issues
Eileen McNaughton [Thu, 26 Nov 2015 20:32:53 +0000 (09:32 +1300)]
Merge pull request #7310 from eileenmcnaughton/CRM-17519
CRM-17519 refactor assignment of profile parameters so they don't leak
colemanw [Thu, 26 Nov 2015 15:12:05 +0000 (10:12 -0500)]
Merge pull request #6972 from guanhuan/update-contrib-page-templates
Add crm-public-form-item class to contribution page and add possibili…
Guanhuan Chen [Thu, 26 Nov 2015 13:23:29 +0000 (13:23 +0000)]
Move div pair into OnBehalfOf.tpl with condition on front-end
jitendrapurohit [Thu, 26 Nov 2015 09:45:10 +0000 (15:15 +0530)]
CRM-17595 and CRM-17596 -- Case Export Issues
eileenmcnaugton [Thu, 26 Nov 2015 07:44:10 +0000 (20:44 +1300)]
comment & whitepace
eileenmcnaugton [Thu, 26 Nov 2015 07:09:32 +0000 (20:09 +1300)]
CRM-17519 refactor assignment of profile parameters so they don't leak
eileenmcnaugton [Thu, 26 Nov 2015 07:08:35 +0000 (20:08 +1300)]
CRM-17519 add test for leaky smarty params (profile vars)
eileenmcnaugton [Thu, 26 Nov 2015 07:05:36 +0000 (20:05 +1300)]
Test fix - allow clear messages to clear multiple messages
Eileen McNaughton [Thu, 26 Nov 2015 06:15:41 +0000 (19:15 +1300)]
Merge pull request #7309 from eileenmcnaughton/CRM-17539-46
Additional tests on 4.6 (CRM-17519 CRM17539)
eileen [Wed, 25 Nov 2015 10:16:37 +0000 (23:16 +1300)]
CRM-17519 minor fixes to support test expansion
Conflicts:
tests/phpunit/CiviTest/CiviUnitTestCase.php
eileenmcnaugton [Wed, 25 Nov 2015 22:58:41 +0000 (11:58 +1300)]
CRM-17539 preliminary tests on receipts for memberships
eileenmcnaugton [Wed, 25 Nov 2015 21:42:31 +0000 (10:42 +1300)]
Further synchronisation of tests from master to 4.6 to allow portability
eileen [Wed, 25 Nov 2015 11:26:17 +0000 (00:26 +1300)]
CRM-17519 add test to (fail to) demonstrate leakage
eileen [Wed, 25 Nov 2015 08:36:28 +0000 (21:36 +1300)]
CRM-17519 add test to catch any leakage at IPN level
eileenmcnaugton [Wed, 25 Nov 2015 21:24:36 +0000 (10:24 +1300)]
Synchronize test classes from master
Add extra functions & change contributionCreate signature in 4.6 to match master
Eileen McNaughton [Wed, 25 Nov 2015 23:33:35 +0000 (12:33 +1300)]
Merge pull request #7269 from eileenmcnaughton/CRM-17610
CRM-17610 replace exits with exceptions in IPN processing
JKingsnorth [Tue, 24 Nov 2015 15:13:16 +0000 (15:13 +0000)]
Fix 'add new' JS target on merge screen and duplicated JS function
Eileen McNaughton [Tue, 24 Nov 2015 04:56:11 +0000 (17:56 +1300)]
Merge pull request #7203 from civicrm/eileenmcnaughton-patch-1
[DO NOT MERGE to master] Update 4.6 toxic code comment
Eileen McNaughton [Tue, 24 Nov 2015 02:04:42 +0000 (15:04 +1300)]
Merge pull request #7207 from totten/4.6-js-style
jshint fixes
eileenmcnaugton [Sun, 22 Nov 2015 23:56:46 +0000 (12:56 +1300)]
CRM-17611 do not set dummy trxn_id on declines and do not attempt to validate non-existent trxn_id
eileenmcnaugton [Sun, 22 Nov 2015 22:39:03 +0000 (11:39 +1300)]
CRM-17610 replace exits with exceptions in IPN processing
colemanw [Sun, 22 Nov 2015 01:22:28 +0000 (20:22 -0500)]
Merge pull request #6732 from pradpnayak/CRM-17209
--CRM-17209, fixed notice error when contribution status is changed f…
colemanw [Sat, 21 Nov 2015 13:33:55 +0000 (08:33 -0500)]
Merge pull request #7264 from jaapjansma/CRM-17601
Fixed #CRM-17601 show custom fields on case reports
Jaap Jansma [Sat, 21 Nov 2015 08:55:31 +0000 (09:55 +0100)]
fixed #CRM-17601 commit was incomplete last time
Dave Greenberg [Fri, 20 Nov 2015 18:52:06 +0000 (10:52 -0800)]
Merge pull request #7262 from jaapjansma/CRM-17382
fixed #CRM-17382
Jaap Jansma [Fri, 20 Nov 2015 13:03:02 +0000 (14:03 +0100)]
Fixed #CRM-17601 show custom fields on case reports
Jaap Jansma [Fri, 20 Nov 2015 12:48:15 +0000 (13:48 +0100)]
fixed #CRM-17382
Monish Deb [Fri, 20 Nov 2015 05:38:06 +0000 (11:08 +0530)]
Merge pull request #7257 from monishdeb/testFailures
CRM-17520 webtest fix
monishdeb [Fri, 20 Nov 2015 05:33:44 +0000 (11:03 +0530)]
CRM-17520 webtest fix
----------------------------------------
* CRM-17520: Wrong Non-deductable amount after doing back-office contribution with is_deductible = TRUE and no premium
https://issues.civicrm.org/jira/browse/CRM-17520
Coleman Watts [Fri, 20 Nov 2015 00:40:57 +0000 (19:40 -0500)]
Merge branch 'aydun-CRM-16203' into 4.6
Conflicts:
CRM/Report/Form.php
colemanw [Thu, 19 Nov 2015 23:34:03 +0000 (18:34 -0500)]
Merge pull request #7176 from christianwach/crm-17543
CRM-17543 Bootstrapping WordPress triggers multiple PHP warnings and plugin load failures
colemanw [Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)]
Merge pull request #7254 from monishdeb/CRM-17417
CRM-17417 and CRM-17418 fixes
monishdeb [Thu, 19 Nov 2015 17:30:34 +0000 (23:00 +0530)]
format fix
Monish Deb [Thu, 19 Nov 2015 14:06:03 +0000 (19:36 +0530)]
Merge pull request #7246 from agileware/4.6-CRM-17417
CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant
monishdeb [Thu, 19 Nov 2015 14:03:38 +0000 (19:33 +0530)]
CRM-17417 and CRM-17418 fixes
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
* CRM-17418: Cancelling a taxable contribution writes incorrect values to the database
https://issues.civicrm.org/jira/browse/CRM-17418
colemanw [Thu, 19 Nov 2015 01:53:31 +0000 (20:53 -0500)]
Merge pull request #7247 from colemanw/explorer
Api explorer - fix getfields action list
Coleman Watts [Wed, 18 Nov 2015 22:58:05 +0000 (17:58 -0500)]
Api explorer - fix getfields action list
Vaibhav Sagar [Wed, 18 Nov 2015 22:45:45 +0000 (09:45 +1100)]
CRM-17417: Modify conditional so that tax is not reapplied on edit.
----------------------------------------
* CRM-17417: Tax is reapplied when editing a contribution associated with a membership or participant entity unless the status is changed.
https://issues.civicrm.org/jira/browse/CRM-17417
Pradeep Nayak [Thu, 12 Nov 2015 05:02:07 +0000 (10:32 +0530)]
--CRM-17418, fixed amount during cancelling completed contribution when tax is enabled
Monish Deb [Wed, 18 Nov 2015 15:54:11 +0000 (21:24 +0530)]
Merge pull request #7240 from sudhabisht/WebtestFix46
Webtest Fix
Sudha Bisht [Wed, 18 Nov 2015 10:51:43 +0000 (16:21 +0530)]
Webtest Fix
Yashodha Chaku [Wed, 18 Nov 2015 08:40:19 +0000 (14:10 +0530)]
Merge pull request #6733 from pradpnayak/CRM-16801
--CRM-16801, Replaced $_REQUEST with $_POST
Monish Deb [Wed, 18 Nov 2015 07:26:34 +0000 (12:56 +0530)]
Merge pull request #7229 from yashodha/CRM-17564
CRM-17564: Dedupe rule doesnt appear to be working correctly
Monish Deb [Tue, 17 Nov 2015 19:00:21 +0000 (00:30 +0530)]
Merge pull request #7233 from sudhabisht/WebtestFix46
Webtest Fix
Monish Deb [Tue, 17 Nov 2015 15:03:11 +0000 (20:33 +0530)]
Merge pull request #7227 from yashodha/CRM-17563
CRM-17563
Sudha Bisht [Tue, 17 Nov 2015 13:53:47 +0000 (19:23 +0530)]
Fix
Sudha Bisht [Tue, 17 Nov 2015 13:45:27 +0000 (19:15 +0530)]
Minor fix
Sudha Bisht [Tue, 17 Nov 2015 13:27:46 +0000 (18:57 +0530)]
WebtestFix
yashodha [Tue, 17 Nov 2015 10:33:13 +0000 (16:03 +0530)]
CRM-17564: minor fix
----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
https://issues.civicrm.org/jira/browse/CRM-17564
yashodha [Tue, 17 Nov 2015 09:54:03 +0000 (15:24 +0530)]
CRM-17564: Dedupe rule doesnt appear to be working correctly
----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
https://issues.civicrm.org/jira/browse/CRM-17564
yashodha [Tue, 17 Nov 2015 07:47:59 +0000 (13:17 +0530)]
minor format fix
yashodha [Tue, 17 Nov 2015 06:35:09 +0000 (12:05 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule
----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
https://issues.civicrm.org/jira/browse/CRM-17563
Dave Greenberg [Mon, 16 Nov 2015 23:57:44 +0000 (15:57 -0800)]
Merge pull request #7221 from agh1/sort-event-date-46
CRM-17579 Reports - sort by event start date in participant report
Andrew Hunt [Mon, 16 Nov 2015 19:24:51 +0000 (14:24 -0500)]
CRM-17579 Reports - sort by event start date in participant report
----------------------------------------
* CRM-17579: Sort by event date in participant report
https://issues.civicrm.org/jira/browse/CRM-17579
Dave Greenberg [Mon, 16 Nov 2015 19:18:01 +0000 (11:18 -0800)]
Merge pull request #7217 from jitendrapurohit/CRM-17565
CRM-17565 -- Clicking case status link on case dashboard does not ope…
Monish Deb [Mon, 16 Nov 2015 17:34:42 +0000 (23:04 +0530)]
Merge pull request #7219 from sudhabisht/WebtestFix46
Webtest Fix
projects / civicrm-core.git / log