eileen [Wed, 10 Apr 2013 04:57:31 +0000 (16:57 +1200)]
CRM-12317 fix domain tokens
colemanw [Wed, 10 Apr 2013 03:25:50 +0000 (20:25 -0700)]
Merge pull request #365 from eileenmcnaughton/4.3
whitespace line endings & incode documenation
eileen [Wed, 10 Apr 2013 02:37:19 +0000 (14:37 +1200)]
add in-code documentation
eileen [Wed, 10 Apr 2013 02:36:58 +0000 (14:36 +1200)]
fix whitespace
colemanw [Tue, 9 Apr 2013 22:36:08 +0000 (15:36 -0700)]
Merge pull request #363 from davecivicrm/CRM-12308
CRM-12308 Removed reference to a non-existent template. Checked that $in...
Dave Greenberg [Tue, 9 Apr 2013 22:33:35 +0000 (15:33 -0700)]
Merge pull request #362 from colemanw/CRM-12312
Fix event contribution_type FK error CRM-12312
Dave Greenberg [Tue, 9 Apr 2013 22:30:47 +0000 (15:30 -0700)]
CRM-12308 Removed reference to a non-existent template. Checked that $initialPayment which triggers the include is not declared anywhere in the codebase. This was cruft left-over from partial payment functionality which is partially implemented under CiviAcocounts branch and then removed.
----------------------------------------
* CRM-12308: Missing template file
http://issues.civicrm.org/jira/browse/CRM-12308
Coleman Watts [Tue, 9 Apr 2013 22:30:45 +0000 (15:30 -0700)]
Fix event contribution_type FK error CRM-12312
colemanw [Tue, 9 Apr 2013 21:46:14 +0000 (14:46 -0700)]
Merge pull request #361 from colemanw/CRM-10012
Don't show deleted contacts CRM-10012
Coleman Watts [Tue, 9 Apr 2013 21:45:11 +0000 (14:45 -0700)]
Don't show deleted contacts CRM-10012
colemanw [Tue, 9 Apr 2013 21:27:35 +0000 (14:27 -0700)]
Merge pull request #351 from davecivicrm/CRM-12299
CRM-12299 Fix misalignments in profile/view, profile view when embedded ...
Kurund Jalmi [Tue, 9 Apr 2013 16:37:31 +0000 (09:37 -0700)]
Merge pull request #357 from pratik-joshi/CRM-12273_QA_fix
CRM-12273 minor QA for some DB state observed after upgrade after checki...
Pratik Joshi [Tue, 9 Apr 2013 16:25:46 +0000 (21:55 +0530)]
CRM-12273 minor QA for some DB state observed after upgrade after checking PR 323
Kurund Jalmi [Tue, 9 Apr 2013 14:51:14 +0000 (07:51 -0700)]
Merge pull request #356 from ravishnair/batchTransactionPageFix
-- Batch transaction page minor fix(Query Syntax error)
Ravish Nair [Tue, 9 Apr 2013 14:36:58 +0000 (20:06 +0530)]
-- Batch transaction page minor fix(Query Syntax error)
Kurund Jalmi [Tue, 9 Apr 2013 14:07:02 +0000 (07:07 -0700)]
Merge pull request #347 from dlobo/FormattingFixes
formatting and cleanup
Kurund Jalmi [Tue, 9 Apr 2013 14:06:44 +0000 (07:06 -0700)]
Merge pull request #348 from colemanw/ts
Fix accidental use of t() CRM-12303
Kurund Jalmi [Tue, 9 Apr 2013 14:04:05 +0000 (07:04 -0700)]
Merge pull request #352 from colemanw/CRM-12298
Fix jQuery redirect params CRM-12298
Kurund Jalmi [Tue, 9 Apr 2013 13:51:42 +0000 (06:51 -0700)]
Merge pull request #354 from eileenmcnaughton/CRM-12306
CRM-12306 - fix null over-write on is_email_receipt
Kurund Jalmi [Tue, 9 Apr 2013 13:48:37 +0000 (06:48 -0700)]
Merge pull request #349 from colemanw/icons
Icons
eileen [Tue, 9 Apr 2013 07:28:51 +0000 (19:28 +1200)]
CRM-12306 - only save ->values['is_email_receipt'] to ['is_email_receipt'] if not already set
Coleman Watts [Tue, 9 Apr 2013 04:22:43 +0000 (21:22 -0700)]
Fix jQuery redirect params CRM-12298
Dave Greenberg [Tue, 9 Apr 2013 00:48:31 +0000 (17:48 -0700)]
CRM-12299 Fix misalignments in profile/view, profile view when embedded in Confirm and Thankyou pages for online contribution and event regisration, profile view and edit when embedded in user registration or user account edit. Most of these issues were related to the crm-public styles introduced for input fields.
----------------------------------------
* CRM-12299: Profile view and profile pop-up layout fixes
http://issues.civicrm.org/jira/browse/CRM-12299
colemanw [Tue, 9 Apr 2013 00:27:59 +0000 (17:27 -0700)]
Merge pull request #350 from eileenmcnaughton/master
CRM-11984 fix OG Sync for D6 users
eileen [Tue, 9 Apr 2013 00:18:26 +0000 (12:18 +1200)]
CRM-11984 revert d6 OG sync function to use d6 relevant function
Coleman Watts [Tue, 9 Apr 2013 00:06:47 +0000 (17:06 -0700)]
Add larger logo img
Coleman Watts [Tue, 9 Apr 2013 00:02:18 +0000 (17:02 -0700)]
Update logo for joomla pages
Coleman Watts [Mon, 8 Apr 2013 23:53:08 +0000 (16:53 -0700)]
Fix accidental use of t() CRM-12303
Donald A. Lobo [Mon, 8 Apr 2013 23:49:13 +0000 (16:49 -0700)]
formatting and cleanup
Coleman Watts [Mon, 8 Apr 2013 23:39:43 +0000 (16:39 -0700)]
Remove unused icons
dlobo [Mon, 8 Apr 2013 23:25:24 +0000 (16:25 -0700)]
Merge pull request #346 from dlobo/CRM-12298
CRM-12298
Donald A. Lobo [Mon, 8 Apr 2013 23:24:07 +0000 (16:24 -0700)]
CRM-12298
----------------------------------------
* CRM-12298: batch financial export fails in WP
http://issues.civicrm.org/jira/browse/CRM-12298
colemanw [Mon, 8 Apr 2013 21:53:36 +0000 (14:53 -0700)]
Merge pull request #344 from dlobo/CRM-12300
CRM-12300
Donald A. Lobo [Mon, 8 Apr 2013 21:50:35 +0000 (14:50 -0700)]
CRM-12300
----------------------------------------
* CRM-12300: Do no log civicrm_mailing_event_* tables
http://issues.civicrm.org/jira/browse/CRM-12300
colemanw [Mon, 8 Apr 2013 20:23:53 +0000 (13:23 -0700)]
Merge pull request #342 from colemanw/elavon
Fix Elavon backoffice payments CRM-12295
Coleman Watts [Mon, 8 Apr 2013 20:23:17 +0000 (13:23 -0700)]
Fix Elavon backoffice payments CRM-12295
Kurund Jalmi [Mon, 8 Apr 2013 17:07:11 +0000 (10:07 -0700)]
Merge pull request #340 from kurund/CRM-12286
patched CRM-12286
kurund [Mon, 8 Apr 2013 16:57:30 +0000 (22:27 +0530)]
patched CRM-12286
----------------------------------------
* CRM-12286: Importing Contributions Doesn't Work. Date Rejected
http://issues.civicrm.org/jira/browse/CRM-12286
dlobo [Mon, 8 Apr 2013 16:33:01 +0000 (09:33 -0700)]
Merge pull request #334 from davecivicrm/CRM-12276
CRM-12276 Use default option_value to set default activity.status_id whe...
colemanw [Mon, 8 Apr 2013 16:26:31 +0000 (09:26 -0700)]
Merge pull request #339 from colemanw/PaymentProcessorApi
Payment processor api
colemanw [Mon, 8 Apr 2013 16:04:25 +0000 (09:04 -0700)]
Merge pull request #336 from kurund/memcache-fixes
Memcache fixes
colemanw [Mon, 8 Apr 2013 15:58:52 +0000 (08:58 -0700)]
Merge pull request #333 from colemanw/attachments
Attachments
Kurund Jalmi [Mon, 8 Apr 2013 15:49:37 +0000 (08:49 -0700)]
Merge pull request #337 from dlobo/CRM-12296
CRM-12296
Kurund Jalmi [Mon, 8 Apr 2013 15:49:09 +0000 (08:49 -0700)]
Merge pull request #338 from pradpnayak/CRM-12294
-- fixed for CRM-12294, added condition to display no thank you contribu...
Pradeep Nayak [Mon, 8 Apr 2013 10:23:54 +0000 (15:53 +0530)]
-- fixed for CRM-12294, added condition to display no thank you contribution only if membership block is enabled
Coleman Watts [Sun, 7 Apr 2013 22:51:20 +0000 (15:51 -0700)]
Allow event api to create event from a template
Donald A. Lobo [Mon, 8 Apr 2013 02:36:40 +0000 (19:36 -0700)]
CRM-12296
----------------------------------------
* CRM-12296: Allow 'new' text in word replacements to accept HTML entities
http://issues.civicrm.org/jira/browse/CRM-12296
Coleman Watts [Sun, 7 Apr 2013 22:19:48 +0000 (15:19 -0700)]
Add payment_processor api
Kurund Jalmi [Sun, 7 Apr 2013 22:11:06 +0000 (15:11 -0700)]
Merge pull request #335 from dlobo/CRM-12290
CRM-12290
kurund [Sun, 7 Apr 2013 17:34:04 +0000 (23:04 +0530)]
fix minor typo civicrm_cache table
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
Coleman Watts [Sat, 6 Apr 2013 21:31:42 +0000 (14:31 -0700)]
Update status msgs in similar code in 3 other places
kurund [Sat, 6 Apr 2013 00:47:20 +0000 (06:17 +0530)]
cache civicrm_cache table
kurund [Fri, 5 Apr 2013 23:58:24 +0000 (05:28 +0530)]
indentation fixes
Dave Greenberg [Fri, 5 Apr 2013 23:04:31 +0000 (16:04 -0700)]
CRM-12276 Use default option_value to set default activity.status_id when creating an activity. Created a method in OptionGroup to retrieve this value since one didn't exist.
----------------------------------------
* CRM-12276: Changing default option in Activity Status does not change the default when creating an activity
http://issues.civicrm.org/jira/browse/CRM-12276
Coleman Watts [Fri, 5 Apr 2013 22:53:22 +0000 (15:53 -0700)]
Use CRM.alert for success msg
Coleman Watts [Fri, 5 Apr 2013 22:45:20 +0000 (15:45 -0700)]
Fix confirm msg CRM-12254
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
kurund [Fri, 5 Apr 2013 16:09:50 +0000 (21:39 +0530)]
indentation fixes
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 ...
projects / civicrm-core.git / log