eileenmcnaughton [Sun, 28 Sep 2014 22:10:15 +0000 (22:10 +0000)]
CRM-15296 test for behaviour on renew with recurring
CRM-15296 mark incomplete portion of this test as incomplete so as not to commit failing tests
note that the incomplete part can be enabled when th issue is fixed
Alter Dummy processor to be test-friendly
Conflicts:
tests/phpunit/api/v3/ContributionPageTest.php
wq!
Coleman Watts [Sun, 28 Sep 2014 12:10:39 +0000 (08:10 -0400)]
Webtest fixes
Coleman Watts [Sun, 28 Sep 2014 02:28:29 +0000 (22:28 -0400)]
Additional webtest error check
colemanw [Sun, 28 Sep 2014 02:17:09 +0000 (22:17 -0400)]
Merge pull request #4254 from colemanw/checkForErrorsOnPage
Attempt to get better error messages from webtests
Coleman Watts [Sun, 28 Sep 2014 02:15:34 +0000 (22:15 -0400)]
Attempt to get better error messages from webtests
Coleman Watts [Sun, 28 Sep 2014 01:40:47 +0000 (21:40 -0400)]
Webtest cleanup
colemanw [Sun, 28 Sep 2014 01:07:17 +0000 (21:07 -0400)]
Merge pull request #4252 from civicrm/4.4
Merge branch 4.4 into 4.5
colemanw [Sun, 28 Sep 2014 01:04:15 +0000 (21:04 -0400)]
Merge pull request #4251 from colemanw/CRM-15156
CRM-15156 - Flush js cache before upgrade
Coleman Watts [Sun, 28 Sep 2014 01:03:45 +0000 (21:03 -0400)]
CRM-15156 - Flush js cache before upgrade
colemanw [Sun, 28 Sep 2014 00:48:53 +0000 (20:48 -0400)]
Merge pull request #4250 from colemanw/CRM-15382
CRM-15382 - Ensure dynamic resources are rebuilt after flushing
Coleman Watts [Sun, 28 Sep 2014 00:26:15 +0000 (20:26 -0400)]
Docblock additions
Coleman Watts [Sat, 27 Sep 2014 23:41:20 +0000 (19:41 -0400)]
CRM-15382 - Ensure dynamic resources are rebuilt after flushing
Coleman Watts [Sat, 27 Sep 2014 18:22:53 +0000 (14:22 -0400)]
Improve jQuery UI l10n
colemanw [Sat, 27 Sep 2014 17:58:32 +0000 (13:58 -0400)]
Merge pull request #4249 from colemanw/confirm
CRM.confirm - ensure that "no" goes on the right-hand side
Coleman Watts [Sat, 27 Sep 2014 17:56:44 +0000 (13:56 -0400)]
CRM.confirm - ensure that "no" goes on the right-hand side
colemanw [Sat, 27 Sep 2014 02:45:23 +0000 (22:45 -0400)]
Merge pull request #4241 from colemanw/CRM-15347
CRM-15347 - Fix popup links in event dashboard page
colemanw [Sat, 27 Sep 2014 02:41:53 +0000 (22:41 -0400)]
Merge pull request #4248 from colemanw/CRM-15275
CRM-15275 - Fix datepicker error with certain format
Coleman Watts [Sat, 27 Sep 2014 02:28:20 +0000 (22:28 -0400)]
Cleanup datePicker params
Coleman Watts [Sat, 27 Sep 2014 01:50:51 +0000 (21:50 -0400)]
CRM-15275 - Fix datepicker error with certain format
colemanw [Sat, 27 Sep 2014 01:26:39 +0000 (21:26 -0400)]
Merge pull request #4247 from colemanw/CRM-15172
CRM-15172 - Report css tweak for state/county
Coleman Watts [Sat, 27 Sep 2014 01:26:14 +0000 (21:26 -0400)]
CRM-15172 - Report css tweak for state/county
Dave Greenberg [Fri, 26 Sep 2014 21:40:24 +0000 (14:40 -0700)]
Merge pull request #4237 from monishdeb/CRM-15377
CRM-15377 fix - On changing price field option(s) from 'Change Fee Selec...
Coleman Watts [Fri, 26 Sep 2014 20:45:30 +0000 (16:45 -0400)]
Merge branch 'CRM-15365' into 4.5
colemanw [Fri, 26 Sep 2014 20:44:31 +0000 (16:44 -0400)]
Merge pull request #4245 from colemanw/CRM-15365
CRM-15365 - Windows directory fixes
colemanw [Fri, 26 Sep 2014 20:44:01 +0000 (16:44 -0400)]
Merge pull request #4244 from colemanw/CRM-15346
CRM-15346 - Ensure drupal.behaviors are triggered
Dave Greenberg [Fri, 26 Sep 2014 19:48:27 +0000 (12:48 -0700)]
Merge pull request #4243 from monishdeb/CRM-15364
CRM-15364 fix - Change Registration Selections: problems handling discou...
Coleman Watts [Fri, 26 Sep 2014 18:09:48 +0000 (14:09 -0400)]
Directory path code cleanup
Coleman Watts [Fri, 26 Sep 2014 17:44:40 +0000 (13:44 -0400)]
CRM-15365 - Prevent adding a double trailing slash
Dan Cruson [Wed, 24 Sep 2014 16:32:34 +0000 (12:32 -0400)]
CRM-15365 - Windows Directory Fixes
CRM-15365 - Fix problems with adjusting directories through the UI
colemanw [Fri, 26 Sep 2014 17:19:32 +0000 (13:19 -0400)]
Merge pull request #4193 from colemanw/CRM-15342
CRM-15342 - Fix survey type options link
colemanw [Fri, 26 Sep 2014 17:18:11 +0000 (13:18 -0400)]
Merge pull request #4240 from colemanw/enableDisable
Refresh member and contribution tabs when saving relationships
Coleman Watts [Fri, 26 Sep 2014 17:09:19 +0000 (13:09 -0400)]
CRM-15341 - move cms-specific code to appropriate file
Coleman Watts [Fri, 26 Sep 2014 17:00:52 +0000 (13:00 -0400)]
Cleanup wysiwyg.tpl
Coleman Watts [Fri, 26 Sep 2014 16:59:57 +0000 (12:59 -0400)]
CRM-15346 - Ensure drupal.behaviors are triggered
Yashodha Chaku [Fri, 26 Sep 2014 14:20:15 +0000 (19:50 +0530)]
Merge pull request #4242 from colemanw/CRM-15354
CRM-15354 - Fix undefined warning
monishdeb [Fri, 26 Sep 2014 14:10:50 +0000 (19:40 +0530)]
CRM-15364 fix - Change Registration Selections: problems handling discounted line items and full options
https://issues.civicrm.org/jira/browse/CRM-15364
Coleman Watts [Fri, 26 Sep 2014 13:56:47 +0000 (09:56 -0400)]
CRM-15354 - Fix undefined warning
Coleman Watts [Fri, 26 Sep 2014 13:41:43 +0000 (09:41 -0400)]
CRM-15347 - Fix popup links in event dashboard page
Coleman Watts [Fri, 26 Sep 2014 13:09:57 +0000 (09:09 -0400)]
Refresh member and contribution tabs when saving relationships
Coleman Watts [Fri, 26 Sep 2014 13:07:19 +0000 (09:07 -0400)]
Fix enableDisableApi to fire crmPopupFormSuccess event
Yashodha Chaku [Fri, 26 Sep 2014 12:58:16 +0000 (18:28 +0530)]
Merge pull request #4238 from NileemaJadhav/CRM-HR-45
--Notice fixes for case statuses having filter = 1
Nileema [Fri, 26 Sep 2014 12:53:47 +0000 (18:23 +0530)]
--Notice fixes for case statuses having filter = 1
monishdeb [Fri, 26 Sep 2014 12:05:34 +0000 (17:35 +0530)]
CRM-15377 fix - On changing price field option(s) from 'Change Fee Selection' doesn't update lineitem's label and unit_price
https://issues.civicrm.org/jira/browse/CRM-15377
Yashodha Chaku [Fri, 26 Sep 2014 11:31:39 +0000 (17:01 +0530)]
Merge pull request #4234 from jitendrapurohit/CRM-15368
CRM-15368
Monish Deb [Fri, 26 Sep 2014 10:29:48 +0000 (15:59 +0530)]
Merge pull request #4236 from rohankatkar/CRM--15120
Additional changes for CRM-15120
Rohan Katkar [Fri, 26 Sep 2014 10:26:09 +0000 (15:56 +0530)]
Additional changes for CRM-15120
Kurund Jalmi [Fri, 26 Sep 2014 10:18:45 +0000 (11:18 +0100)]
Merge pull request #4235 from jitendrapurohit/CRM-15368webtest
webtest for CRM-15368
jitendrapurohit [Fri, 26 Sep 2014 08:50:12 +0000 (14:20 +0530)]
webtest for CRM-15368
jitendrapurohit [Fri, 26 Sep 2014 08:41:26 +0000 (14:11 +0530)]
CRM-15368
Yashodha Chaku [Fri, 26 Sep 2014 05:51:25 +0000 (11:21 +0530)]
Merge pull request #4227 from rohankatkar/CRM_15120
CRM-15120
colemanw [Fri, 26 Sep 2014 00:28:20 +0000 (20:28 -0400)]
Merge pull request #4230 from davecivicrm/CRM-15367
Fix regression which caused Price Fields selector to NOT display.
Dave Greenberg [Thu, 25 Sep 2014 23:28:02 +0000 (16:28 -0700)]
Fix regression which caused Price Fields selector to NOT display.
colemanw [Thu, 25 Sep 2014 18:34:52 +0000 (14:34 -0400)]
Merge pull request #4229 from colemanw/clickPopupLink
clickPopupLink - add webtest method
Coleman Watts [Thu, 25 Sep 2014 18:29:47 +0000 (14:29 -0400)]
clickPopupLink - add webtest method
Coleman Watts [Thu, 25 Sep 2014 14:45:53 +0000 (10:45 -0400)]
CiviMailUtils.php code comment
Coleman Watts [Thu, 25 Sep 2014 14:30:39 +0000 (10:30 -0400)]
CiviMailUtils.php Webtest fix
Rohan Katkar [Thu, 25 Sep 2014 14:25:14 +0000 (19:55 +0530)]
CRM-15120
colemanw [Thu, 25 Sep 2014 14:24:19 +0000 (10:24 -0400)]
Merge pull request #4226 from colemanw/CRM-15367
CRM-15367 - Standardize buttons for option edit screens
Coleman Watts [Wed, 24 Sep 2014 23:27:53 +0000 (19:27 -0400)]
CRM-15367 - Standardize buttons for option edit screens
Coleman Watts [Wed, 24 Sep 2014 18:45:22 +0000 (14:45 -0400)]
Option.tpl whitespace cleanup
Monish Deb [Wed, 24 Sep 2014 16:17:34 +0000 (21:47 +0530)]
Merge pull request #4220 from atif-shaikh/CRM-15317NoticeFix
CRM-15317 - Database error on event registration when event title is too...
Monish Deb [Wed, 24 Sep 2014 16:14:03 +0000 (21:44 +0530)]
Merge pull request #4222 from rohankatkar/webtest_4.5.0
Webtest fix
colemanw [Wed, 24 Sep 2014 14:36:41 +0000 (10:36 -0400)]
Merge pull request #4218 from colemanw/CRM-14978
CRM-14978 related cleanup
Rohan Katkar [Wed, 24 Sep 2014 13:29:11 +0000 (18:59 +0530)]
Webtest fix
atif-shaikh [Wed, 24 Sep 2014 12:01:11 +0000 (17:31 +0530)]
CRM-15317 - Database error on event registration when event title is too long
https://issues.civicrm.org/jira/browse/CRM-15317
Monish Deb [Wed, 24 Sep 2014 11:44:52 +0000 (17:14 +0530)]
Merge pull request #4191 from cividesk/CRM-15317
CRM-15317: full fix
Tim Otten [Wed, 24 Sep 2014 07:29:10 +0000 (08:29 +0100)]
Merge pull request #4214 from totten/4.4-phpunit-err
INFRA-124 - tools/scripts/phpunit - Add error check
Eileen McNaughton [Wed, 24 Sep 2014 07:00:57 +0000 (19:00 +1200)]
Merge pull request #4219 from eileenmcnaughton/4.5
merge changes from 4.4
Kurund Jalmi [Wed, 24 Sep 2014 06:40:56 +0000 (12:10 +0530)]
Merge pull request #4215 from monishdeb/CRM-15350
CRM-15350 fix - Membership Batch Entry doesn't support soft credit type ...
Eileen McNaughton [Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)]
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
Conflicts:
CRM/Core/DAO.php
CRM/Financial/BAO/FinancialAccount.php
CRM/Financial/BAO/FinancialType.php
tests/phpunit/api/v3/CaseTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
Eileen McNaughton [Wed, 24 Sep 2014 04:10:09 +0000 (16:10 +1200)]
Merge pull request #3759 from eileenmcnaughton/api
backport financial account and financial type api & activity_contact api
Eileen [Wed, 24 Sep 2014 03:01:46 +0000 (03:01 +0000)]
DO NOT MERGE - temp test fix for 4.4
I will merge once in 4.4
Eileen [Wed, 24 Sep 2014 02:05:48 +0000 (02:05 +0000)]
Do not merge to 4.5 - fixes to make backported api pass tests,
one merged into 4.4 I'll do a merge PR to 4.5 to ensure this isn't merged as the fixes involve skipping tests due to upstream test framework changes
not being in 4.4
Coleman Watts [Wed, 24 Sep 2014 01:58:39 +0000 (21:58 -0400)]
CRM-14978 related cleanup
colemanw [Wed, 24 Sep 2014 01:57:36 +0000 (21:57 -0400)]
Merge pull request #4217 from colemanw/CRM-15363
CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
Coleman Watts [Tue, 23 Sep 2014 21:52:39 +0000 (17:52 -0400)]
CRM-15363 - Make jcalendar.tpl more resilient to duplicate dom ids
Eileen [Wed, 24 Sep 2014 01:45:27 +0000 (01:45 +0000)]
additional example
Eileen [Wed, 24 Sep 2014 01:45:03 +0000 (01:45 +0000)]
additional example
Eileen [Wed, 24 Sep 2014 01:28:01 +0000 (01:28 +0000)]
add Activity Contact api to backport
Eileen McNaughton [Wed, 30 Jul 2014 04:48:00 +0000 (16:48 +1200)]
backport financial account and financial type api
Coleman Watts [Tue, 23 Sep 2014 17:58:55 +0000 (13:58 -0400)]
Webtest fix in CiviMailUtils.php
Monish Deb [Tue, 23 Sep 2014 14:44:19 +0000 (20:14 +0530)]
Merge pull request #4212 from jitendrapurohit/webtestfixes
Webtest fix
Monish Deb [Tue, 23 Sep 2014 14:44:04 +0000 (20:14 +0530)]
Merge pull request #4213 from rohankatkar/webtest_4.5.0
Webtest failure fix
monishdeb [Tue, 23 Sep 2014 13:49:39 +0000 (19:19 +0530)]
CRM-15350 fix - Membership Batch Entry doesn't support soft credit type and soft credit js break on both Batch entry
https://issues.civicrm.org/jira/browse/CRM-15350
Rohan Katkar [Tue, 23 Sep 2014 13:39:02 +0000 (19:09 +0530)]
Webtest failure fix
Tim Otten [Tue, 23 Sep 2014 13:37:31 +0000 (14:37 +0100)]
INFRA-124 - tools/scripts/phpunit - Add error check
The goal is to eventually switch from the embedded phpunit
("civicrm/packages/PHPUnit") to a more standard/standalone copy. Howeer,
this requires a different CLI (e.g. "./scripts/phpunit CRM_Foo_BarTest" vs
"phpunit tests/phpunit/CRM/Foo/BarTest.php").
When we make the switch, we'll need some kind of transition for developers
who use the old CLI. This commit provides them with a better error message.
Note: It's tempting to automatically call the standalone phpunit rather than
printing an error; however, there are edge-cases (like unit-tests for
extensions) to consider, and (for now) it's easier to just throw an error
rather than try to think through each of them.
jitendrapurohit [Tue, 23 Sep 2014 13:34:56 +0000 (19:04 +0530)]
Webtest fix
Monish Deb [Tue, 23 Sep 2014 11:29:39 +0000 (16:59 +0530)]
Merge pull request #4205 from NileemaJadhav/CRM_HR_45_test
--HR-379 Fix notices coming while importing relationship details
Coleman Watts [Tue, 23 Sep 2014 02:17:33 +0000 (22:17 -0400)]
Webtest cleanup and fixes
Coleman Watts [Tue, 23 Sep 2014 01:04:03 +0000 (21:04 -0400)]
Common.js - minor cleanup
colemanw [Tue, 23 Sep 2014 00:29:42 +0000 (20:29 -0400)]
Merge pull request #4210 from colemanw/CRM-15341
CRM-15341 - D7 hack to get the toolbar out of the way
Coleman Watts [Tue, 23 Sep 2014 00:24:17 +0000 (20:24 -0400)]
CRM-15341 - D7 hack to get the toolbar out of the way
We shouldn't have to do this, but for the sake of our UX here's a hack
to fix the incompatability between the Drupal toolbar and jQuery UI.
Coleman Watts [Mon, 22 Sep 2014 23:22:32 +0000 (19:22 -0400)]
Fix accidental breakage of CiviMailUtils
colemanw [Mon, 22 Sep 2014 23:21:38 +0000 (19:21 -0400)]
Merge pull request #4209 from colemanw/CRM-15242
CRM-15242 - Resubmit PR #4103
Coleman Watts [Mon, 22 Sep 2014 23:18:07 +0000 (19:18 -0400)]
CRM-15242 - Resubmit PR #4103
Dave Greenberg [Mon, 22 Sep 2014 22:30:47 +0000 (15:30 -0700)]
Merge pull request #4208 from lcdservices/CRM-15351
CRM-15351 relationship report: filter contact type on contact table
colemanw [Mon, 22 Sep 2014 21:56:46 +0000 (17:56 -0400)]
Merge pull request #4206 from colemanw/console
Fix safety check when using window.console and switch to console.warn for warnings
Coleman Watts [Mon, 22 Sep 2014 15:59:10 +0000 (11:59 -0400)]
CRM-15352 Add CRM.console wrapper function
Not all browsers (ahem, IE) support the js console and will crash if it doesn't exist.
CRM.console adds a safe way to access console methods.
Dave Greenberg [Mon, 22 Sep 2014 19:51:02 +0000 (12:51 -0700)]
Merge pull request #4199 from pradpnayak/CRM-15055
-- CRM-15055, Fixed CRM test for membership batch create
Brian Shaughnessy [Mon, 22 Sep 2014 18:51:52 +0000 (14:51 -0400)]
CRM-15351 relationship report: filter contact type on contact table
projects / civicrm-core.git / log