Kurund Jalmi [Sun, 7 Apr 2013 22:11:06 +0000 (15:11 -0700)]
Merge pull request #335 from dlobo/CRM-12290
CRM-12290
Donald A. Lobo [Sun, 7 Apr 2013 16:53:25 +0000 (09:53 -0700)]
CRM-12290
----------------------------------------
* CRM-12290: Monetary units - currency symbol for Namibian Dollar is wrong
http://issues.civicrm.org/jira/browse/CRM-12290
Dave Greenberg [Fri, 5 Apr 2013 22:29:25 +0000 (15:29 -0700)]
Merge pull request #332 from colemanw/payprocc3
Payprocc3
Coleman Watts [Fri, 5 Apr 2013 21:19:26 +0000 (14:19 -0700)]
Fix event payment fields display CRM-12279
Dave Greenberg [Fri, 5 Apr 2013 19:40:33 +0000 (12:40 -0700)]
Merge pull request #330 from deepak-srivastava/new
CRM-12225
colemanw [Fri, 5 Apr 2013 18:28:37 +0000 (11:28 -0700)]
Merge pull request #328 from ravishnair/webtest-fix/improvement
-- webtest fixes(tests that is not listed in biryani and were failing)
colemanw [Fri, 5 Apr 2013 18:21:08 +0000 (11:21 -0700)]
Merge pull request #331 from mlutfy/tpl-fix
Avoid very generic strings which make translation difficult (New %1).
Mathieu Lutfy [Fri, 5 Apr 2013 18:18:16 +0000 (14:18 -0400)]
Avoid very generic strings which make translation difficult.
Deepak Srivastava [Fri, 5 Apr 2013 08:41:20 +0000 (14:11 +0530)]
CRM-12225
Kurund Jalmi [Fri, 5 Apr 2013 17:00:10 +0000 (10:00 -0700)]
Merge pull request #329 from ThomWilhelm/CRM-12289
Only send SMS if it is a mobile number, do not delete parent activity as...
Thom Wilhelm [Fri, 5 Apr 2013 16:50:40 +0000 (17:50 +0100)]
Only send SMS if it is a mobile number, do not delete parent activity as it might be shared between many users
Coleman Watts [Fri, 5 Apr 2013 16:40:22 +0000 (09:40 -0700)]
Fix js syntax error CRM-12149
Coleman Watts [Fri, 5 Apr 2013 16:19:36 +0000 (09:19 -0700)]
Fix php syntax error
Coleman Watts [Fri, 5 Apr 2013 03:27:14 +0000 (20:27 -0700)]
Duplicate code cleanup
Ravish Nair [Fri, 5 Apr 2013 14:19:27 +0000 (19:49 +0530)]
-- webtest fixes(tests that is not listed in biryani and were failing)
Dave Greenberg [Thu, 4 Apr 2013 19:52:35 +0000 (12:52 -0700)]
Merge pull request #324 from pradpnayak/CRM-12275
--fixed for CRM-12275 Tested locally.
colemanw [Thu, 4 Apr 2013 18:50:10 +0000 (11:50 -0700)]
Merge pull request #327 from davecivicrm/CRM-12280
CRM-12280 fixes to civicrm.css to prevent force compatibility mode in IE...
Dave Greenberg [Thu, 4 Apr 2013 18:46:24 +0000 (11:46 -0700)]
CRM-12280 fixes to civicrm.css to prevent force compatibility mode in IE9
----------------------------------------
* CRM-12280: "Compatibility mode" forced in IE9 (Joomla version)
http://issues.civicrm.org/jira/browse/CRM-12280
Dave Greenberg [Thu, 4 Apr 2013 18:38:35 +0000 (11:38 -0700)]
Merge pull request #326 from dlobo/CRM-12282
CRM-12282
Donald A. Lobo [Thu, 4 Apr 2013 18:32:07 +0000 (11:32 -0700)]
CRM-12282
----------------------------------------
* CRM-12282: Activity Delete gives an invalid key error
http://issues.civicrm.org/jira/browse/CRM-12282
Pradeep Nayak [Thu, 4 Apr 2013 10:53:40 +0000 (16:23 +0530)]
--fixed for CRM-12275
Kurund Jalmi [Thu, 4 Apr 2013 09:06:12 +0000 (02:06 -0700)]
Merge pull request #321 from davecivicrm/CRM-12277
CRM-12277 Add info to Batch status change message to let users now that ...
Dave Greenberg [Thu, 4 Apr 2013 00:57:18 +0000 (17:57 -0700)]
Merge pull request #322 from colemanw/payprocc2
Remember payment processor during form reload, fix notices CRM-12149
Coleman Watts [Thu, 4 Apr 2013 00:45:17 +0000 (17:45 -0700)]
Remember payment processor during form reload, fix notices CRM-12149
Dave Greenberg [Thu, 4 Apr 2013 00:37:48 +0000 (17:37 -0700)]
Merge pull request #320 from colemanw/event-snippet
These changes fixed the default setting issue and erroneous form rule invocation.
Coleman Watts [Wed, 3 Apr 2013 23:17:58 +0000 (16:17 -0700)]
Remember payment processor when user clicks the back button CRM-12149
Dave Greenberg [Wed, 3 Apr 2013 21:30:46 +0000 (14:30 -0700)]
CRM-12277 Add info to Batch status change message to let users now that notifications will be sent for Pending Pay Later to Attended or Registered updates.
----------------------------------------
* CRM-12277: Notify batch Change Participant Status users that changing status FROM Pay Later TO Attended or Registered triggers email notification and payment status update
http://issues.civicrm.org/jira/browse/CRM-12277
Coleman Watts [Wed, 3 Apr 2013 20:41:46 +0000 (13:41 -0700)]
Code cleanup and php strict fix
Kurund Jalmi [Wed, 3 Apr 2013 20:33:34 +0000 (13:33 -0700)]
Merge pull request #319 from yashodha/CRM-12266
CRM-12266
Coleman Watts [Wed, 3 Apr 2013 20:22:27 +0000 (13:22 -0700)]
Fix required payment fields CRM-12149
yashodha [Wed, 3 Apr 2013 20:19:25 +0000 (01:49 +0530)]
CRM-12266
Kurund Jalmi [Wed, 3 Apr 2013 20:08:58 +0000 (13:08 -0700)]
Merge pull request #317 from kurund/CRM-12238
CRM-12238
Coleman Watts [Wed, 3 Apr 2013 19:26:03 +0000 (12:26 -0700)]
Fix setting defaults for event form CRM-12149
dlobo [Wed, 3 Apr 2013 17:24:23 +0000 (10:24 -0700)]
Merge pull request #318 from davecivicrm/CRM-12268
CRM-12268 Also fixing minor layout problem for price set calculated tota...
Dave Greenberg [Wed, 3 Apr 2013 17:15:11 +0000 (10:15 -0700)]
CRM-12268 Also fixing minor layout problem for price set calculated totals on public pages, and add missing space in Membership form status msg.
----------------------------------------
* CRM-12268: Completing a pay-later ignores the membership number of terms
http://issues.civicrm.org/jira/browse/CRM-12268
Dave Greenberg [Wed, 3 Apr 2013 17:14:07 +0000 (10:14 -0700)]
Merge pull request #310 from agh1/paylater-multiterm
check number of terms when updating member payment status
Kurund Jalmi [Wed, 3 Apr 2013 17:07:07 +0000 (18:07 +0100)]
worked on CRM-12238, fixed fatal when search contacts after selecting only state and not country
dlobo [Wed, 3 Apr 2013 17:07:03 +0000 (10:07 -0700)]
Merge pull request #304 from pradpnayak/CRM-12233
-- added form rule for CRM-12233
Kurund Jalmi [Wed, 3 Apr 2013 17:01:37 +0000 (18:01 +0100)]
worked on CRM-12238, do not set localized defaults for country, state and county for advanced search
Kurund Jalmi [Wed, 3 Apr 2013 14:34:08 +0000 (07:34 -0700)]
Merge pull request #288 from colemanw/payprocc
Payprocc
Kurund Jalmi [Wed, 3 Apr 2013 14:31:12 +0000 (07:31 -0700)]
Merge pull request #315 from deepak-srivastava/beta
CRM-12206
Kurund Jalmi [Wed, 3 Apr 2013 14:30:12 +0000 (07:30 -0700)]
Merge pull request #316 from yashodha/CRM-12269
CRM-12269
yashodha [Wed, 3 Apr 2013 13:26:55 +0000 (18:56 +0530)]
CRM-12269
Kurund Jalmi [Wed, 3 Apr 2013 13:00:54 +0000 (06:00 -0700)]
Merge pull request #314 from pratik-joshi/CRM-12217
CRM-12217 fix : the sixth parameter for getFieldsForImport function was ...
Pratik Joshi [Wed, 3 Apr 2013 12:41:28 +0000 (18:11 +0530)]
CRM-12217 fix : the sixth parameter for getFieldsForImport function was not set to true
Deepak Srivastava [Wed, 3 Apr 2013 11:46:37 +0000 (17:16 +0530)]
CRM-12206
Pradeep Nayak [Wed, 3 Apr 2013 10:40:32 +0000 (16:10 +0530)]
-- added comments CRM-12233
Pradeep Nayak [Wed, 3 Apr 2013 10:33:50 +0000 (16:03 +0530)]
-- code improvement for CRM-12233
Pradeep Nayak [Wed, 3 Apr 2013 10:12:45 +0000 (15:42 +0530)]
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
Kurund Jalmi [Wed, 3 Apr 2013 09:33:35 +0000 (02:33 -0700)]
Merge pull request #301 from colemanw/caseActivityDashlet
Fix changing case status in dashboard CRM-12202
Kurund Jalmi [Wed, 3 Apr 2013 09:26:27 +0000 (02:26 -0700)]
Merge pull request #307 from yashodha/CRM-12219
CRM-12219
Kurund Jalmi [Wed, 3 Apr 2013 09:25:54 +0000 (02:25 -0700)]
Merge pull request #313 from mlutfy/ts-fixes
ts() usage fixes.
Mathieu Lutfy [Wed, 3 Apr 2013 04:59:46 +0000 (00:59 -0400)]
Fix ts usage.
Coleman Watts [Tue, 2 Apr 2013 23:43:59 +0000 (16:43 -0700)]
Fix onBehalf required fields CRM-12149
Mathieu Lutfy [Tue, 2 Apr 2013 23:39:26 +0000 (19:39 -0400)]
ts() usage fixes. c.f. wiki.civicrm.org/confluence/display/CRMDOC43/Internationalisation+for+Developers
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
Andrew Hunt [Tue, 2 Apr 2013 19:16:47 +0000 (15:16 -0400)]
check number of terms when updating member payment status
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
yashodha [Tue, 2 Apr 2013 13:42:48 +0000 (19:12 +0530)]
CRM-12219
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.)
Pradeep Nayak [Tue, 2 Apr 2013 10:37:55 +0000 (16:07 +0530)]
-- added form rule for CRM-12233
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
Coleman Watts [Mon, 1 Apr 2013 23:50:37 +0000 (16:50 -0700)]
Fix changing case status in dashboard CRM-12202
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
projects / civicrm-core.git / log