Eileen McNaughton [Tue, 1 Dec 2015 07:20:01 +0000 (20:20 +1300)]
Merge pull request #7339 from civicrm/eileenmcnaughton-patch-1
Remove odd language construct
Eileen McNaughton [Tue, 1 Dec 2015 06:59:07 +0000 (19:59 +1300)]
Merge pull request #7098 from seamuslee001/CRM-17471
CRM-17471 Add test to prove the bug
colemanw [Tue, 1 Dec 2015 01:01:30 +0000 (20:01 -0500)]
Merge pull request #7332 from colemanw/CRM-14272
CRM-14272 - Fix inherited membership relationship date handling
Dave Greenberg [Mon, 30 Nov 2015 22:11:20 +0000 (14:11 -0800)]
Merge pull request #7326 from monishdeb/CRM-16901
CRM-16901 Offline Recurring Payments
colemanw [Mon, 30 Nov 2015 19:49:20 +0000 (14:49 -0500)]
Merge pull request #7334 from colemanw/D8
D8 - Fix url function
Kurund Jalmi [Mon, 30 Nov 2015 10:34:12 +0000 (16:04 +0530)]
Merge pull request #7327 from jitendrapurohit/CRM-13678
CRM-13678 - Make tabset hook generic
jitendrapurohit [Mon, 30 Nov 2015 09:58:16 +0000 (15:28 +0530)]
minor fix
jitendrapurohit [Mon, 30 Nov 2015 06:11:33 +0000 (11:41 +0530)]
undo tabset changes for Contact Summary page
Coleman Watts [Sun, 29 Nov 2015 22:44:31 +0000 (17:44 -0500)]
CRM-14272 - Fix inherited membership relationship date handling
Coleman Watts [Mon, 30 Nov 2015 03:15:35 +0000 (22:15 -0500)]
Convert to old array syntax for the sake of jenkins
Coleman Watts [Mon, 30 Nov 2015 02:13:57 +0000 (21:13 -0500)]
Update docblocks
Coleman Watts [Mon, 30 Nov 2015 00:12:32 +0000 (19:12 -0500)]
D8 - Fix url function
colemanw [Sun, 29 Nov 2015 23:27:38 +0000 (18:27 -0500)]
Merge pull request #7333 from kcristiano/CRM-14987
CRM-14987 add commented out option for CIVICRM_CMSDIR
Kevin Cristiano [Sun, 29 Nov 2015 23:20:20 +0000 (18:20 -0500)]
CRM-14987 add commented out option for CIVICRM_CMSDIR
----------------------------------------
* CRM-14987: WordPress cmsRootPath can incorrectly return unrelated CMS install
https://issues.civicrm.org/jira/browse/CRM-14987
colemanw [Sun, 29 Nov 2015 19:26:37 +0000 (14:26 -0500)]
Merge pull request #7324 from kcristiano/CRM16408
CRM-16408 add back block for all non-wp CMS. Correction PR 6807
colemanw [Sun, 29 Nov 2015 18:58:43 +0000 (13:58 -0500)]
Merge pull request #7331 from colemanw/css
CRM-17634 - Remove unused css
Coleman Watts [Sun, 29 Nov 2015 18:56:02 +0000 (13:56 -0500)]
CRM-17634 - Remove unused icon
colemanw [Sun, 29 Nov 2015 15:52:40 +0000 (10:52 -0500)]
Merge pull request #7318 from JKingsnorth/CRM-17626
CRM-17626 Move BULK_MAIL_INSERT_COUNT
Coleman Watts [Sun, 29 Nov 2015 15:34:01 +0000 (10:34 -0500)]
Remove unused Gcc files
Coleman Watts [Sun, 29 Nov 2015 15:27:09 +0000 (10:27 -0500)]
CRM-17634 - Remove unused css
Kurund Jalmi [Sat, 28 Nov 2015 05:44:50 +0000 (11:14 +0530)]
Merge pull request #7328 from rohankatkar/WEBTESTS_FIXES_MASTER
Webtests
colemanw [Sat, 28 Nov 2015 03:00:29 +0000 (22:00 -0500)]
Merge pull request #7330 from colemanw/classApi
Update class.api to send params as json
Coleman Watts [Sat, 28 Nov 2015 02:53:07 +0000 (21:53 -0500)]
Minor cleanup
Coleman Watts [Sat, 28 Nov 2015 02:09:44 +0000 (21:09 -0500)]
Remove unused function
Coleman Watts [Fri, 27 Nov 2015 19:12:25 +0000 (14:12 -0500)]
Update class.api to send params as json
Dave Greenberg [Fri, 27 Nov 2015 17:47:11 +0000 (09:47 -0800)]
Merge pull request #7297 from jitendrapurohit/selfservice
CRM-16761 -- Self service view, update and cancel for CiviEvent
colemanw [Fri, 27 Nov 2015 16:00:15 +0000 (11:00 -0500)]
Merge pull request #7329 from lcdservices/CRM-17524
CRM-17524 additional fix to joomla user record display
Brian Shaughnessy [Fri, 27 Nov 2015 15:47:44 +0000 (10:47 -0500)]
CRM-17524 additional fix to joomla user record display
Web Access [Fri, 27 Nov 2015 13:18:56 +0000 (18:48 +0530)]
Webtests
jitendrapurohit [Fri, 27 Nov 2015 11:47:55 +0000 (17:17 +0530)]
style fixes
monishdeb [Fri, 27 Nov 2015 11:37:12 +0000 (17:07 +0530)]
format fixes
jitendrapurohit [Fri, 27 Nov 2015 11:11:17 +0000 (16:41 +0530)]
CRM-13678 - Make tabset hook generic
monishdeb [Fri, 27 Nov 2015 10:44:19 +0000 (16:14 +0530)]
CRM-16901 QA changes
----------------------------------------
* CRM-16901: Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
Monish Deb [Fri, 27 Nov 2015 06:07:14 +0000 (11:37 +0530)]
Merge pull request #7317 from rohankatkar/Webtests_4.7
Webtest fix
Eileen McNaughton [Fri, 27 Nov 2015 04:43:16 +0000 (17:43 +1300)]
Remote odd language construct
Kevin Cristiano [Fri, 27 Nov 2015 02:13:16 +0000 (21:13 -0500)]
CRM-16408 add back block for all non-wp CMS. Correction PR 6807
----------------------------------------
* CRM-16408: Installer rewrite
https://issues.civicrm.org/jira/browse/CRM-16408
Eileen McNaughton [Fri, 27 Nov 2015 00:38:19 +0000 (13:38 +1300)]
Merge pull request #7323 from eileenmcnaughton/master
CRM-17539 fix zero receipts & more…
Eileen McNaughton [Thu, 26 Nov 2015 22:55:23 +0000 (11:55 +1300)]
Merge pull request #7289 from eileenmcnaughton/CRM-16929-partial
CRM-16929 partial fix for 500 error
eileenmcnaugton [Thu, 26 Nov 2015 22:53:19 +0000 (11:53 +1300)]
CRM-17539 fix "C:/Program Files (x86)/Git/bin/sh.exe" receipts & more fixes on CRM-17519 to facilitate this
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
JKingsnorth [Thu, 26 Nov 2015 15:45:43 +0000 (15:45 +0000)]
CRM-17626 Move BULK_MAIL_INSERT_COUNT
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:36:53 +0000 (19:06 +0530)]
Webtest fix
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
Dave Greenberg [Tue, 24 Nov 2015 23:13:23 +0000 (15:13 -0800)]
CRM-16901 - New files.
----------------------------------------
* CRM-16901: Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
Dave Greenberg [Tue, 24 Nov 2015 23:07:37 +0000 (15:07 -0800)]
CRM-16901 - New files.
----------------------------------------
* CRM-16901: Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
Dave Greenberg [Tue, 24 Nov 2015 22:36:25 +0000 (14:36 -0800)]
CRM-16901 - Rebased PR with a few field name and markup improvements
----------------------------------------
* CRM-16901: Offline Recurring Payments
https://issues.civicrm.org/jira/browse/CRM-16901
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
projects / civicrm-core.git / log