Donald A. Lobo [Sat, 13 Apr 2013 15:04:33 +0000 (08:04 -0700)]
CRM-12341 - use wildcards only as suffix
----------------------------------------
* CRM-12341: prev/next cache should not do double-ended wildcard search
http://issues.civicrm.org/jira/browse/CRM-12341
Dave Greenberg [Sat, 13 Apr 2013 14:40:39 +0000 (07:40 -0700)]
Merge pull request #360 from pradpnayak/CRM-12284
-- CRM-12284 Tested all the bug cases listed in CRM-12284. There is a new notice which I will post to the issue and assign back to Pradeep to fix.
Kurund Jalmi [Sat, 13 Apr 2013 06:38:50 +0000 (23:38 -0700)]
Merge pull request #412 from colemanw/versionCheck
Fix version comparisons CRM-12335
Kurund Jalmi [Sat, 13 Apr 2013 06:38:28 +0000 (23:38 -0700)]
Merge pull request #413 from colemanw/CRM-12329
Remove leftover jQuery from profile snippets CRM-12329
Coleman Watts [Sat, 13 Apr 2013 04:56:14 +0000 (21:56 -0700)]
Remove leftover jQuery from profile snippets CRM-12329
Coleman Watts [Sat, 13 Apr 2013 04:15:36 +0000 (21:15 -0700)]
Fix version comparisons CRM-12335
Kurund Jalmi [Fri, 12 Apr 2013 19:02:29 +0000 (12:02 -0700)]
Merge pull request #410 from dlobo/CRM-12333
CRM-12333 and lots of formatting fixes
Donald A. Lobo [Fri, 12 Apr 2013 18:58:59 +0000 (11:58 -0700)]
CRM-12333 and lots of formatting fixes
----------------------------------------
* CRM-12333: Unescaped items in upgrade SQL script
http://issues.civicrm.org/jira/browse/CRM-12333
dlobo [Fri, 12 Apr 2013 18:27:52 +0000 (11:27 -0700)]
Merge pull request #409 from dlobo/CRM-12334
CRM-12334 formatting and always assign a value
Donald A. Lobo [Fri, 12 Apr 2013 18:26:53 +0000 (11:26 -0700)]
CRM-12334 formatting and always assign a value
----------------------------------------
* CRM-12334: $config->activityAssigneeNotification referenced in tpl but never set
http://issues.civicrm.org/jira/browse/CRM-12334
dlobo [Fri, 12 Apr 2013 18:22:49 +0000 (11:22 -0700)]
Merge pull request #399 from agh1/batch-countrystatecounty-4.3
copy of batch-countrystatecounty for 4.3
dlobo [Fri, 12 Apr 2013 18:20:33 +0000 (11:20 -0700)]
Merge pull request #407 from lcdservices/4.3
CRM-12334 set assignee notification in smarty
Brian Shaughnessy [Fri, 12 Apr 2013 17:07:50 +0000 (13:07 -0400)]
CRM-12334 set assignee notification in smarty
Kurund Jalmi [Fri, 12 Apr 2013 17:02:27 +0000 (10:02 -0700)]
Merge pull request #405 from dlobo/CRM-12332
CRM-12332 and fix spelling
dlobo [Fri, 12 Apr 2013 16:41:08 +0000 (09:41 -0700)]
Merge pull request #402 from eileenmcnaughton/4.3
CRM-12322 remove multisite specific ACL portion
Donald A. Lobo [Fri, 12 Apr 2013 16:39:24 +0000 (09:39 -0700)]
CRM-12332 and fix spelling
----------------------------------------
* CRM-12332: Strict warning when adding a new member
http://issues.civicrm.org/jira/browse/CRM-12332
colemanw [Fri, 12 Apr 2013 16:01:29 +0000 (09:01 -0700)]
Merge pull request #401 from eileenmcnaughton/settingtestnew
CRM-12330 - Caching bugs in api setting code
Kurund Jalmi [Fri, 12 Apr 2013 15:52:29 +0000 (08:52 -0700)]
Merge pull request #404 from ravishnair/CRM-12328testCase
-- CRM-12328 testcase
Ravish Nair [Fri, 12 Apr 2013 13:19:37 +0000 (18:49 +0530)]
-- CRM-12328 testcase
eileen [Fri, 12 Apr 2013 08:45:43 +0000 (20:45 +1200)]
CRM-12322 remove multisite specific ACL portion as aclHook portion further down is better
eileen [Fri, 12 Apr 2013 05:32:44 +0000 (17:32 +1200)]
really finally working
eileen [Fri, 12 Apr 2013 04:57:28 +0000 (16:57 +1200)]
updated version of examples
eileen [Thu, 11 Apr 2013 23:13:23 +0000 (11:13 +1200)]
fix failing settings test by allowing more cache clearing
interim commit setting test passing but regression on api test
eileen [Thu, 11 Apr 2013 14:09:21 +0000 (02:09 +1200)]
minor fix on setting test where error exposed by fixes elsewhere
eileen [Thu, 11 Apr 2013 13:46:54 +0000 (01:46 +1200)]
multipledomain config get working
fix setting test to only call create if required
eileen [Thu, 11 Apr 2013 11:12:31 +0000 (23:12 +1200)]
Add domain id to cachestring
eileen [Thu, 11 Apr 2013 11:04:17 +0000 (23:04 +1200)]
Add test to check if config setting is correctly retrieved
add a bit more assertation description on test
Kurund Jalmi [Fri, 12 Apr 2013 04:29:16 +0000 (21:29 -0700)]
Merge pull request #400 from kurund/version-fixes
version fixes
kurund [Fri, 12 Apr 2013 04:23:23 +0000 (09:53 +0530)]
version fixes
Kurund Jalmi [Fri, 12 Apr 2013 04:08:33 +0000 (21:08 -0700)]
Merge pull request #385 from totten/merge-forward
Add tools/scripts/merge-forward
Andrew Hunt [Fri, 12 Apr 2013 04:03:24 +0000 (00:03 -0400)]
Store and reinstate valid state/county when copying
Andrew Hunt [Fri, 12 Apr 2013 03:03:42 +0000 (23:03 -0400)]
copy of batch-countrystatecounty for 4.3
colemanw [Fri, 12 Apr 2013 00:15:50 +0000 (17:15 -0700)]
Merge pull request #397 from davecivicrm/CRM-12328
CRM-12328 switched references to group object for add_to_group_id and ad...
Dave Greenberg [Fri, 12 Apr 2013 00:12:54 +0000 (17:12 -0700)]
CRM-12328 switched references to group object for add_to_group_id and add_captcha.
----------------------------------------
* CRM-12328: Profiles: "Add new contacts to group" AND "Include reCaptcha" settings are broken in profile forms
http://issues.civicrm.org/jira/browse/CRM-12328
dlobo [Thu, 11 Apr 2013 20:22:13 +0000 (13:22 -0700)]
Merge pull request #394 from dlobo/GenData
update generated data
Donald A. Lobo [Thu, 11 Apr 2013 20:21:34 +0000 (13:21 -0700)]
update generated data
Dave Greenberg [Thu, 11 Apr 2013 20:01:17 +0000 (13:01 -0700)]
Merge pull request #393 from colemanw/CONTRIBUTORS
Update distmaker for Sponsors -> CONTRIBUTORS
Coleman Watts [Thu, 11 Apr 2013 19:59:16 +0000 (12:59 -0700)]
Update distmaker for Sponsors -> CONTRIBUTORS
dlobo [Thu, 11 Apr 2013 19:23:40 +0000 (12:23 -0700)]
Merge pull request #392 from dlobo/ContribFixes
update CONTRIBUTORS
Donald A. Lobo [Thu, 11 Apr 2013 19:22:24 +0000 (12:22 -0700)]
update CONTRIBUTORS
dlobo [Thu, 11 Apr 2013 19:19:38 +0000 (12:19 -0700)]
Merge pull request #391 from dlobo/VersionUpdate
update version.xml
Donald A. Lobo [Thu, 11 Apr 2013 19:18:45 +0000 (12:18 -0700)]
update version.xml
Tim Otten [Thu, 11 Apr 2013 18:20:40 +0000 (15:20 -0300)]
Update permissions.php
Explain how replace and delete permissions relate
Tim Otten [Thu, 11 Apr 2013 18:15:36 +0000 (11:15 -0700)]
Merge pull request #389 from colemanw/permissions
Triage API permissions
Coleman Watts [Thu, 11 Apr 2013 18:00:31 +0000 (11:00 -0700)]
Change permission for viewing a profile
Coleman Watts [Thu, 11 Apr 2013 16:48:44 +0000 (09:48 -0700)]
Fix help encoding CRM-12324
colemanw [Thu, 11 Apr 2013 17:04:38 +0000 (10:04 -0700)]
Merge pull request #381 from totten/sqlgroup-prefetch
CRM-12321 - SqlGroupTest - Test prefetching more directly.
colemanw [Thu, 11 Apr 2013 16:53:40 +0000 (09:53 -0700)]
Merge pull request #387 from dlobo/MiscFixes
eliminate dead code, formatting fixes
Coleman Watts [Thu, 11 Apr 2013 16:37:36 +0000 (09:37 -0700)]
triage api permissions CRM-11817
Coleman Watts [Thu, 11 Apr 2013 04:28:10 +0000 (21:28 -0700)]
Fix failure to recognize CamelCase entity names CRM-11817
Donald A. Lobo [Thu, 11 Apr 2013 16:14:14 +0000 (09:14 -0700)]
eliminate dead code, formatting fixes
Tim Otten [Thu, 11 Apr 2013 06:58:10 +0000 (02:58 -0400)]
Add tools/scripts/merge-forward
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.
Coleman Watts [Thu, 11 Apr 2013 03:48:13 +0000 (20:48 -0700)]
Implement defaults and action equivalents for api perms CRM-11817
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
Tim Otten [Thu, 11 Apr 2013 00:35:22 +0000 (20:35 -0400)]
CRM-12321 - SqlGroupTest - Test prefetching more directly.
When multi-tier caching was introduced, testPrefetch regressed because it
relied on side-effects from having totally independent caches -- but the
multi-tier cache added extra, unforeseen sharing between SqlGroup instances.
In reality, prefetching works. This revision tests prefetch more directly
to workaround the changed assumptions.
----------------------------------------
* CRM-12321: Multi-tier caching causes multiple test regressions
http://issues.civicrm.org/jira/browse/CRM-12321
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
Coleman Watts [Wed, 10 Apr 2013 23:57:26 +0000 (16:57 -0700)]
code reformatting CRM-11329
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
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
projects / civicrm-core.git / log