colemanw [Tue, 2 Apr 2013 21:19:43 +0000 (14:19 -0700)]
Merge pull request #312 from dlobo/NoticeFixes
fix php5 notices, strict warnings and code formatting
colemanw [Tue, 2 Apr 2013 21:18:25 +0000 (14:18 -0700)]
Merge pull request #306 from pratik-joshi/webtest-improvement
webtest code improvement and cleanup
Donald A. Lobo [Tue, 2 Apr 2013 21:00:14 +0000 (14:00 -0700)]
fix php5 notices, strict warnings and code formatting
Tim Otten [Tue, 2 Apr 2013 20:31:22 +0000 (13:31 -0700)]
Merge pull request #311 from davecivicrm/memberLabelFix
CRM-12233 Label for newly create quick config price fields for membershi...
Dave Greenberg [Tue, 2 Apr 2013 20:19:31 +0000 (13:19 -0700)]
CRM-12233 Label for newly create quick config price fields for membership block should be Membership, not Membership Amount. Leaving the price_field.name as membership_amount since that's clearer as a machine name.
----------------------------------------
* CRM-12233: Online membership signup - contribution amounts field should not be required + various notices
http://issues.civicrm.org/jira/browse/CRM-12233
colemanw [Tue, 2 Apr 2013 17:24:11 +0000 (10:24 -0700)]
Merge pull request #309 from kirkatcaat/master
Fixes auto-increment in OptionValue BAO (CRM-12133)
colemanw [Tue, 2 Apr 2013 17:19:55 +0000 (10:19 -0700)]
Merge pull request #305 from ravishnair/webtest-fix/improvement
-- webtest fix(type was not writing anything inside tinymce as it does n...
colemanw [Tue, 2 Apr 2013 17:18:41 +0000 (10:18 -0700)]
Merge pull request #300 from wellebee/CRM-12265
Added hook calls to CRM_Core_BAO_MessageTemplates::add().
colemanw [Tue, 2 Apr 2013 16:59:33 +0000 (09:59 -0700)]
Merge pull request #308 from davecivicrm/CRM-12248
CRM-12248 fix status msg (should reference Supervised dedupe rule instea...
Kirk Jackson [Tue, 2 Apr 2013 16:41:51 +0000 (17:41 +0100)]
CRM-12133: Changed OptionValue's auto-increment function to use numeric comparison instead of string comparison.
Dave Greenberg [Tue, 2 Apr 2013 16:40:36 +0000 (09:40 -0700)]
CRM-12248 fix status msg (should reference Supervised dedupe rule instead of Unsupervised) and fix alert display to be one-at-a-time.
----------------------------------------
* CRM-12248: Configure Event: Registration tab - ruleFields variable used to display alert for Allow multiple
http://issues.civicrm.org/jira/browse/CRM-12248
Pratik Joshi [Tue, 2 Apr 2013 12:59:03 +0000 (18:29 +0530)]
webtest code improvement and cleanup
Ravish Nair [Tue, 2 Apr 2013 11:14:19 +0000 (16:44 +0530)]
-- webtest fix(type was not writing anything inside tinymce as it does not work for tinymce 3.4.x+ versions as per some posts in stackoverflow.so, I applied the suggested fix.)
Kurund Jalmi [Tue, 2 Apr 2013 09:24:43 +0000 (02:24 -0700)]
Merge pull request #298 from colemanw/js-fix
Js fix
Keith Morgan [Tue, 2 Apr 2013 09:22:06 +0000 (04:22 -0500)]
Adding hooks to MessageTemplates CRM-12265
Kurund Jalmi [Tue, 2 Apr 2013 08:53:15 +0000 (01:53 -0700)]
Merge pull request #303 from pratik-joshi/webtest-improvement
webtest improvement : the search result is not properly displayed, had t...
Pratik Joshi [Tue, 2 Apr 2013 08:00:22 +0000 (13:30 +0530)]
webtest improvement : the search result is not properly displayed, had to 'wait' for result set display WRT to searched criteria
colemanw [Tue, 2 Apr 2013 03:27:56 +0000 (20:27 -0700)]
Merge pull request #302 from totten/releaser-fixes
CRM-12264 - Set branch names in distmaker.conf
Keith Morgan [Mon, 1 Apr 2013 23:19:12 +0000 (18:19 -0500)]
Cleaned up hook invocations.
Keith Morgan [Mon, 1 Apr 2013 23:00:17 +0000 (18:00 -0500)]
Added hook calls to CRM_Core_BAO_MessageTemplates::add().
colemanw [Mon, 1 Apr 2013 22:18:10 +0000 (15:18 -0700)]
Merge pull request #299 from davecivicrm/CRM-12258
CRM-12258 Default processor appears first in radio button set. Set defau...
Dave Greenberg [Mon, 1 Apr 2013 21:12:12 +0000 (14:12 -0700)]
CRM-12258 Default processor appears first in radio button set. Set default processor as default for payment_processor radio button event registration form.
----------------------------------------
* CRM-12258: Default payment processor should appear first in Payment Method radio button for online contribution page and online event registration
http://issues.civicrm.org/jira/browse/CRM-12258
Coleman Watts [Mon, 1 Apr 2013 19:44:12 +0000 (12:44 -0700)]
Remove advmultiselectResize from global scope
Tim Otten [Mon, 1 Apr 2013 19:26:24 +0000 (15:26 -0400)]
Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes
Conflicts:
CRM/Core/BAO/File.php
Tim Otten [Mon, 1 Apr 2013 19:11:15 +0000 (12:11 -0700)]
Merge pull request #297 from dlobo/CRM-12254
CRM-12254
Coleman Watts [Mon, 1 Apr 2013 18:30:18 +0000 (11:30 -0700)]
Code cleanup and js linting
Coleman Watts [Mon, 1 Apr 2013 17:43:51 +0000 (10:43 -0700)]
Use 'on' method instead of deprecated 'live'
Coleman Watts [Mon, 1 Apr 2013 17:38:32 +0000 (10:38 -0700)]
Fix js strict error
Donald A. Lobo [Mon, 1 Apr 2013 16:29:08 +0000 (09:29 -0700)]
CRM-12254
Donald A. Lobo [Mon, 1 Apr 2013 16:14:45 +0000 (09:14 -0700)]
CRM-12261
Kurund Jalmi [Mon, 1 Apr 2013 15:00:51 +0000 (08:00 -0700)]
Merge pull request #296 from ravishnair/webtest-fix/improvement
Webtest fix/improvement
Kurund Jalmi [Mon, 1 Apr 2013 13:56:05 +0000 (06:56 -0700)]
Merge pull request #295 from aydun/bu_shared_address
CRM-12259 suppress Master Address Belongs To from list of fields
Kurund Jalmi [Mon, 1 Apr 2013 13:48:06 +0000 (06:48 -0700)]
Merge pull request #294 from pradpnayak/CRM-12233
-- fixed for CRM-12233
Kurund Jalmi [Mon, 1 Apr 2013 13:47:27 +0000 (06:47 -0700)]
Merge pull request #293 from pratik-joshi/minor-api-bug-fix
minor bug found during execution of WebTest_Contact_AddTest::testHouseho...
Aidan Saunders [Mon, 1 Apr 2013 13:45:09 +0000 (13:45 +0000)]
CRM-12259 suppress Master Address Belongs To from list of fields
available to profiles
----------------------------------------
* CRM-12259: Bulk update with shared address fails
http://issues.civicrm.org/jira/browse/CRM-12259
Ravish Nair [Mon, 1 Apr 2013 13:21:18 +0000 (18:51 +0530)]
-- webtest fix (due to changes made in CRM-12202)
Pradeep Nayak [Mon, 1 Apr 2013 12:55:11 +0000 (18:25 +0530)]
-- fixed for CRM-12233
Pratik Joshi [Mon, 1 Apr 2013 12:48:23 +0000 (18:18 +0530)]
minor bug found during execution of WebTest_Contact_AddTest::testHouseholdAdd test case (failing locally with the same error shown on server)
Ravish Nair [Mon, 1 Apr 2013 11:15:11 +0000 (16:45 +0530)]
-- webtest improvement made based on the break on server
Ravish Nair [Mon, 1 Apr 2013 10:48:02 +0000 (16:18 +0530)]
-- webtest improvement
Kurund Jalmi [Mon, 1 Apr 2013 09:44:16 +0000 (02:44 -0700)]
Merge pull request #292 from yashodha/CRM-12257
CRM-12257
Kurund Jalmi [Mon, 1 Apr 2013 09:39:55 +0000 (02:39 -0700)]
Merge pull request #282 from colemanw/button-css
Fix button size CRM-12218
yashodha [Mon, 1 Apr 2013 09:09:43 +0000 (14:39 +0530)]
CRM-12257
Kurund Jalmi [Mon, 1 Apr 2013 08:51:36 +0000 (01:51 -0700)]
Merge pull request #284 from colemanw/case-activity-status
Refresh case table without reloading the page CRM-12202
Kurund Jalmi [Mon, 1 Apr 2013 08:47:34 +0000 (01:47 -0700)]
Merge pull request #290 from dlobo/CRM-12256
CRM-12256
Kurund Jalmi [Mon, 1 Apr 2013 08:47:16 +0000 (01:47 -0700)]
Merge pull request #291 from pratik-joshi/webtest-improvement
webtest fix : the possibility of this test failing on server can be beca...
Pratik Joshi [Mon, 1 Apr 2013 08:46:01 +0000 (14:16 +0530)]
webtest fix
Pratik Joshi [Mon, 1 Apr 2013 08:13:16 +0000 (13:43 +0530)]
webtest fix : the possibility of this test failing on server can be because of not appropriate permission for authenticated role user
Donald A. Lobo [Sun, 31 Mar 2013 21:52:12 +0000 (14:52 -0700)]
CRM-12256
Donald A. Lobo [Sun, 31 Mar 2013 21:45:19 +0000 (14:45 -0700)]
formatting fixes
Donald A. Lobo [Fri, 29 Mar 2013 18:15:47 +0000 (11:15 -0700)]
fix notices
colemanw [Sat, 30 Mar 2013 21:13:39 +0000 (14:13 -0700)]
Merge pull request #287 from totten/givi
Givi - Include tool for coordinating checkouts
Tim Otten [Sat, 30 Mar 2013 21:09:02 +0000 (17:09 -0400)]
givi - Explain workfow assumptions in help text
colemanw [Sat, 30 Mar 2013 20:59:55 +0000 (13:59 -0700)]
Merge pull request #285 from totten/community-messages
CRM-12193 - Community messages
Tim Otten [Sat, 30 Mar 2013 20:47:06 +0000 (16:47 -0400)]
CRM-12193 - Use temporay URL pointing to a static JSON document
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
colemanw [Sat, 30 Mar 2013 20:27:52 +0000 (13:27 -0700)]
Merge pull request #286 from dlobo/CRM-12254
CRM-12254
colemanw [Sat, 30 Mar 2013 20:27:14 +0000 (13:27 -0700)]
Merge pull request #283 from dlobo/CRM-12247
CRM-12247
Donald A. Lobo [Sat, 30 Mar 2013 17:43:43 +0000 (10:43 -0700)]
CRM-12254
Donald A. Lobo [Sat, 30 Mar 2013 16:51:00 +0000 (09:51 -0700)]
CRM-12254
Coleman Watts [Sat, 30 Mar 2013 06:03:31 +0000 (23:03 -0700)]
More appropriate status message when saving a case
Coleman Watts [Sat, 30 Mar 2013 05:49:55 +0000 (22:49 -0700)]
Style status as editable
Tim Otten [Sat, 30 Mar 2013 03:46:10 +0000 (23:46 -0400)]
CommunityMessagesTest - Cleanup
Coleman Watts [Sat, 30 Mar 2013 03:16:23 +0000 (20:16 -0700)]
Refresh case table without reloading the page CRM-12202
Tim Otten [Sat, 30 Mar 2013 03:18:56 +0000 (23:18 -0400)]
CRM-12193 - Display community message on dashboard
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 03:06:44 +0000 (23:06 -0400)]
CRM-12193 - Register setting "communityMessagesUrl"; extract methods "isEnabled" and "getRenderedUrl"
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 02:54:31 +0000 (22:54 -0400)]
CommunityMessagesTest - Relax probability test
Tim Otten [Sat, 30 Mar 2013 02:31:25 +0000 (22:31 -0400)]
CRM-12193 - Implement evalMarkup; tweak docs
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 02:13:21 +0000 (22:13 -0400)]
CRM-12193 - Add pick() function randomly choose among options (provided that permission/component filters apply)
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 01:28:49 +0000 (21:28 -0400)]
CRM-12193 - Use more descriptive example text
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 01:26:11 +0000 (21:26 -0400)]
CRM-12193 - Use @dataProvider to eliminate nearly-identical tests while getting more thorough coverage
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 01:06:10 +0000 (21:06 -0400)]
CRM-12193 - Validate JSON documents
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 00:55:41 +0000 (20:55 -0400)]
CRM-12193 - Add testGetDocument_disabled; misc cleanup
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Sat, 30 Mar 2013 00:49:30 +0000 (20:49 -0400)]
Add more URL tokens
Tim Otten [Sat, 30 Mar 2013 00:37:11 +0000 (20:37 -0400)]
CRM-12193 - Extract CRM_Utils_System::evalUrl for use with extension-browser and community-messages
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Donald A. Lobo [Fri, 29 Mar 2013 23:43:48 +0000 (16:43 -0700)]
CRM-12247
Tim Otten [Fri, 29 Mar 2013 23:38:52 +0000 (19:38 -0400)]
CRM-12193 - Implement CommunityMessages download/caching behavior
----------------------------------------
* CRM-12193: In-app fundraising for CiviCRM
http://issues.civicrm.org/jira/browse/CRM-12193
Tim Otten [Fri, 29 Mar 2013 21:57:10 +0000 (17:57 -0400)]
CRM_Utils_HttpClient - Reduce duplication between get() and fetch()
Tim Otten [Fri, 29 Mar 2013 21:38:47 +0000 (17:38 -0400)]
CRM_Utils_HttpClient - Add get() method
Tim Otten [Fri, 29 Mar 2013 20:32:22 +0000 (16:32 -0400)]
CRM_Utils_HttpClient - Change static method (in preparation for using mock clients in testing)
Coleman Watts [Fri, 29 Mar 2013 21:21:04 +0000 (14:21 -0700)]
Fix button size CRM-12218
dlobo [Fri, 29 Mar 2013 16:00:03 +0000 (09:00 -0700)]
Merge pull request #281 from davecivicrm/CRM-12233
CRM-12233 Add upgrade statement to fix Membership field label for quick ...
Dave Greenberg [Fri, 29 Mar 2013 15:52:56 +0000 (08:52 -0700)]
CRM-12233 Add upgrade statement to fix Membership field label for quick config
----------------------------------------
* CRM-12233: Online membership signup - contribution amounts field should not be required + various notices
http://issues.civicrm.org/jira/browse/CRM-12233
Dave Greenberg [Fri, 29 Mar 2013 15:44:34 +0000 (08:44 -0700)]
Merge pull request #279 from pradpnayak/CRM-12233
--fixed for CRM-12233
dlobo [Fri, 29 Mar 2013 14:57:27 +0000 (07:57 -0700)]
Merge pull request #280 from dlobo/CRM-12117
CRM-12117
Donald A. Lobo [Fri, 29 Mar 2013 14:55:34 +0000 (07:55 -0700)]
CRM-12117
colemanw [Fri, 29 Mar 2013 14:34:29 +0000 (07:34 -0700)]
Merge pull request #278 from totten/upgrade-rescachecode
CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for...
Pradeep Nayak [Fri, 29 Mar 2013 12:16:22 +0000 (17:46 +0530)]
-- sample data fixes for CRM-12233
Pradeep Nayak [Fri, 29 Mar 2013 12:15:25 +0000 (17:45 +0530)]
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
Pradeep Nayak [Fri, 29 Mar 2013 11:29:35 +0000 (16:59 +0530)]
--fixed for CRM-12233
Tim Otten [Fri, 29 Mar 2013 04:48:58 +0000 (00:48 -0400)]
CRM_Core_Resources - Don't access settings during upgrade mode. (Fix for upgrades from 4.0.0 to 4.3.x.)
Tim Otten [Fri, 29 Mar 2013 04:25:07 +0000 (21:25 -0700)]
Merge pull request #277 from colemanw/upgrade-const
Fix constant during 4.1 upgrade
Coleman Watts [Fri, 29 Mar 2013 04:20:42 +0000 (21:20 -0700)]
Fix constant during 4.1 upgrade
colemanw [Fri, 29 Mar 2013 04:01:28 +0000 (21:01 -0700)]
Merge pull request #258 from colemanw/groupEdit
Remove alpha sort from pager CRM-12212
colemanw [Fri, 29 Mar 2013 03:20:07 +0000 (20:20 -0700)]
Merge pull request #272 from colemanw/tagGroup
Tag group
colemanw [Fri, 29 Mar 2013 03:18:26 +0000 (20:18 -0700)]
Merge pull request #261 from eileenmcnaughton/CRM-12209
CRM-12209 groups not showing when ACL hook in use
Tim Otten [Fri, 29 Mar 2013 00:38:30 +0000 (17:38 -0700)]
Merge pull request #273 from colemanw/dashboard
Fix dashboard popups
Tim Otten [Thu, 28 Mar 2013 22:24:02 +0000 (15:24 -0700)]
Merge pull request #275 from agh1/warn-mailerjobsize
Warn mailerjobsize
Andrew Hunt [Thu, 28 Mar 2013 19:49:48 +0000 (15:49 -0400)]
made it more concise
Andrew Hunt [Thu, 28 Mar 2013 19:41:44 +0000 (15:41 -0400)]
validate Mailer Settings admin form
Tim Otten [Thu, 28 Mar 2013 19:29:16 +0000 (12:29 -0700)]
Merge pull request #274 from davecivicrm/CRM-12243
CRM-12243 check if premiums_nothankyou_label column exists before adding...
projects / civicrm-core.git / log