Kurund Jalmi [Mon, 28 Apr 2014 21:36:54 +0000 (14:36 -0700)]
Merge pull request #2973 from GinkgoFJG/CRM-14354v2
Fix for CRM-14354 - Additional gift breaks ARB (auto-renewing) memberships.
Dave Greenberg [Mon, 28 Apr 2014 21:18:21 +0000 (14:18 -0700)]
Merge pull request #2992 from davecivicrm/CRM-14122
CRM-14122 - Clarify contact matching rules for component imports.
Dave Greenberg [Mon, 28 Apr 2014 21:15:01 +0000 (14:15 -0700)]
CRM-14122 - Clarify contact matching rules for component imports.
----------------------------------------
* CRM-14122:
https://issues.civicrm.org/jira/browse/CRM-14122
Dave Greenberg [Mon, 28 Apr 2014 20:49:26 +0000 (13:49 -0700)]
Merge pull request #2909 from jake-mw/crm-14472
CRM-14472 - query correct table for contribution-type vs. event-type PCPs
colemanw [Mon, 28 Apr 2014 20:40:15 +0000 (13:40 -0700)]
Merge pull request #2979 from tadpolecc/tadpole-wc
CRM-14543 - Enabling ReCaptcha fails if library is already loaded
colemanw [Mon, 28 Apr 2014 20:29:55 +0000 (13:29 -0700)]
Merge pull request #2991 from colemanw/master
CRM-14490 - Fix batch entry table
Coleman Watts [Mon, 28 Apr 2014 20:22:41 +0000 (13:22 -0700)]
CRM-14490 - Fix batch entry table
Eileen McNaughton [Mon, 28 Apr 2014 19:55:13 +0000 (12:55 -0700)]
Merge pull request #2990 from eileenmcnaughton/tests
output unknown reload mode
Eileen McNaughton [Mon, 28 Apr 2014 19:54:12 +0000 (12:54 -0700)]
output unknown reload mode
Eileen McNaughton [Mon, 28 Apr 2014 19:29:23 +0000 (12:29 -0700)]
Merge pull request #2989 from eileenmcnaughton/tests
For unknown reasons using the API rather than BAO fixes the test locally...
Eileen McNaughton [Mon, 28 Apr 2014 19:27:39 +0000 (12:27 -0700)]
For unknown reasons using the API rather than BAO fixes the test locally for me
Kurund Jalmi [Mon, 28 Apr 2014 19:00:03 +0000 (12:00 -0700)]
Merge pull request #2987 from kurund/CRM-14276
fatal error fixes due to bad merge CRM-14276
kurund [Mon, 28 Apr 2014 18:59:18 +0000 (11:59 -0700)]
fatal error fixes due to bad merge CRM-14276
----------------------------------------
* CRM-14276: Hook for display name
https://issues.civicrm.org/jira/browse/CRM-14276
Eileen McNaughton [Mon, 28 Apr 2014 18:47:23 +0000 (11:47 -0700)]
Merge pull request #2985 from eileenmcnaughton/tests
remove & before function
Eileen McNaughton [Mon, 28 Apr 2014 18:46:25 +0000 (11:46 -0700)]
remove & before function
Tim Otten [Mon, 28 Apr 2014 18:20:19 +0000 (11:20 -0700)]
Merge pull request #2983 from freeform/CRM-14411
CRM-14411 - Fix PHP notice caused by static calls to non-static methods.
Lola Slade [Mon, 28 Apr 2014 18:06:05 +0000 (11:06 -0700)]
CRM-14411 - Fix PHP notice caused by static calls to non-static methods.
kurund [Mon, 28 Apr 2014 18:05:05 +0000 (11:05 -0700)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-28-11-04-58
dlobo [Mon, 28 Apr 2014 17:54:56 +0000 (10:54 -0700)]
Merge pull request #2783 from jaapjansma/CRM-14409-master
fixed issue CRM-14409 added hooks on case merge and on case reassign
Dave Greenberg [Mon, 28 Apr 2014 17:49:51 +0000 (10:49 -0700)]
Merge pull request #2981 from davecivicrm/CRM-14529
CRM-14529 - Move Soft Credit Type column option on Contrib Detail report...
Dave Greenberg [Mon, 28 Apr 2014 17:48:41 +0000 (10:48 -0700)]
CRM-14529 - Move Soft Credit Type column option on Contrib Detail report.
----------------------------------------
* CRM-14529:
https://issues.civicrm.org/jira/browse/CRM-14529
Kurund Jalmi [Mon, 28 Apr 2014 17:41:07 +0000 (10:41 -0700)]
Merge pull request #2980 from relldoesphp/CRM-14153
removed form rule that was causing the error
Kevin Cristiano [Mon, 28 Apr 2014 17:40:36 +0000 (13:40 -0400)]
CRM-14543 - Enabling ReCaptcha fails if library is already loaded-Indentation Fix
Frank J. Gómez [Mon, 28 Apr 2014 17:37:10 +0000 (10:37 -0700)]
CRM-14354 - Addressed the second manifestation of the bug (when "separate membership payment" is not checked).
----------------------------------------
* CRM-14354: Additional gift breaks ARB (auto-renewing) memberships
https://issues.civicrm.org/jira/browse/CRM-14354
Kevin Cristiano [Mon, 28 Apr 2014 17:33:04 +0000 (13:33 -0400)]
CRM-14543 - Enabling ReCaptcha fails if library is already loaded
dlobo [Mon, 28 Apr 2014 17:29:47 +0000 (10:29 -0700)]
Merge pull request #2564 from jaapjansma/CRM-14276
Fixed #CRM-14276 (added a hook for altering the display name)
Kurund Jalmi [Mon, 28 Apr 2014 17:28:49 +0000 (10:28 -0700)]
Merge pull request #2974 from jitendrapurohit/Contribute_Webtests
Web Test Fix
Kurund Jalmi [Mon, 28 Apr 2014 17:27:43 +0000 (10:27 -0700)]
Merge pull request #2975 from atif-shaikh/WebTextFix
WebtestFix related to FinancialType and Address Import
Tyrell Cook [Mon, 28 Apr 2014 16:54:22 +0000 (12:54 -0400)]
removed form rule that was causing the error
Eileen McNaughton [Mon, 28 Apr 2014 16:43:57 +0000 (09:43 -0700)]
Merge pull request #2978 from eileenmcnaughton/tests
Tests
Eileen McNaughton [Mon, 28 Apr 2014 16:43:08 +0000 (09:43 -0700)]
fix function to be static, comment fixes
Eileen McNaughton [Mon, 28 Apr 2014 01:04:33 +0000 (18:04 -0700)]
Fix eNotice
Eileen McNaughton [Mon, 28 Apr 2014 01:02:51 +0000 (18:02 -0700)]
more comment fixes
Eileen McNaughton [Mon, 28 Apr 2014 00:58:17 +0000 (17:58 -0700)]
comment fixes & formatting
Eileen McNaughton [Mon, 28 Apr 2014 16:32:55 +0000 (09:32 -0700)]
Merge pull request #2977 from eileenmcnaughton/test-fixes
test fix - add clobber-it tear down function for financial transactions ...
Eileen McNaughton [Mon, 28 Apr 2014 16:30:37 +0000 (09:30 -0700)]
test fix - add clobber-it tear down function for financial transactions so we remove them all
Atif Shaikh [Mon, 28 Apr 2014 14:21:54 +0000 (19:51 +0530)]
WebtestFix related to FinancialType and Address Import
jitendrapurohit [Mon, 28 Apr 2014 13:39:30 +0000 (19:09 +0530)]
Web Test Fix
Kurund Jalmi [Mon, 28 Apr 2014 02:51:01 +0000 (19:51 -0700)]
Merge pull request #2956 from relldoesphp/CRM-14514
CRM-14514 - minor change the syntax for first item in array line 1065
Tyrell Cook [Mon, 28 Apr 2014 02:40:29 +0000 (22:40 -0400)]
CRM-14514 remove commas not curly braces
Tyrell Cook [Mon, 28 Apr 2014 01:12:02 +0000 (21:12 -0400)]
CRM-14514 - removed brackets
Eileen McNaughton [Mon, 28 Apr 2014 00:45:14 +0000 (17:45 -0700)]
Merge pull request #2971 from eileenmcnaughton/Cleanups
Cleanups this includes setup to allow unit tests (not in this PR) to run
Eileen McNaughton [Mon, 28 Apr 2014 00:38:00 +0000 (17:38 -0700)]
comments & whitespace tidy ups
Dave Greenberg [Mon, 28 Apr 2014 00:25:49 +0000 (17:25 -0700)]
Merge pull request #2969 from davecivicrm/CRM-14367
CRM-14367 - Replacing PR 2751 with additional UI and help changes.
Dave Greenberg [Mon, 28 Apr 2014 00:24:25 +0000 (17:24 -0700)]
CRM-14367 - Replacing PR 2751 with additional UI and help changes.
----------------------------------------
* CRM-14367:
https://issues.civicrm.org/jira/browse/CRM-14367
Frank J. Gómez [Mon, 28 Apr 2014 00:18:15 +0000 (17:18 -0700)]
Fix for CRM-14354 - Additional gift breaks ARB (auto-renewing) memberships.
----------------------------------------
* CRM-14354: Additional gift breaks ARB (auto-renewing) memberships
https://issues.civicrm.org/jira/browse/CRM-14354
Kurund Jalmi [Mon, 28 Apr 2014 00:09:38 +0000 (17:09 -0700)]
Merge pull request #2964 from freeform/CRM-14489
Also cleanup trailing slash if there is one on language domain.
Lola Slade [Sun, 27 Apr 2014 23:59:17 +0000 (16:59 -0700)]
Missing space for coding standards.
Eileen McNaughton [Fri, 31 Jan 2014 05:21:09 +0000 (18:21 +1300)]
Add function to set up an ACL for a test
Eileen McNaughton [Fri, 31 Jan 2014 05:15:54 +0000 (18:15 +1300)]
test fix Only variables should be assigned by reference
/var/www/drupal/sites/default/modules/civicrm/civicrm-core/CRM/ACL/BAO/ACL.php:541
Eileen McNaughton [Fri, 31 Jan 2014 05:13:50 +0000 (18:13 +1300)]
Unit test on group selector AJAX call - add ability to return result for unit test
Eileen McNaughton [Fri, 31 Jan 2014 05:10:04 +0000 (18:10 +1300)]
ACL Core, add a way for unit tests to flush in-function cache
colemanw [Sun, 27 Apr 2014 23:24:22 +0000 (16:24 -0700)]
Merge pull request #2967 from colemanw/select
CRM-11864 - Use select2 for profileSelector
Coleman Watts [Sun, 27 Apr 2014 23:23:22 +0000 (16:23 -0700)]
CRM-11864 - Use select2 for profileSelector
colemanw [Sun, 27 Apr 2014 23:16:32 +0000 (16:16 -0700)]
Merge pull request #2926 from sushantpaste/event-location
Create new location button fixes for event location
Eileen McNaughton [Sun, 27 Apr 2014 23:10:18 +0000 (16:10 -0700)]
Merge pull request #2966 from eileenmcnaughton/patch-2
E-Notice fix
Eileen McNaughton [Sun, 27 Apr 2014 23:08:51 +0000 (16:08 -0700)]
Fix spaces on previous
Lola Slade [Sun, 27 Apr 2014 22:46:38 +0000 (15:46 -0700)]
Also cleanup trailing slash if there is one on language domain.
Eileen McNaughton [Sun, 27 Apr 2014 22:44:16 +0000 (15:44 -0700)]
Merge pull request #2963 from eileenmcnaughton/CRM-14521
CRM-14521 syntaxConformance test fixes
Eileen McNaughton [Sun, 27 Apr 2014 22:42:26 +0000 (15:42 -0700)]
test fixes for api singleValueAlter - generic fixes
Eileen McNaughton [Sun, 27 Apr 2014 22:41:34 +0000 (15:41 -0700)]
comment & formatting fixes
Coleman Watts [Sun, 27 Apr 2014 22:37:38 +0000 (15:37 -0700)]
Fix membership form hidden field
Eileen McNaughton [Sun, 27 Apr 2014 22:30:22 +0000 (15:30 -0700)]
Merge pull request #2962 from agh1/additional-payment-no-contrib
CRM-14532 add better teardown
Andrew Hunt [Sun, 27 Apr 2014 22:25:14 +0000 (18:25 -0400)]
CRM-14532 add better teardown
----------------------------------------
* CRM-14532: CRM_Event_BAO_AdditionalPaymentTest::testAddPartialPayment failure
https://issues.civicrm.org/jira/browse/CRM-14532
Eileen McNaughton [Sun, 27 Apr 2014 21:50:02 +0000 (14:50 -0700)]
Merge pull request #2961 from eileenmcnaughton/CRM-14521
CRM-14521 api test fix on premiums api
Eileen McNaughton [Sun, 27 Apr 2014 21:48:34 +0000 (14:48 -0700)]
Premiums api - fix test field misnamed field in _spec
Eileen McNaughton [Sun, 27 Apr 2014 21:47:23 +0000 (14:47 -0700)]
syntaxConformanceTest - give clearer message on E-Notice
Eileen McNaughton [Sun, 27 Apr 2014 21:46:51 +0000 (14:46 -0700)]
comment fixes
colemanw [Sun, 27 Apr 2014 21:15:03 +0000 (14:15 -0700)]
Merge pull request #2959 from colemanw/select
CRM-14165 - Add option-edit for participant status
Eileen McNaughton [Sun, 27 Apr 2014 21:13:28 +0000 (14:13 -0700)]
Merge pull request #2960 from eileenmcnaughton/CRM-14521
test fix - alter MailingComponent BAO to handle updating correctly & be ...
Eileen McNaughton [Sun, 27 Apr 2014 21:11:36 +0000 (14:11 -0700)]
test fix - alter MailingComponent BAO to handle updating correctly & be more standardised
Coleman Watts [Sun, 27 Apr 2014 21:10:35 +0000 (14:10 -0700)]
CRM-14165 - Add option-edit for participant status
Eileen McNaughton [Sun, 27 Apr 2014 21:09:42 +0000 (14:09 -0700)]
Merge pull request #2958 from eileenmcnaughton/CRM-14521
Crm 14521 test fixes & tidy up (limited to test suite)
Eileen McNaughton [Sun, 27 Apr 2014 21:07:15 +0000 (14:07 -0700)]
test fix - improve api syntaxConformance delete routine
colemanw [Sun, 27 Apr 2014 21:04:45 +0000 (14:04 -0700)]
Merge pull request #2957 from agh1/fix-http-test
CRM-14528 http test returned 301 redirect to https://civicrm.org
Eileen McNaughton [Sun, 27 Apr 2014 21:04:03 +0000 (14:04 -0700)]
formatting & comment fixes
Andrew Hunt [Sun, 27 Apr 2014 20:56:59 +0000 (16:56 -0400)]
CRM-14528 http test returned 301 redirect to https://civicrm.org
----------------------------------------
* CRM-14528: CRM_Utils_HttpClientTest gets redirect instead of expected file
https://issues.civicrm.org/jira/browse/CRM-14528
colemanw [Sun, 27 Apr 2014 20:49:02 +0000 (13:49 -0700)]
Merge pull request #2955 from colemanw/select
CRM-14165 - Fix options-edit to work with multiselects
Coleman Watts [Sun, 27 Apr 2014 20:47:54 +0000 (13:47 -0700)]
CRM-14165 - Fix options-edit to work with multiselects
Tyrell Cook [Sun, 27 Apr 2014 20:45:40 +0000 (16:45 -0400)]
CRM-14514 - change the syntax for item in array line 1065
Kurund Jalmi [Sun, 27 Apr 2014 20:41:53 +0000 (13:41 -0700)]
Merge pull request #2954 from freeform/CRM-14489
CRM-14489 - Removed protocol from language domain if it exists.
Lola Slade [Sun, 27 Apr 2014 20:25:34 +0000 (13:25 -0700)]
CRM-14489 - Changed new variable name to camel case.
Coleman Watts [Sun, 27 Apr 2014 20:19:30 +0000 (13:19 -0700)]
Merge branch '4.4' into master
Conflicts:
CRM/Core/BAO/CustomQuery.php
Eileen McNaughton [Sun, 27 Apr 2014 20:17:07 +0000 (13:17 -0700)]
tests - remove legacy enotice demarkations
Lola Slade [Sun, 27 Apr 2014 20:16:10 +0000 (13:16 -0700)]
CRM-14489 - Removed protocol from language domain if it exists.
Eileen McNaughton [Sun, 27 Apr 2014 20:11:57 +0000 (13:11 -0700)]
Merge pull request #2950 from eileenmcnaughton/CRM-14522
CRM-14522 remove incorrect FK
Eileen McNaughton [Sun, 27 Apr 2014 20:10:58 +0000 (13:10 -0700)]
Merge pull request #2953 from eileenmcnaughton/CRM-14521
CRM-14521 test fix - since tax_rate only takes 2 digits only use 2 digits for float
Eileen McNaughton [Sun, 27 Apr 2014 20:02:31 +0000 (13:02 -0700)]
git formatting & comment fixes
Eileen McNaughton [Sun, 27 Apr 2014 19:14:30 +0000 (12:14 -0700)]
CRM-14521 test fix - since tax_rate only takes 2 digits only use 2 digits on float fields for easy test 'fix'
Eileen McNaughton [Sun, 27 Apr 2014 19:13:29 +0000 (12:13 -0700)]
code formatting
Eileen McNaughton [Sun, 27 Apr 2014 19:08:41 +0000 (12:08 -0700)]
Merge pull request #2952 from eileenmcnaughton/CRM-14521
CRM-14522 - test-api partial skip on ActivityContact on singleValueAlter...
Eileen McNaughton [Sun, 27 Apr 2014 18:56:28 +0000 (11:56 -0700)]
CRM-14522 - test-api partial skip on ActivityContact on singleValueAlter due to FK issue
dlobo [Sun, 27 Apr 2014 18:52:40 +0000 (11:52 -0700)]
Merge pull request #2792 from deepak-srivastava/dedupe-hooks
CRM-14413 - Dedupe hooks to make custom rules manageable thru UI + a flip hook
Eileen McNaughton [Sun, 27 Apr 2014 18:38:22 +0000 (11:38 -0700)]
comment fix
Eileen McNaughton [Sun, 27 Apr 2014 18:24:58 +0000 (11:24 -0700)]
comment block fixes
Eileen McNaughton [Sun, 27 Apr 2014 18:21:48 +0000 (11:21 -0700)]
CRM-14522 remove incorrect FK from message_template schema
Dave Greenberg [Sun, 27 Apr 2014 18:02:01 +0000 (11:02 -0700)]
Merge pull request #2949 from davecivicrm/CRM-13833
CRM-13833 - Fix help for separate PCP pane in add/edit contribution form.
Dave Greenberg [Sun, 27 Apr 2014 18:00:22 +0000 (11:00 -0700)]
Fix help for separate PCP pane in add/edit contribution form.
Dave Greenberg [Sun, 27 Apr 2014 17:18:48 +0000 (10:18 -0700)]
Merge pull request #2948 from davecivicrm/CRM-13764
CRM-13764 - change all instances of Delete Members to Delete Memberships...
Dave Greenberg [Sun, 27 Apr 2014 17:17:47 +0000 (10:17 -0700)]
CRM-13764 - change all instances of Delete Members to Delete Memberships.
----------------------------------------
* CRM-13764:
https://issues.civicrm.org/jira/browse/CRM-13764
projects / civicrm-core.git / log