Eileen McNaughton [Thu, 26 Nov 2015 22:46:33 +0000 (11:46 +1300)]
Merge pull request #7321 from eileenmcnaughton/master
comment tidies
eileenmcnaugton [Thu, 26 Nov 2015 22:04:30 +0000 (11:04 +1300)]
CRM-17539 test tweaks to make non-zero tests pass on master
In the case of the non-separate payment there is an email change from 4.6 (2 emails rather than 1) this is noted
on the ticket & we will adjust the tests to not fail on that at this stage (pending further analysis of that)
Eileen McNaughton [Thu, 26 Nov 2015 21:44:58 +0000 (10:44 +1300)]
Merge pull request #7320 from eileenmcnaughton/CRM-17539
Crm 17539
eileenmcnaugton [Thu, 26 Nov 2015 21:24:26 +0000 (10:24 +1300)]
comment tidies
Eileen McNaughton [Thu, 26 Nov 2015 21:02:04 +0000 (10:02 +1300)]
Merge pull request #7319 from eileenmcnaughton/master
Partial merge of 4.6 to master
eileenmcnaughton [Thu, 26 Nov 2015 20:54:15 +0000 (20:54 +0000)]
CRM-17519 further leaky var fix on useForMember
(this leakage was blocking fixing CRM-17539 - it might be 'in the wild' like the other leakage - but the impact of it
if that the receipt looks slightly different & it would not be noticeable (potentially)
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
Conflicts:
CRM/Contribute/BAO/ContributionPage.php
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 19:32:17 +0000 (08:32 +1300)]
Merge pull request #7316 from rohankatkar/CRM-17621
CRM-17621
Eileen McNaughton [Thu, 26 Nov 2015 19:31:56 +0000 (08:31 +1300)]
Merge pull request #7315 from sudhabisht/CRM-17143
Warning Fix
Eileen McNaughton [Thu, 26 Nov 2015 19:29:39 +0000 (08:29 +1300)]
Merge pull request #7288 from eileenmcnaughton/CRM-17559
CRM-17559 autorenew membership fix - front end form
Eileen McNaughton [Thu, 26 Nov 2015 19:15:26 +0000 (08:15 +1300)]
Merge pull request #7311 from eileenmcnaughton/CRM-17275-prelim
CRM-17275 preliminary tidy-ups, remove unused vars & fix comments & r…
colemanw [Thu, 26 Nov 2015 17:28:41 +0000 (12:28 -0500)]
Merge pull request #7306 from colemanw/caseTokens
CRM-17606 - Support case tokens when creating PDF
colemanw [Thu, 26 Nov 2015 15:10:33 +0000 (10:10 -0500)]
Merge pull request #7312 from eileenmcnaughton/merge
Merge 4.6 to master
colemanw [Thu, 26 Nov 2015 15:05:26 +0000 (10:05 -0500)]
Merge pull request #7313 from JKingsnorth/CRM-17625
CRM-17625 Dispell the evil eye
Web Access [Thu, 26 Nov 2015 13:33:51 +0000 (19:03 +0530)]
CRM-17621
Sudha Bisht [Thu, 26 Nov 2015 12:50:04 +0000 (18:20 +0530)]
Warning Fix
JKingsnorth [Thu, 26 Nov 2015 09:17:45 +0000 (09:17 +0000)]
CRM-17625 Dispell the evil eye
eileenmcnaugton [Thu, 26 Nov 2015 08:11:03 +0000 (21:11 +1300)]
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
Conflicts:
CRM/Core/Payment/AuthorizeNetIPN.php
tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php
tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ContributionPageTest.php
tests/phpunit/api/v3/ContributionTest.php
tests/phpunit/api/v3/PledgePaymentTest.php
tests/phpunit/api/v3/TaxContributionPageTest.php
eileenmcnaugton [Sun, 18 Oct 2015 22:18:11 +0000 (11:18 +1300)]
CRM-17275 preliminary tidy-ups, remove unused vars & fix comments & re-use test code
Conflicts:
CRM/Contact/Import/Parser.php
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)
Kurund Jalmi [Thu, 26 Nov 2015 03:31:49 +0000 (09:01 +0530)]
Merge pull request #7308 from colemanw/fa
CRM-16415 - A few more fa icons
Coleman Watts [Thu, 26 Nov 2015 02:00:49 +0000 (21:00 -0500)]
CRM-16415 - Stray button icons
Coleman Watts [Thu, 26 Nov 2015 01:48:16 +0000 (20:48 -0500)]
CRM-16415 - A few more fa icons
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
Coleman Watts [Wed, 25 Nov 2015 23:52:03 +0000 (18:52 -0500)]
CRM-17606 - Limit case token list to only relevant custom fields
Coleman Watts [Wed, 25 Nov 2015 23:44:23 +0000 (18:44 -0500)]
CRM-17606 - Case token fixes
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
Eileen McNaughton [Wed, 25 Nov 2015 22:55:27 +0000 (11:55 +1300)]
Merge pull request #7300 from eileenmcnaughton/CRM-17519-46
CRM-17519 add test to (fail to) demonstrate leakage
Coleman Watts [Wed, 25 Nov 2015 22:28:15 +0000 (17:28 -0500)]
CRM-17606 - Add 'Print Document' button on manage case screen
eileen [Wed, 25 Nov 2015 11:26:17 +0000 (00:26 +1300)]
CRM-17519 add test to (fail to) demonstrate leakage
Eileen McNaughton [Wed, 25 Nov 2015 21:48:58 +0000 (10:48 +1300)]
Merge pull request #7298 from eileenmcnaughton/CRM-17539-partial
CRM-17539 cosmetic fixes
Coleman Watts [Wed, 25 Nov 2015 20:27:07 +0000 (15:27 -0500)]
CRM-17606 - Support case tokens when creating PDF
colemanw [Wed, 25 Nov 2015 18:17:02 +0000 (13:17 -0500)]
Merge pull request #7304 from JKingsnorth/CRM-17622
CRM-17622 Remove unused icons
colemanw [Wed, 25 Nov 2015 18:13:15 +0000 (13:13 -0500)]
Merge pull request #7305 from colemanw/Css
Css fixes
Coleman Watts [Wed, 25 Nov 2015 18:07:20 +0000 (13:07 -0500)]
Css fixes
Kurund Jalmi [Wed, 25 Nov 2015 16:03:00 +0000 (21:33 +0530)]
Merge pull request #7303 from rohankatkar/master_webtests
Tests Fixes
JKingsnorth [Wed, 25 Nov 2015 14:35:17 +0000 (14:35 +0000)]
CRM17622 Remove unused icons
Monish Deb [Wed, 25 Nov 2015 13:23:34 +0000 (18:53 +0530)]
Merge pull request #7299 from sudhabisht/CRM-17612
Fix for Pledge update issue
Monish Deb [Wed, 25 Nov 2015 13:18:12 +0000 (18:48 +0530)]
Merge pull request #7302 from monishdeb/testFailures
4.7beta1 fix for phpunit test failures
monishdeb [Wed, 25 Nov 2015 13:17:29 +0000 (18:47 +0530)]
minor fix
Web Access [Wed, 25 Nov 2015 13:16:06 +0000 (18:46 +0530)]
Tests Fixes
monishdeb [Wed, 25 Nov 2015 12:26:49 +0000 (17:56 +0530)]
minor fix
monishdeb [Wed, 25 Nov 2015 12:18:51 +0000 (17:48 +0530)]
4.7beta1 fix for phpunit test failures
eileen [Wed, 25 Nov 2015 10:16:37 +0000 (23:16 +1300)]
CRM-17519 minor fixes to support test expansion
eileen [Wed, 25 Nov 2015 08:36:28 +0000 (21:36 +1300)]
CRM-17519 add test to catch any leakage at IPN level
Sudha Bisht [Wed, 25 Nov 2015 09:49:54 +0000 (15:19 +0530)]
Minor fix
Sudha Bisht [Wed, 25 Nov 2015 09:01:20 +0000 (14:31 +0530)]
Pledge update issue fix
eileen [Wed, 25 Nov 2015 07:36:51 +0000 (20:36 +1300)]
CRM-17539 cosmetic fixes
Just a couple of non-changing fixes syphoned off the main PR to allow me to simplify it
Kurund Jalmi [Wed, 25 Nov 2015 06:24:09 +0000 (11:54 +0530)]
Merge pull request #7279 from davecivicrm/CRM-16761b
Crm 16761b
colemanw [Tue, 24 Nov 2015 22:26:08 +0000 (17:26 -0500)]
Merge pull request #7294 from colemanw/tree
CRM-17617 - Remove unused files
colemanw [Tue, 24 Nov 2015 21:00:33 +0000 (16:00 -0500)]
Merge pull request #7226 from eileenmcnaughton/CRM-17155-only
CRM-17155 improve links & options from all reports page
Coleman Watts [Tue, 24 Nov 2015 20:28:32 +0000 (15:28 -0500)]
CRM-17617 - Remove unused files
colemanw [Tue, 24 Nov 2015 20:11:18 +0000 (15:11 -0500)]
Merge pull request #7290 from monishdeb/testFailures
CRM-16203 conflict fix in master
Eileen McNaughton [Tue, 24 Nov 2015 19:27:37 +0000 (08:27 +1300)]
Merge pull request #7282 from eileenmcnaughton/CRM-17454
CRM-17454 fix slow dedupe query (on load 2 contacts not on find)
Eileen McNaughton [Tue, 24 Nov 2015 19:26:11 +0000 (08:26 +1300)]
Merge pull request #7285 from eileenmcnaughton/master
remove some unused variables & add comments
Monish Deb [Tue, 24 Nov 2015 14:42:50 +0000 (20:12 +0530)]
Merge pull request #7292 from sudhabisht/webtestfix2
Added skipped and webtest fix
Monish Deb [Tue, 24 Nov 2015 14:41:12 +0000 (20:11 +0530)]
Merge pull request #7291 from rohankatkar/webtest_master
Webtests Fixes - master
Sudha Bisht [Tue, 24 Nov 2015 13:44:50 +0000 (19:14 +0530)]
Added skipped and fix some webtest
Web Access [Tue, 24 Nov 2015 13:25:18 +0000 (18:55 +0530)]
Webtests Fixes - master
Monish Deb [Tue, 24 Nov 2015 11:28:55 +0000 (16:58 +0530)]
Merge pull request #7271 from jitendrapurohit/CRM-17613
CRM-17613 -- On view of register participant info, Selection section …
Monish Deb [Tue, 24 Nov 2015 09:46:11 +0000 (15:16 +0530)]
Merge pull request #7287 from eileenmcnaughton/CRM-17539-4
CRM-17539 fix enotice on zero dollar receipt
Yashodha Chaku [Tue, 24 Nov 2015 07:51:49 +0000 (13:21 +0530)]
Merge pull request #7281 from mlutfy/4.7-crm13934
CRM-13934: Fix for saving dedupe rules in non-English.
monishdeb [Tue, 24 Nov 2015 07:33:03 +0000 (13:03 +0530)]
CRM-16203 conflict fix in master
----------------------------------------
* CRM-16203:
https://issues.civicrm.org/jira/browse/CRM-16203
jitendrapurohit [Tue, 24 Nov 2015 05:32:03 +0000 (11:02 +0530)]
use implodepadded
eileen [Mon, 16 Nov 2015 11:04:45 +0000 (03:04 -0800)]
CRM-17559 autorenew membership fix - front end form
eileen [Sun, 15 Nov 2015 21:47:32 +0000 (13:47 -0800)]
CRM-17539 fix enotice on zero dollar receipt
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 [Tue, 24 Nov 2015 04:21:00 +0000 (17:21 +1300)]
remove some unused variables & add comments
Eileen McNaughton [Tue, 24 Nov 2015 03:59:58 +0000 (16:59 +1300)]
Merge pull request #7284 from eileenmcnaughton/master
code comments
eileen [Tue, 24 Nov 2015 03:58:56 +0000 (16:58 +1300)]
code comments
eileen [Fri, 6 Nov 2015 23:27:33 +0000 (15:27 -0800)]
CRM-17155 improve links & options from all reports page
This allows people to view the report in various formats, delete or update it from the all reports page
eileen [Tue, 24 Nov 2015 02:51:14 +0000 (15:51 +1300)]
CRM-17454 add tests for dedupe query
Eileen McNaughton [Tue, 24 Nov 2015 03:03:48 +0000 (16:03 +1300)]
Merge pull request #7280 from eileenmcnaughton/master
Remove defunct reference to cdType from case form
eileen [Tue, 24 Nov 2015 02:50:55 +0000 (15:50 +1300)]
CRM-17454 fix slow dedupe query
Mathieu Lutfy [Tue, 24 Nov 2015 02:27:59 +0000 (21:27 -0500)]
CRM-13934: Fix for saving dedupe rules in non-English.
eileen [Tue, 24 Nov 2015 02:06:17 +0000 (15:06 +1300)]
Remove defunct reference to cdType from case form
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
colemanw [Tue, 24 Nov 2015 00:46:34 +0000 (19:46 -0500)]
Merge pull request #7268 from colemanw/userSystem
Add userSystem to Civi facade... or don't
Dave Greenberg [Tue, 24 Nov 2015 00:23:41 +0000 (16:23 -0800)]
CRM-16761 - New version of civicrm_generated.mysql.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
Dave Greenberg [Mon, 23 Nov 2015 23:55:26 +0000 (15:55 -0800)]
CRM-16761 - Form and message template fixes.
----------------------------------------
* CRM-16761: Self service view, update and cancel for CiviEvent
https://issues.civicrm.org/jira/browse/CRM-16761
Dave Greenberg [Mon, 23 Nov 2015 20:05:03 +0000 (12:05 -0800)]
Merge pull request #7228 from mollux/CRM-17582
CRM-17582 - Allow filtering on deleted participants.
Dave Greenberg [Mon, 23 Nov 2015 18:25:26 +0000 (10:25 -0800)]
Merge pull request #7249 from davecivicrm/CRM-16761a
CRM-16761 - Forms, templates and message template changes.
Kurund Jalmi [Mon, 23 Nov 2015 17:31:42 +0000 (23:01 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27
colemanw [Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)]
Merge pull request #7266 from jmcclelland/CRM-17586-master
Crm 17586 master
colemanw [Mon, 23 Nov 2015 15:41:20 +0000 (10:41 -0500)]
Merge pull request #7109 from jitendrapurohit/CRM-9428
CRM-9428 - Using custom field data specified with hook_civicrm_custom…
colemanw [Mon, 23 Nov 2015 15:41:03 +0000 (10:41 -0500)]
Merge pull request #7215 from totten/master-sql-log
CRM-17394 - Initialize DB slightly later. Fix query-log and redundant SET NAMES.
Coleman Watts [Mon, 23 Nov 2015 15:35:00 +0000 (10:35 -0500)]
Initial refactor of CRM_Utils_System to use magic method.
Instead of creating one static function for every CMS function we can access them via magic method.
Jamie McClelland [Mon, 23 Nov 2015 15:26:14 +0000 (10:26 -0500)]
CRM-17586 - fixed last coding style problem.
Monish Deb [Mon, 23 Nov 2015 15:11:20 +0000 (20:41 +0530)]
Merge pull request #7274 from monishdeb/testFailures
4.7beta1 w/o skip Webtest fixes
Monish Deb [Mon, 23 Nov 2015 15:09:23 +0000 (20:39 +0530)]
Merge pull request #7273 from sudhabisht/webtestfix
Webtest Fix
Monish Deb [Mon, 23 Nov 2015 15:08:51 +0000 (20:38 +0530)]
Merge pull request #7272 from rohankatkar/master_webtests
Webtests Fix
monishdeb [Mon, 23 Nov 2015 15:04:53 +0000 (20:34 +0530)]
4.7beta1 w/o skip Webtest fixes
projects / civicrm-core.git / log