Eileen McNaughton [Wed, 30 Apr 2014 22:07:15 +0000 (15:07 -0700)]
revert change on case - intended for separate commit set
Eileen McNaughton [Wed, 30 Apr 2014 22:00:35 +0000 (15:00 -0700)]
CRM-14581 user selector on group field - fix post process
Eileen McNaughton [Wed, 30 Apr 2014 21:52:57 +0000 (14:52 -0700)]
comment fixes only
Eileen McNaughton [Wed, 30 Apr 2014 21:47:48 +0000 (14:47 -0700)]
CRM-14581 upgrade Multisite form
Coleman Watts [Tue, 29 Apr 2014 19:02:05 +0000 (12:02 -0700)]
Fix profileSelector and select2
Eileen McNaughton [Tue, 29 Apr 2014 18:29:18 +0000 (11:29 -0700)]
Merge pull request #3028 from eileenmcnaughton/test-fixes
Test fixes - Membership form test
Eileen McNaughton [Tue, 29 Apr 2014 14:39:04 +0000 (07:39 -0700)]
minor code tidyups
Eileen McNaughton [Tue, 29 Apr 2014 16:48:59 +0000 (09:48 -0700)]
more comment fixes
Eileen McNaughton [Tue, 29 Apr 2014 17:39:07 +0000 (10:39 -0700)]
fix invalid php count statement (identified by IDE - unsure if it was causing bug
Eileen McNaughton [Tue, 29 Apr 2014 14:34:04 +0000 (07:34 -0700)]
add product api test:
Eileen McNaughton [Tue, 29 Apr 2014 18:25:50 +0000 (11:25 -0700)]
update membership form rule test
colemanw [Tue, 29 Apr 2014 17:50:55 +0000 (10:50 -0700)]
Merge pull request #3001 from torrance/breadcrumbs
Ensure breadcrumbs are formatted correctly by the CMS.
Eileen McNaughton [Tue, 29 Apr 2014 17:22:45 +0000 (10:22 -0700)]
Merge pull request #3025 from sgladstone/patch-3
Update Membership.php
Sarah Gladstone [Tue, 29 Apr 2014 17:21:38 +0000 (10:21 -0700)]
Update Membership.php
formatting improvements
Sarah Gladstone [Tue, 29 Apr 2014 17:16:13 +0000 (10:16 -0700)]
Update Membership.php
Change compare to false to "empty" function
Sarah Gladstone [Tue, 29 Apr 2014 17:11:49 +0000 (10:11 -0700)]
Update Membership.php
Check if status_id is empty before using it to look inside an array
Kurund Jalmi [Tue, 29 Apr 2014 16:59:20 +0000 (09:59 -0700)]
Merge pull request #3016 from jitendrapurohit/Import_Webtest
Web Test Fix
colemanw [Tue, 29 Apr 2014 16:26:25 +0000 (09:26 -0700)]
Merge pull request #3012 from eileenmcnaughton/CRM-14527
CRM-14527 migrate cid=0 to use entity ref
Eileen McNaughton [Tue, 29 Apr 2014 13:42:32 +0000 (06:42 -0700)]
Merge pull request #3017 from eileenmcnaughton/tests
CRM-14350 add test to check for reported E-Notice
Eileen McNaughton [Tue, 29 Apr 2014 13:42:01 +0000 (06:42 -0700)]
CRM-14350 add test to check for reported E-Notice
jitendrapurohit [Tue, 29 Apr 2014 13:03:16 +0000 (18:33 +0530)]
Web Test Fix
Deepak Srivastava [Tue, 29 Apr 2014 08:14:58 +0000 (13:44 +0530)]
Merge pull request #3014 from deepak-srivastava/CRM-14452
appropriate base table for source activities
Deepak Srivastava [Tue, 29 Apr 2014 08:13:43 +0000 (13:43 +0530)]
appropriate base table for source activities
Deepak Srivastava [Tue, 29 Apr 2014 07:32:10 +0000 (13:02 +0530)]
Merge pull request #3013 from deepak-srivastava/CRM-14453
remove redundant where clause
Deepak Srivastava [Tue, 29 Apr 2014 07:14:42 +0000 (12:44 +0530)]
remove redundant where clause
Eileen McNaughton [Tue, 29 Apr 2014 06:51:53 +0000 (23:51 -0700)]
CRM-14527 migrate cid=0 to use entity ref
Kurund Jalmi [Tue, 29 Apr 2014 05:37:07 +0000 (22:37 -0700)]
Merge pull request #3006 from davecivicrm/CRM-14492
CRM-14492 - Show admin-only price fields on front end event info and eve...
Kurund Jalmi [Tue, 29 Apr 2014 05:29:42 +0000 (22:29 -0700)]
Merge pull request #3005 from kurund/CRM-14300
CRM-14300
colemanw [Tue, 29 Apr 2014 01:23:48 +0000 (18:23 -0700)]
Merge pull request #3004 from sgladstone/master
CRM-14555
Sarah Gladstone [Tue, 29 Apr 2014 01:23:27 +0000 (18:23 -0700)]
fix whitespace
Sarah Gladstone [Tue, 29 Apr 2014 01:12:52 +0000 (18:12 -0700)]
more formatting changes
Sarah Gladstone [Tue, 29 Apr 2014 01:08:28 +0000 (18:08 -0700)]
formatting changes
Sarah Gladstone [Tue, 29 Apr 2014 01:04:09 +0000 (18:04 -0700)]
Update Membership.php
Dave Greenberg [Tue, 29 Apr 2014 00:14:15 +0000 (17:14 -0700)]
CRM-14492 - Show admin-only price fields on front end event info and event registration pages if the user is logged in and has administer CiviCRM permission.
----------------------------------------
* CRM-14492:
https://issues.civicrm.org/jira/browse/CRM-14492
kurund [Tue, 29 Apr 2014 00:05:33 +0000 (17:05 -0700)]
Merge branch 'CRM-14300' of github.com:monishdeb/civicrm-core into CRM-14300
Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql
----------------------------------------
* CRM-14300: Slow query - participant report
https://issues.civicrm.org/jira/browse/CRM-14300
Sarah Gladstone [Tue, 29 Apr 2014 00:04:25 +0000 (17:04 -0700)]
CRM-14555
Back-office user can now fill in an end date for lifetime memberships
Kurund Jalmi [Mon, 28 Apr 2014 23:57:34 +0000 (16:57 -0700)]
Merge pull request #2916 from NileemaJadhav/HR-13-fix
HR fix to show case status based on filter column
Kurund Jalmi [Mon, 28 Apr 2014 23:09:47 +0000 (16:09 -0700)]
Merge pull request #3002 from kurund/error-fixes
notice fixes
kurund [Mon, 28 Apr 2014 23:09:10 +0000 (16:09 -0700)]
notice fixes
colemanw [Mon, 28 Apr 2014 23:03:19 +0000 (16:03 -0700)]
Merge pull request #3000 from sgladstone/pdfcase
Allow use of PDF letter from within a case
Sarah Gladstone [Mon, 28 Apr 2014 22:57:25 +0000 (15:57 -0700)]
Update CaseView.php
formatting changes
Torrance [Mon, 28 Apr 2014 22:57:07 +0000 (10:57 +1200)]
Ensure breadcrumbs are formatted correctly by the CMS.
Sarah Gladstone [Mon, 28 Apr 2014 22:55:26 +0000 (15:55 -0700)]
Update CaseView.php
formatting changes
Sarah Gladstone [Mon, 28 Apr 2014 22:49:46 +0000 (18:49 -0400)]
X-Powered-By: PHP/5.3.27
Content-type: text/html
Kurund Jalmi [Mon, 28 Apr 2014 22:38:58 +0000 (15:38 -0700)]
Merge pull request #2999 from GinkgoFJG/CRM-14545
Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for memberships.
Frank J. Gómez [Mon, 28 Apr 2014 22:27:16 +0000 (15:27 -0700)]
Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for memberships.
----------------------------------------
* CRM-14545: Contribution page does not respect "Contribution Amounts Label" when page is also used for memberships
https://issues.civicrm.org/jira/browse/CRM-14545
colemanw [Mon, 28 Apr 2014 22:23:17 +0000 (15:23 -0700)]
Merge pull request #2997 from sgladstone/mailtoken
CRM-14507 - Domain tokens using HTML in plain text portion
Sarah Gladstone [Mon, 28 Apr 2014 22:19:54 +0000 (18:19 -0400)]
X-Powered-By: PHP/5.3.27
Content-type: text/html
CRM-14507 - Domain tokens using HTML in plain text portion
----------------------------------------
* CRM-14507: Domain token replacement in Message Templates uses HTML tokens for text parts
https://issues.civicrm.org/jira/browse/CRM-14507
Kurund Jalmi [Mon, 28 Apr 2014 22:01:27 +0000 (15:01 -0700)]
Merge pull request #2996 from kurund/CRM-14164
fixes for CRM-14164
Kurund Jalmi [Mon, 28 Apr 2014 21:59:38 +0000 (14:59 -0700)]
Merge pull request #2984 from relldoesphp/CRM-14247
implemented patch and fixed bulk email name change possibility
Tyrell Cook [Mon, 28 Apr 2014 21:56:41 +0000 (17:56 -0400)]
CRM-14247 applied Kurund patch
kurund [Mon, 28 Apr 2014 21:56:26 +0000 (14:56 -0700)]
fixes for CRM-14164
----------------------------------------
* CRM-14164: Static methods called non-statically :: CRM_Mailing_BAO_MailingJob::create
https://issues.civicrm.org/jira/browse/CRM-14164
Tyrell Cook [Mon, 28 Apr 2014 21:55:49 +0000 (17:55 -0400)]
CRM-14247 applied Kurund patch
Eileen McNaughton [Mon, 28 Apr 2014 21:54:41 +0000 (14:54 -0700)]
Merge pull request #2995 from eileenmcnaughton/tests
Test fix - ensure options is an array
Eileen McNaughton [Mon, 28 Apr 2014 21:54:05 +0000 (14:54 -0700)]
test fix for possibility of as string- eg. products
Eileen McNaughton [Mon, 28 Apr 2014 21:53:33 +0000 (14:53 -0700)]
comment fix
Dave Greenberg [Mon, 28 Apr 2014 21:40:24 +0000 (14:40 -0700)]
Merge pull request #2993 from colemanw/master
CRM-14477 - Fix case datatable refresh
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.
Coleman Watts [Mon, 28 Apr 2014 21:27:17 +0000 (14:27 -0700)]
CRM-14477 - Fix case datatable refresh
Coleman Watts [Mon, 28 Apr 2014 21:21:09 +0000 (14:21 -0700)]
Action icon tweaks
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.
Tyrell Cook [Mon, 28 Apr 2014 18:09:50 +0000 (14:09 -0400)]
implemnted patch and fixed bulk email name change possibility
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
projects / civicrm-core.git / log