dlobo [Thu, 11 Apr 2013 16:21:39 +0000 (09:21 -0700)]
Merge pull request #388 from JoeMurray/patch-1
List Pradeep as JMA staff, keep Web Access
JoeMurray [Thu, 11 Apr 2013 16:20:15 +0000 (13:20 -0300)]
List Pradeep as JMA staff, keep Web Access
Tim Otten [Thu, 11 Apr 2013 06:53:55 +0000 (02:53 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
Tim Otten [Thu, 11 Apr 2013 04:02:59 +0000 (21:02 -0700)]
Merge pull request #383 from totten/revert-cache
CRM-12321 - Revert BAO_Cache changes
Tim Otten [Thu, 11 Apr 2013 04:00:13 +0000 (00:00 -0400)]
CRM-12321 - Revert "cache civicrm_cache table"
This reverts commit
d9d00494d13ec66856526ac2426abaecf8cab257.
Tim Otten [Thu, 11 Apr 2013 03:59:56 +0000 (23:59 -0400)]
CRM-12321 - Revert "fix minor typo civicrm_cache table"
This reverts commit
33318c7196428c8733d3ce87ca3bbc4fc45cd5da.
dlobo [Thu, 11 Apr 2013 03:20:32 +0000 (20:20 -0700)]
Merge pull request #382 from dlobo/SponsorFixes
Sponsor fixes
Donald A. Lobo [Thu, 11 Apr 2013 03:19:51 +0000 (20:19 -0700)]
rearrange contributors list
Donald A. Lobo [Thu, 11 Apr 2013 03:18:53 +0000 (20:18 -0700)]
rearrange contributors list
dlobo [Thu, 11 Apr 2013 00:35:56 +0000 (17:35 -0700)]
Update CONTRIBUTORS.txt
dlobo [Thu, 11 Apr 2013 00:33:09 +0000 (17:33 -0700)]
Merge pull request #380 from dlobo/SponsorFixes
rearrange contributors list, add companies
Donald A. Lobo [Thu, 11 Apr 2013 00:32:13 +0000 (17:32 -0700)]
rearrange contributors list, add companies
dlobo [Thu, 11 Apr 2013 00:28:31 +0000 (17:28 -0700)]
Merge pull request #379 from dlobo/SponsorFixes
rearrange contributors list, add companies
Donald A. Lobo [Thu, 11 Apr 2013 00:25:14 +0000 (17:25 -0700)]
rearrange contributors list, add companies
Tim Otten [Wed, 10 Apr 2013 23:30:00 +0000 (16:30 -0700)]
Merge pull request #378 from eileenmcnaughton/4.3
fix for api note test - affects where schema does not define unique field
eileen [Wed, 10 Apr 2013 23:12:13 +0000 (11:12 +1200)]
fix for note api test failure
colemanw [Wed, 10 Apr 2013 22:26:32 +0000 (15:26 -0700)]
Merge pull request #377 from eileenmcnaughton/4.3
fix for api tests - problem was apparent when entity_ name was in camel case e.g Case
eileen [Wed, 10 Apr 2013 22:14:27 +0000 (10:14 +1200)]
fix for failing syntax tests due to not handling case
colemanw [Wed, 10 Apr 2013 21:56:08 +0000 (14:56 -0700)]
Merge pull request #376 from eileenmcnaughton/4.3
event api fix for id only
Kurund Jalmi [Wed, 10 Apr 2013 21:43:43 +0000 (14:43 -0700)]
Merge pull request #373 from davecivicrm/SponsorsUpdate
update Sponsors.txt for 4.3 release
Dave Greenberg [Wed, 10 Apr 2013 21:41:05 +0000 (14:41 -0700)]
Fix name lists for 3.4 sponsors.
eileen [Wed, 10 Apr 2013 21:38:33 +0000 (09:38 +1200)]
event api fix for id only
colemanw [Wed, 10 Apr 2013 21:36:37 +0000 (14:36 -0700)]
Merge pull request #375 from yashodha/CRM-12219
CRM-12219
Kurund Jalmi [Wed, 10 Apr 2013 21:33:15 +0000 (14:33 -0700)]
Merge pull request #374 from colemanw/hideCaseActivities
Fix hiding minus button in hideCaseActivities
Coleman Watts [Wed, 10 Apr 2013 21:28:36 +0000 (14:28 -0700)]
Fix hiding minus button in hideCaseActivities
yashodha [Wed, 10 Apr 2013 21:27:41 +0000 (02:57 +0530)]
CRM-12219
Dave Greenberg [Wed, 10 Apr 2013 19:17:07 +0000 (12:17 -0700)]
update Sponsors.txt for 4.3 release
Kurund Jalmi [Wed, 10 Apr 2013 17:23:14 +0000 (10:23 -0700)]
Merge pull request #364 from colemanw/alertUrl
Switch to 'live' alert URL
Kurund Jalmi [Wed, 10 Apr 2013 17:22:53 +0000 (10:22 -0700)]
Merge pull request #366 from colemanw/property
Fix inconsistent use of property_exists
Kurund Jalmi [Wed, 10 Apr 2013 17:22:05 +0000 (10:22 -0700)]
Merge pull request #371 from dlobo/MiscFixes
fix formatting and typos
Donald A. Lobo [Wed, 10 Apr 2013 17:04:56 +0000 (10:04 -0700)]
fix formatting and typos
colemanw [Wed, 10 Apr 2013 16:24:18 +0000 (09:24 -0700)]
Merge pull request #345 from agh1/swap-target-assignee
button to swap activity targets & assignees
Andrew Hunt [Wed, 10 Apr 2013 16:19:38 +0000 (12:19 -0400)]
change icon class to swap-icon
dlobo [Wed, 10 Apr 2013 15:25:19 +0000 (08:25 -0700)]
Merge pull request #369 from deepak-srivastava/ninja
CRM-12309
dlobo [Wed, 10 Apr 2013 15:24:49 +0000 (08:24 -0700)]
Merge pull request #368 from deepak-srivastava/hulk
CRM-12289
dlobo [Wed, 10 Apr 2013 15:22:27 +0000 (08:22 -0700)]
Merge pull request #367 from eileenmcnaughton/4.3
CRM-12317 fix domain tokens
dlobo [Wed, 10 Apr 2013 15:21:25 +0000 (08:21 -0700)]
Merge pull request #370 from lcdservices/4.3
CRM-12319 add pagination bar to full text search
Brian Shaughnessy [Wed, 10 Apr 2013 14:45:00 +0000 (10:45 -0400)]
CRM-12319 add pagination bar to full text search
Deepak Srivastava [Wed, 10 Apr 2013 11:37:00 +0000 (17:07 +0530)]
CRM-12309
Deepak Srivastava [Wed, 10 Apr 2013 11:37:00 +0000 (17:07 +0530)]
CRM-12309
Deepak Srivastava [Wed, 10 Apr 2013 10:56:00 +0000 (16:26 +0530)]
CRM-12289
eileen [Wed, 10 Apr 2013 04:57:31 +0000 (16:57 +1200)]
CRM-12317 fix domain tokens
Coleman Watts [Wed, 10 Apr 2013 04:25:47 +0000 (21:25 -0700)]
Fix whitespace
Coleman Watts [Wed, 10 Apr 2013 04:10:24 +0000 (21:10 -0700)]
Fix inconsistent use of property_exists
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
Coleman Watts [Tue, 9 Apr 2013 23:40:34 +0000 (16:40 -0700)]
Switch to 'live' alert URL
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
Andrew Hunt [Tue, 9 Apr 2013 21:40:31 +0000 (17:40 -0400)]
fixes to A element and click handler
Andrew Hunt [Tue, 9 Apr 2013 21:35:38 +0000 (17:35 -0400)]
rebuilt the branch
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
Kurund Jalmi [Tue, 9 Apr 2013 13:46:53 +0000 (06:46 -0700)]
Merge pull request #353 from eileenmcnaughton/trunk-kill-eval
CRM-12305 Remove eval functions to tidy up code base
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
eileen [Tue, 9 Apr 2013 05:49:26 +0000 (17:49 +1200)]
CRM-12305 further eval removal- all gone from Block.php
eileen [Tue, 9 Apr 2013 05:38:03 +0000 (17:38 +1200)]
CRM-12305 further eval removal
eileen [Tue, 9 Apr 2013 05:24:06 +0000 (17:24 +1200)]
CRM-12305 further eval removal
eileen [Tue, 9 Apr 2013 05:02:45 +0000 (17:02 +1200)]
remove trailing whitespaces
eileen [Tue, 9 Apr 2013 05:01:52 +0000 (17:01 +1200)]
CRM-12305 - Remove eval functions to tidy up code base
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
dlobo [Mon, 8 Apr 2013 20:34:27 +0000 (13:34 -0700)]
Merge pull request #343 from dlobo/CRM-12274
CRM-12274 - more cleanup
Donald A. Lobo [Mon, 8 Apr 2013 20:33:34 +0000 (13:33 -0700)]
CRM-12274 - more cleanup
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
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
dlobo [Mon, 8 Apr 2013 19:13:11 +0000 (12:13 -0700)]
Merge pull request #341 from dlobo/4.4-CRM-12274
CRM-12274
Donald A. Lobo [Mon, 8 Apr 2013 19:11:51 +0000 (12:11 -0700)]
CRM-12274 - redo all changes due to bad rebase
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
http://issues.civicrm.org/jira/browse/CRM-12274
yashodha [Sun, 7 Apr 2013 23:36:29 +0000 (05:06 +0530)]
reminder fixes for CRM-12274
yashodha [Fri, 5 Apr 2013 22:50:27 +0000 (04:20 +0530)]
worked on upgrade part CRM-12274
Donald A. Lobo [Thu, 4 Apr 2013 05:28:35 +0000 (22:28 -0700)]
first set of patches for activity restructuring
Donald A. Lobo [Thu, 4 Apr 2013 04:55:18 +0000 (21:55 -0700)]
first set of patches for activity restructuring
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
projects / civicrm-core.git / log