Kurund Jalmi [Sun, 19 May 2013 23:52:48 +0000 (16:52 -0700)]
Merge pull request #797 from dlobo/CRM-12172
CRM-12172
Donald A. Lobo [Sun, 19 May 2013 16:53:22 +0000 (09:53 -0700)]
CRM-12172
----------------------------------------
* CRM-12172: Use preg_replace_callback() in CRM_Utils_Token
http://issues.civicrm.org/jira/browse/CRM-12172
Kurund Jalmi [Sat, 18 May 2013 13:46:00 +0000 (06:46 -0700)]
Merge pull request #791 from dlobo/CRM-9855
CRM-9855
Donald A. Lobo [Sat, 18 May 2013 00:55:33 +0000 (17:55 -0700)]
CRM-9855
----------------------------------------
* CRM-9855: CiviMail sets X-header "X-CiviMail-Bounce" on outbound bulk email, but does not use it to identify an inbound bounce
http://issues.civicrm.org/jira/browse/CRM-9855
Kurund Jalmi [Fri, 17 May 2013 20:26:27 +0000 (13:26 -0700)]
Merge pull request #787 from eileenmcnaughton/whitespacelimited
Whitespacelimited
eileen [Mon, 13 May 2013 02:30:59 +0000 (14:30 +1200)]
CRM-12595 fix formatting in remaing files
eileen [Mon, 13 May 2013 02:30:03 +0000 (14:30 +1200)]
CRM-12595 fix formatting in CRM/P* files
eileen [Mon, 13 May 2013 02:29:32 +0000 (14:29 +1200)]
CRM-12595 fix formatting in CRM/Report files
eileen [Mon, 13 May 2013 02:29:08 +0000 (14:29 +1200)]
CRM-12595 fix formatting in CRM/Upgrade files
eileen [Mon, 13 May 2013 02:28:58 +0000 (14:28 +1200)]
CRM-12595 fix formatting in CRM/Utils files
eileen [Mon, 13 May 2013 02:28:28 +0000 (14:28 +1200)]
CRM-12595 fix formatting in bin files
eileen [Mon, 13 May 2013 02:28:19 +0000 (14:28 +1200)]
CRM-12595 fix formatting in api files
eileen [Mon, 13 May 2013 02:28:03 +0000 (14:28 +1200)]
CRM-12595 fix formatting in js files
eileen [Mon, 13 May 2013 02:27:45 +0000 (14:27 +1200)]
CRM-12595 fix formatting in sql files
eileen [Mon, 13 May 2013 02:27:31 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (R)
eileen [Mon, 13 May 2013 02:27:23 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (P)
eileen [Mon, 13 May 2013 02:27:01 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (G)
eileen [Mon, 13 May 2013 02:26:52 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (F)
eileen [Mon, 13 May 2013 02:26:44 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (E)
eileen [Mon, 13 May 2013 02:26:25 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (C)
eileen [Mon, 13 May 2013 02:26:17 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (B)
eileen [Mon, 13 May 2013 02:25:45 +0000 (14:25 +1200)]
CRM-12595 fix formatting in templates files (A)
eileen [Mon, 13 May 2013 02:24:31 +0000 (14:24 +1200)]
CRM-12595 fix formatting in tools files
eileen [Mon, 13 May 2013 02:23:19 +0000 (14:23 +1200)]
CRM-12595 fix formatting in tests files
eileen [Mon, 13 May 2013 02:23:02 +0000 (14:23 +1200)]
CRM-12595 fix formatting in xml files
Kurund Jalmi [Fri, 17 May 2013 17:34:41 +0000 (10:34 -0700)]
Merge pull request #784 from ravishnair/CRM-10397
CRM-10397 Pay Later Improvements
Ravish Nair [Fri, 17 May 2013 08:53:24 +0000 (14:23 +0530)]
-- CRM-10397 Updated Description of Pay Later Label
Ravish Nair [Fri, 17 May 2013 08:42:11 +0000 (14:12 +0530)]
-- CRM-10397 Pay Later Improvements
Dave Greenberg [Thu, 16 May 2013 22:19:16 +0000 (15:19 -0700)]
Merge pull request #780 from hbergin/CRM-12644
Update title and description of Contributions by Organization
helen [Thu, 16 May 2013 21:41:47 +0000 (16:41 -0500)]
Update title and description of Contributions by Organization
Kurund Jalmi [Thu, 16 May 2013 03:37:36 +0000 (20:37 -0700)]
Merge pull request #773 from totten/merge-rest
CRM-12613 - Forward port REST.php
Tim Otten [Thu, 16 May 2013 02:34:31 +0000 (22:34 -0400)]
CRM-12613 - Forward port REST.php
This file had been held back from normal merge-forward due to
merge-conflicts. Investigating upstream/master, it seems that there were
two changes that may have been source of conflict:
*
2ede60ec - This is formatting change and a bad-commit of a debug code
*
c5f77b41 - This is a real functional change but was backported (and
further fixed) in 4.3, so 4.3's version is better.
----------------------------------------
* CRM-12613: Resolve merge of REST.php (4.3=>master)
http://issues.civicrm.org/jira/browse/CRM-12613
Kurund Jalmi [Wed, 15 May 2013 22:38:36 +0000 (15:38 -0700)]
Merge pull request #767 from eileenmcnaughton/CRM-12628
CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add...
Kurund Jalmi [Wed, 15 May 2013 22:36:31 +0000 (15:36 -0700)]
Merge pull request #766 from eileenmcnaughton/test-fix
Test fixes (contribution soft credit, tweaks on previous fixes)
eileen [Wed, 15 May 2013 22:20:17 +0000 (10:20 +1200)]
CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add BAO for standardisation
eileen [Wed, 15 May 2013 21:50:27 +0000 (09:50 +1200)]
CRM-7954 fix on prev, copy & paste error in new BAO for membershipBlock
eileen [Wed, 15 May 2013 21:47:12 +0000 (09:47 +1200)]
opps removed too much debug :-(
eileen [Wed, 15 May 2013 21:35:32 +0000 (09:35 +1200)]
CRM-11320 fix error in test
eileen [Wed, 15 May 2013 21:28:02 +0000 (09:28 +1200)]
CRM-12463 fix test broken by soft credit restructure / make api stable
Kurund Jalmi [Wed, 15 May 2013 16:18:16 +0000 (09:18 -0700)]
Merge pull request #761 from adamwight/api_autoloaded
Register and use the autoloader during API calls
Adam Roses Wight [Wed, 15 May 2013 15:59:02 +0000 (08:59 -0700)]
Register and use the autoloader during API calls
Kurund Jalmi [Wed, 15 May 2013 14:17:15 +0000 (07:17 -0700)]
Merge pull request #752 from eileenmcnaughton/test-fix
Test fixes including activity contact api, mailing contact api, soft contribution api
eileen [Wed, 15 May 2013 14:03:29 +0000 (02:03 +1200)]
remove debug
eileen [Wed, 15 May 2013 14:02:41 +0000 (02:02 +1200)]
CRM-11320 this makes the api stable from 4.2 to 4.3
eileen [Wed, 15 May 2013 13:49:13 +0000 (01:49 +1200)]
remove some references to debug from tests
eileen [Wed, 15 May 2013 13:46:13 +0000 (01:46 +1200)]
CRM-12547 , CRM-12357 add a test for getCount
eileen [Wed, 15 May 2013 12:16:57 +0000 (00:16 +1200)]
CRM-12509 default custom group api to is_active =1
eileen [Wed, 15 May 2013 12:14:57 +0000 (00:14 +1200)]
CRM-12392 further problems arising from non-std BAO-naming
eileen [Wed, 15 May 2013 11:54:43 +0000 (23:54 +1200)]
CRM-12628 hack to deal with poorly named BAO class
eileen [Wed, 15 May 2013 10:54:25 +0000 (22:54 +1200)]
CRM12547, CRM-12357 fix Mailing Contact api to comply with api conformance tests
fix includes -
- using spec function to provide documentation, enforce required fields, provide default, enforce options
- using standard api function to process 'limit', 'sort' etc
- skipping checks for getByID because in this area the api cannot be made standard
NOTE that the default limit has been set to the api default (25). Making
this non standard for a particular use-case doesn't make sense.
Preferred calling method is
$params['options' => array('sort' => 'contact_id DESC', 'limit' => 50,
'offset' => 200)
re-fix mailing contact api
eileen [Wed, 15 May 2013 09:42:15 +0000 (21:42 +1200)]
CRM-12545 fix tests broken by work on activity contact restructuring
eileen [Wed, 15 May 2013 13:49:29 +0000 (01:49 +1200)]
add soft credit api examples
eileen [Wed, 15 May 2013 08:13:13 +0000 (20:13 +1200)]
fix contribution soft del function
Tim Otten [Wed, 15 May 2013 05:46:16 +0000 (22:46 -0700)]
Merge pull request #749 from eileenmcnaughton/test-fix
CRM-12626 Fix test by no validating arrays passed into string fields
eileen [Wed, 15 May 2013 05:34:09 +0000 (17:34 +1200)]
CRM-12626 Fix test by no validating arrays passed into string fields
Tim Otten [Wed, 15 May 2013 04:52:45 +0000 (21:52 -0700)]
Merge pull request #748 from adamwight/fix_entity_name
Fix an error in
4d1d7ac - get short name from classname
Adam Roses Wight [Wed, 15 May 2013 04:43:01 +0000 (21:43 -0700)]
Fix an error in
4d1d7ac - get short name from classname
Tim Otten [Tue, 14 May 2013 23:23:07 +0000 (16:23 -0700)]
Merge pull request #743 from kurund/CRM-12601
fixed regression in CRM_Core_DAO_AllCoreTables
Kurund Jalmi [Tue, 14 May 2013 23:08:26 +0000 (19:08 -0400)]
fixed regression in CRM_Core_DAO_AllCoreTables
dlobo [Tue, 14 May 2013 18:11:27 +0000 (11:11 -0700)]
Merge pull request #730 from dlobo/CRM-12600
CRM-12600
Kurund Jalmi [Tue, 14 May 2013 03:45:13 +0000 (20:45 -0700)]
Merge pull request #727 from dlobo/MiscFixes
expose contributionID to the form object for use by downstream extension...
Donald A. Lobo [Tue, 14 May 2013 00:03:11 +0000 (17:03 -0700)]
CRM-12600 - redirect to search builder if we have the needed info
----------------------------------------
* CRM-12600: Fix behavior of CiviCRM on specific screen(s)when the session has timed out / deleted
http://issues.civicrm.org/jira/browse/CRM-12600
Tim Otten [Mon, 13 May 2013 23:59:57 +0000 (16:59 -0700)]
Merge pull request #732 from eileenmcnaughton/CRM-7964-remove-eval
CRM-7964 add BAO classes so that eval removals can call BAO not DAO
eileen [Mon, 13 May 2013 23:44:12 +0000 (11:44 +1200)]
CRM-7964 add BAO classes so that eval removals can call BAO not DAO
Tim Otten [Mon, 13 May 2013 23:31:20 +0000 (16:31 -0700)]
Merge pull request #731 from totten/allcoretables-fatal
CRM-12601 - Restore getClasses() and mitigate damage from missing functi...
Tim Otten [Mon, 13 May 2013 23:29:32 +0000 (19:29 -0400)]
CRM-12601 - Restore getClasses() and mitigate damage from missing function
----------------------------------------
* CRM-12601: Test suite crashes - CRM_Core_DAO_AllCoreTables::getClasses
http://issues.civicrm.org/jira/browse/CRM-12601
Tim Otten [Mon, 13 May 2013 22:20:31 +0000 (15:20 -0700)]
Merge pull request #729 from totten/fix-membershipblock-error
CRM_Member_BAO_MembershipBlock - Fix test crash
Tim Otten [Mon, 13 May 2013 22:18:11 +0000 (18:18 -0400)]
CRM_Member_BAO_MembershipBlock - Fix test crash
See also:
https://github.com/eileenmcnaughton/civicrm-core/commit/
4d5c2eb510a6be0017085d1f8dae09495e28e74b#commitcomment-
3203066
Tim Otten [Mon, 13 May 2013 21:49:28 +0000 (14:49 -0700)]
Merge pull request #728 from totten/dao-regressions
Replace "CRM_Core_AllCoreTables" with newer "CRM_Core_DAO_AllCoreTables"
Tim Otten [Fri, 10 May 2013 20:33:24 +0000 (16:33 -0400)]
Replace "CRM_Core_AllCoreTables" with newer "CRM_Core_DAO_AllCoreTables"
Donald A. Lobo [Mon, 13 May 2013 21:13:37 +0000 (14:13 -0700)]
expose contributionID to the form object for use by downstream extensions
Donald A. Lobo [Mon, 13 May 2013 19:19:38 +0000 (12:19 -0700)]
CRM-12600
----------------------------------------
* CRM-12600: Fix behavior of CiviCRM on certain screen when the session has timed out / deleted
http://issues.civicrm.org/jira/browse/CRM-12600
Kurund Jalmi [Mon, 13 May 2013 20:39:22 +0000 (13:39 -0700)]
Merge pull request #726 from kurund/regen-data
fixed generated data
Kurund Jalmi [Mon, 13 May 2013 20:38:11 +0000 (16:38 -0400)]
fixed generated data
Kurund Jalmi [Mon, 13 May 2013 20:01:48 +0000 (16:01 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-13-15-43-24
Conflicts:
CRM/Case/Form/Activity.php
CRM/Utils/REST.php
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Mon, 13 May 2013 19:38:32 +0000 (12:38 -0700)]
Merge pull request #724 from kurund/CRM-12551
CRM-12551, fixed datatable break due to tab character's
Kurund Jalmi [Mon, 13 May 2013 19:33:37 +0000 (12:33 -0700)]
Merge pull request #721 from ravishnair/CRM-10993
-- fix for CRM-10993
Kurund Jalmi [Mon, 13 May 2013 19:31:24 +0000 (12:31 -0700)]
Merge pull request #722 from dlobo/CRM-12597
CRM-12597 - Handle changed / unknown fields in a better way
Kurund Jalmi [Mon, 13 May 2013 19:30:07 +0000 (12:30 -0700)]
Merge pull request #725 from davecivicrm/CRM-12562
CRM-12562 Mis-named array item check in Batch.php was causing batch upda...
Kurund Jalmi [Mon, 13 May 2013 19:29:10 +0000 (12:29 -0700)]
Merge pull request #723 from davecivicrm/CRM-12563
CRM-12563 Removed extraneous else and </table> tag. Fixed indenting thro...
Dave Greenberg [Mon, 13 May 2013 19:23:15 +0000 (12:23 -0700)]
CRM-12562 Mis-named array item check in Batch.php was causing batch update to set participant role profile field as is_multiple (conditional on line 204 was checking for participant_role_id instead of participant_role).
----------------------------------------
* CRM-12562: Batch Update Participant Roles Not Set, Not Checkboxes, Data Overwritten
http://issues.civicrm.org/jira/browse/CRM-12562
Kurund Jalmi [Mon, 13 May 2013 19:13:38 +0000 (15:13 -0400)]
worked on CRM-12551, fix the datatable break due to tab character
Dave Greenberg [Mon, 13 May 2013 19:02:52 +0000 (12:02 -0700)]
CRM-12563 Removed extraneous else and </table> tag. Fixed indenting throughout tpl file.
----------------------------------------
* CRM-12563: Mismatched <table> tags in MembershipRenewal.tpl
http://issues.civicrm.org/jira/browse/CRM-12563
Dave Greenberg [Mon, 13 May 2013 18:39:53 +0000 (11:39 -0700)]
Merge pull request #697 from agh1/manual-membership-and-price
Clarify switch between price set and manual membership (CRM-12575)
Donald A. Lobo [Mon, 13 May 2013 18:39:26 +0000 (11:39 -0700)]
CRM-12597
----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
http://issues.civicrm.org/jira/browse/CRM-12597
Donald A. Lobo [Mon, 13 May 2013 18:36:57 +0000 (11:36 -0700)]
CRM-12597
----------------------------------------
* CRM-12597: CLONE - Undefined variable: val in CRM_Contribute_BAO_Query::whereClauseSingle()
http://issues.civicrm.org/jira/browse/CRM-12597
Kurund Jalmi [Mon, 13 May 2013 16:21:45 +0000 (12:21 -0400)]
template cleanup
Ravish Nair [Mon, 13 May 2013 08:13:28 +0000 (13:43 +0530)]
-- fix for CRM-10993
Kurund Jalmi [Mon, 13 May 2013 04:19:53 +0000 (21:19 -0700)]
Merge pull request #719 from kurund/css-fixes
display fixes for admin console in j3
Kurund Jalmi [Mon, 13 May 2013 04:18:43 +0000 (00:18 -0400)]
display fixes for admin console in j3
Kurund Jalmi [Mon, 13 May 2013 01:44:58 +0000 (18:44 -0700)]
Merge pull request #707 from dlobo/CRM-12581
CRM-12581 - fix some notices
Kurund Jalmi [Mon, 13 May 2013 01:43:58 +0000 (18:43 -0700)]
Merge pull request #714 from yashodha/4.4.master
fix syntax error
Kurund Jalmi [Mon, 13 May 2013 01:42:29 +0000 (18:42 -0700)]
Merge pull request #716 from kurund/css-fixes
fixed dark background for td for joomla 3.x
Kurund Jalmi [Mon, 13 May 2013 01:26:01 +0000 (21:26 -0400)]
fixed dark background for td for joomla 3.x
yashodha [Sun, 12 May 2013 18:06:18 +0000 (23:36 +0530)]
fix syntax error
Kurund Jalmi [Sat, 11 May 2013 18:42:03 +0000 (11:42 -0700)]
Merge pull request #713 from mlutfy/4.3-case-tpl
Minor HTML fix in Case.tpl duration field.
Mathieu Lutfy [Sat, 11 May 2013 18:10:31 +0000 (14:10 -0400)]
Minor HTML fix in Case.tpl duration field.
colemanw [Sat, 11 May 2013 04:08:03 +0000 (21:08 -0700)]
Merge pull request #695 from eileenmcnaughton/eval
CRM-7964 remove Eval instances of new $string type
Tim Otten [Sat, 11 May 2013 01:02:17 +0000 (18:02 -0700)]
Merge pull request #712 from totten/fix-allfields-crash
api/v3/utils - Redo
16404fbb4 for preventing fatal error
Tim Otten [Sat, 11 May 2013 00:57:34 +0000 (20:57 -0400)]
api/v3/utils - Redo
16404fbb4 for preventing fatal error (without causing regressions)
projects / civicrm-core.git / log