Joe Murray [Tue, 19 Nov 2013 16:05:46 +0000 (11:05 -0500)]
CRM-13793 cleanup - assignment in condition, changed to test for
equality
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)
Tim Otten [Sat, 11 May 2013 00:44:45 +0000 (17:44 -0700)]
Merge pull request #711 from totten/autoconfigure-api-key
CRM-12556 - Set admin API key for new test sites
Tim Otten [Sat, 11 May 2013 00:39:44 +0000 (20:39 -0400)]
CRM-12556 - Set admin API key for new test sites
----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
http://issues.civicrm.org/jira/browse/CRM-12556
Kurund Jalmi [Fri, 10 May 2013 22:58:16 +0000 (15:58 -0700)]
Merge pull request #708 from kurund/fix
fixed error on search
Kurund Jalmi [Fri, 10 May 2013 22:57:42 +0000 (15:57 -0700)]
fixed error on search
Kurund Jalmi [Fri, 10 May 2013 17:53:02 +0000 (10:53 -0700)]
Merge pull request #706 from kurund/reg-site
fixed regsite
Kurund Jalmi [Fri, 10 May 2013 17:49:54 +0000 (10:49 -0700)]
fixed regsite
Donald A. Lobo [Fri, 10 May 2013 17:44:19 +0000 (10:44 -0700)]
CRM-12581 - fix some notices
----------------------------------------
* CRM-12581: Group(s) Selection for Profile Create Mode Not Saving
http://issues.civicrm.org/jira/browse/CRM-12581
Kurund Jalmi [Fri, 10 May 2013 17:20:25 +0000 (10:20 -0700)]
Merge pull request #704 from dlobo/CRM-12466
CRM-12466
Kurund Jalmi [Fri, 10 May 2013 17:19:56 +0000 (10:19 -0700)]
Merge pull request #705 from dlobo/CRM-12587
CRM-12587
Kurund Jalmi [Fri, 10 May 2013 17:19:28 +0000 (10:19 -0700)]
Merge pull request #703 from pratik-joshi/CRM-12571
CRM-12571 fix
dlobo [Fri, 10 May 2013 17:14:15 +0000 (10:14 -0700)]
Merge pull request #702 from eileenmcnaughton/CRM-12584
CRM-12584 GenCode shouldn't reduce memory_limit
Donald A. Lobo [Fri, 10 May 2013 16:04:47 +0000 (09:04 -0700)]
CRM-12587
----------------------------------------
* CRM-12587: setting group contact cache to zero results in it being set to 5
http://issues.civicrm.org/jira/browse/CRM-12587
Donald A. Lobo [Fri, 10 May 2013 15:54:48 +0000 (08:54 -0700)]
CRM-12466
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
Pratik Joshi [Fri, 10 May 2013 08:45:47 +0000 (14:15 +0530)]
CRM-12571 fix
eileen [Fri, 10 May 2013 08:10:01 +0000 (20:10 +1200)]
GenCode shouldn't reduce memory_limit
Kurund Jalmi [Thu, 9 May 2013 22:48:20 +0000 (15:48 -0700)]
Merge pull request #700 from dlobo/CRM-12559
CRM-12559
Kurund Jalmi [Thu, 9 May 2013 22:47:50 +0000 (15:47 -0700)]
Merge pull request #701 from dlobo/CRM-12580
CRM-12580
Donald A. Lobo [Thu, 9 May 2013 22:17:44 +0000 (15:17 -0700)]
CRM-12580
----------------------------------------
* CRM-12580: Add index to sort_name / is_deleted to civicrm_contact
http://issues.civicrm.org/jira/browse/CRM-12580
dlobo [Thu, 9 May 2013 20:17:47 +0000 (13:17 -0700)]
Merge pull request #677 from eileenmcnaughton/CRM-12557
CRM-12557 - ACL users cannot see removed , pending groups on contact sum...
Donald A. Lobo [Thu, 9 May 2013 20:15:51 +0000 (13:15 -0700)]
CRM-12559
----------------------------------------
* CRM-12559: Handle failed contributions in CRM_Contribute_BAO_Contribution_Confirm::processContribution()
http://issues.civicrm.org/jira/browse/CRM-12559
Kurund Jalmi [Thu, 9 May 2013 16:52:56 +0000 (09:52 -0700)]
Merge pull request #698 from kurund/CRM-12574
fixed error message, CRM-12574
Kurund Jalmi [Thu, 9 May 2013 16:51:21 +0000 (09:51 -0700)]
fixed error message, CRM-12574
CiviCRM [Thu, 9 May 2013 16:42:45 +0000 (09:42 -0700)]
Update version to 4.3.4
Andrew Hunt [Thu, 9 May 2013 16:09:45 +0000 (12:09 -0400)]
doing the same for contribution form
Andrew Hunt [Thu, 9 May 2013 15:10:35 +0000 (11:10 -0400)]
clarify switch between price set and manual membership
deepak-srivastava [Thu, 9 May 2013 13:22:36 +0000 (06:22 -0700)]
Merge pull request #696 from deepak-srivastava/mastro
CRM-12490 - notice fixes
Deepak Srivastava [Thu, 9 May 2013 11:45:05 +0000 (17:15 +0530)]
CRM-12490 - notice fixes
Kurund Jalmi [Thu, 9 May 2013 05:45:14 +0000 (22:45 -0700)]
Merge pull request #694 from ravishnair/CRM-12528
-- CRM-12528 Added campaign column and filter to reports
Kurund Jalmi [Thu, 9 May 2013 05:44:52 +0000 (22:44 -0700)]
Merge pull request #693 from lcdservices/activity-perms
CRM-12569 permission activity links and tasks more accurately
Ravish Nair [Thu, 9 May 2013 04:57:49 +0000 (10:27 +0530)]
-- CRM-12528 Added campaign column and filter to reports
Brian Shaughnessy [Thu, 9 May 2013 03:50:39 +0000 (23:50 -0400)]
CRM-12569 permission activity links and tasks more accurately
Dave Greenberg [Thu, 9 May 2013 00:39:01 +0000 (17:39 -0700)]
Merge pull request #691 from eileenmcnaughton/datefn
CRM-12053 rationalisation of datefilter functions
Note: I tested this locally earlier today and seems to fix the problems w/ search forms.
Kurund Jalmi [Thu, 9 May 2013 00:10:28 +0000 (17:10 -0700)]
Merge pull request #692 from kurund/CRM-12458
undo last merge:
5a10656d1e6f02ef543375e974b2439c50f3f66d
Kurund Jalmi [Thu, 9 May 2013 00:08:37 +0000 (17:08 -0700)]
undo last merge
eileen [Wed, 8 May 2013 23:52:40 +0000 (11:52 +1200)]
Remove all eval instances where eval is being used to instantiate a new object using a variable as the name
eileen [Fri, 26 Apr 2013 05:58:06 +0000 (17:58 +1200)]
CRM-12432 allow filters to be marked to be skipped by the where clause constructor
eileen [Fri, 26 Apr 2013 05:56:01 +0000 (17:56 +1200)]
CRM-12432 make split out the extracting of where functions from the construction of the where clause
eileen [Wed, 8 May 2013 22:03:49 +0000 (10:03 +1200)]
De-hack additional operators being added for report class only
The buildDate range function is called about 20 times with no additional
operators being added & twice with them being added. But the default
behaviour was to add them. This makes the default behaviour NOT to add
them & makes the one class that does add them take responsibility for
passing them in rather than a round about method of deriving them
eileen [Fri, 26 Apr 2013 05:58:06 +0000 (17:58 +1200)]
CRM-12432 allow filters to be marked to be skipped by the where clause constructor
eileen [Fri, 26 Apr 2013 05:56:01 +0000 (17:56 +1200)]
CRM-12432 make split out the extracting of where functions from the construction of the where clause
Kurund Jalmi [Wed, 8 May 2013 22:13:29 +0000 (15:13 -0700)]
Merge pull request #690 from yashodha/4.3.CRM-12458
CRM-12458
Tim Otten [Wed, 8 May 2013 21:28:31 +0000 (14:28 -0700)]
Merge pull request #689 from totten/phpunit-crash-utils
api/v3/utils - Fix bad variable reference which causes PHPUnit to crash
yashodha [Wed, 8 May 2013 21:13:15 +0000 (02:43 +0530)]
CRM-12458
Tim Otten [Wed, 8 May 2013 21:27:04 +0000 (14:27 -0700)]
api/v3/utils - Fix bad variable reference which causes PHPUnit to crash
Kurund Jalmi [Wed, 8 May 2013 21:12:42 +0000 (14:12 -0700)]
Merge pull request #686 from totten/mktest-mail
mk-drupal-test-site - Write outgoing mails to /dev/null
colemanw [Wed, 8 May 2013 20:51:05 +0000 (13:51 -0700)]
Merge pull request #688 from colemanw/CRM-12471
Look before leaping when flushing pseudoconstants CRM-12471
Coleman Watts [Wed, 8 May 2013 20:48:51 +0000 (13:48 -0700)]
Look before leaping when flushing pseudoconstants CRM-12471
Tim Otten [Wed, 8 May 2013 19:28:15 +0000 (12:28 -0700)]
Merge pull request #687 from totten/http-array-error
HttpClient - Fix bad return format
Tim Otten [Wed, 8 May 2013 19:26:04 +0000 (12:26 -0700)]
HttpClient - Fix bad return format
Tim Otten [Wed, 8 May 2013 18:41:47 +0000 (18:41 +0000)]
mk-drupal-test-site - Write outgoing mails to /dev/null
Kurund Jalmi [Wed, 8 May 2013 18:07:01 +0000 (11:07 -0700)]
Merge pull request #685 from kurund/CRM-12512
removed obsolete code that tried to create duplicate assignee contacts, ...
Kurund Jalmi [Wed, 8 May 2013 18:06:01 +0000 (11:06 -0700)]
removed obsolete code that tried to create duplicate assignee contacts, CRM-12512
Tim Otten [Wed, 8 May 2013 17:19:18 +0000 (10:19 -0700)]
Merge pull request #670 from pratik-joshi/CRM-12503
CRM-12503
Kurund Jalmi [Wed, 8 May 2013 17:19:07 +0000 (10:19 -0700)]
Merge pull request #679 from davecivicrm/CRM-12397
Add back in the NONE option for additional participant profile bottom sl...
Kurund Jalmi [Wed, 8 May 2013 17:14:03 +0000 (10:14 -0700)]
Merge pull request #678 from yashodha/SOFT
Soft
Kurund Jalmi [Wed, 8 May 2013 17:07:39 +0000 (10:07 -0700)]
Merge pull request #682 from kirkatcaat/master
Render line breaks in event registration Note field (CRM-12561)
Kurund Jalmi [Wed, 8 May 2013 16:06:54 +0000 (09:06 -0700)]
Merge pull request #681 from GiantRobot/CRM-12560
Fix CRM-12560 by matching test trxn_ids only which can be incremented.
dlobo [Wed, 8 May 2013 14:09:08 +0000 (07:09 -0700)]
Merge pull request #683 from dlobo/CRM-12558
CRM-12558
projects / civicrm-core.git / log