dlobo [Tue, 16 Apr 2013 15:27:24 +0000 (08:27 -0700)]
Merge pull request #448 from pradpnayak/CRM-12284
-- notice fixes for CRM-12284
dlobo [Tue, 16 Apr 2013 15:24:54 +0000 (08:24 -0700)]
Merge pull request #446 from pratik-joshi/CRM-12348_qa
fix for notice found while QA of CRM-12348, and added a missing execute ...
dlobo [Tue, 16 Apr 2013 15:21:36 +0000 (08:21 -0700)]
Merge pull request #452 from deepak-srivastava/ninja
marked twilio as stable and community contributed
Deepak Srivastava [Tue, 16 Apr 2013 15:12:36 +0000 (20:42 +0530)]
marked twilio as stable and community contributed
Pradeep Dorugade [Tue, 16 Apr 2013 12:12:41 +0000 (17:42 +0530)]
-- notice fixes for CRM-12284
Pratik Joshi [Tue, 16 Apr 2013 10:04:08 +0000 (15:34 +0530)]
fix for notice found while QA of CRM-12348, and added a missing execute statement
Kurund Jalmi [Tue, 16 Apr 2013 05:59:05 +0000 (22:59 -0700)]
Merge pull request #445 from deepak-srivastava/crm43
Updated info and zip files inorder to upload extensions on civicrm.org
Deepak Srivastava [Tue, 16 Apr 2013 05:41:07 +0000 (11:11 +0530)]
mark clickatell as stable
Deepak Srivastava [Mon, 15 Apr 2013 10:24:34 +0000 (15:54 +0530)]
updated info and zip files inorder to upload extensions on civicrm.org
Deepak Srivastava [Mon, 15 Apr 2013 08:08:27 +0000 (13:38 +0530)]
updated zip files for sms extension
colemanw [Tue, 16 Apr 2013 04:13:46 +0000 (21:13 -0700)]
Merge pull request #444 from totten/givi-review
givi - Allow checking out a pull-request for review
Tim Otten [Tue, 16 Apr 2013 03:14:41 +0000 (20:14 -0700)]
givi - Allow checking out a pull-request for review
Kurund Jalmi [Tue, 16 Apr 2013 00:09:42 +0000 (17:09 -0700)]
Merge pull request #440 from davecivicrm/CRM-12351
CRM-12351 Add .tpl for 4.3.1 upgrade and query to populate civicrm_dedup...
Kurund Jalmi [Tue, 16 Apr 2013 00:09:01 +0000 (17:09 -0700)]
Merge pull request #441 from eileenmcnaughton/4.3
improve debug message to reflect whether a receipt is sent
colemanw [Mon, 15 Apr 2013 23:50:40 +0000 (16:50 -0700)]
Merge pull request #439 from kurund/CRM-12235
worked on CRM-12235, added missing feature of inline edit for multi-valu...
eileen [Mon, 15 Apr 2013 23:37:26 +0000 (11:37 +1200)]
improve logging of progress to reflect whether a receipt is sent
eileen [Mon, 15 Apr 2013 23:35:28 +0000 (11:35 +1200)]
whitespace remove trailing spaces
Kurund Jalmi [Mon, 15 Apr 2013 21:48:10 +0000 (14:48 -0700)]
Merge pull request #438 from davecivicrm/CRM-12325
CRM-12325 Corrected erroneous help info on message template page and for...
kurund [Mon, 15 Apr 2013 21:47:21 +0000 (03:17 +0530)]
worked on CRM-12235, added missing feature of inline edit for multi-value custom data
----------------------------------------
* CRM-12235: Inline edit of multi-record custom fields broken
http://issues.civicrm.org/jira/browse/CRM-12235
Dave Greenberg [Mon, 15 Apr 2013 20:07:14 +0000 (13:07 -0700)]
CRM-12325 Corrected erroneous help info on message template page and form, and consolidated the help. Also added help and link to book on Scheduled Reminders page.
----------------------------------------
* CRM-12325: Correct and clarify help regarding use of tokens for events, memberships, and activities in message templates
http://issues.civicrm.org/jira/browse/CRM-12325
Kurund Jalmi [Mon, 15 Apr 2013 19:15:29 +0000 (12:15 -0700)]
Merge pull request #437 from kurund/updateCMSEmail
worked on CRM-12285, udpate CMS email if primary email of contact is upd...
kurund [Mon, 15 Apr 2013 18:21:49 +0000 (23:51 +0530)]
worked on CRM-12285, udpate CMS email if primary email of contact is updated.
----------------------------------------
* CRM-12285: Editing an email using the 'inscreen' edit option does not update the drupal user email, where the email is used for the uf_match
http://issues.civicrm.org/jira/browse/CRM-12285
Kurund Jalmi [Mon, 15 Apr 2013 17:48:13 +0000 (10:48 -0700)]
Merge pull request #429 from colemanw/userEmail
Fix user email CRM-12285
Kurund Jalmi [Mon, 15 Apr 2013 17:41:39 +0000 (10:41 -0700)]
Merge pull request #433 from dlobo/CRM-12356
Give WP more flexibility in layout of WP code vs CiviCRM location
Kurund Jalmi [Mon, 15 Apr 2013 17:39:24 +0000 (10:39 -0700)]
Merge pull request #431 from ravishnair/CRM-12348
-- CRM-12348 Minor Fix
Dave Greenberg [Mon, 15 Apr 2013 16:18:15 +0000 (09:18 -0700)]
CRM-12351 Add .tpl for 4.3.1 upgrade and query to populate civicrm_dedupe_rule_group.title column if NULL.
----------------------------------------
* CRM-12351:
http://issues.civicrm.org/jira/browse/CRM-12351
Donald A. Lobo [Sun, 14 Apr 2013 23:27:35 +0000 (16:27 -0700)]
Give WP more flexibility in layout of WP code vs CiviCRM location
Ravish Nair [Mon, 15 Apr 2013 09:43:16 +0000 (15:13 +0530)]
-- CRM-12348 Minor Fix
Kurund Jalmi [Mon, 15 Apr 2013 07:37:23 +0000 (00:37 -0700)]
Merge pull request #430 from pratik-joshi/CRM-12344
CRM-12344 fix : this commit fixes the issue mentioned in description as ...
Pratik Joshi [Mon, 15 Apr 2013 07:12:14 +0000 (12:42 +0530)]
CRM-12344 fix : this commit fixes the issue mentioned in description as well as 'pledge for' field valur missing on user dashboard page
Kurund Jalmi [Mon, 15 Apr 2013 06:50:30 +0000 (23:50 -0700)]
Merge pull request #428 from totten/4.3-givi
givi - Add "--setup" which calls setup.sh
Kurund Jalmi [Mon, 15 Apr 2013 06:50:07 +0000 (23:50 -0700)]
Merge pull request #427 from dlobo/CRM-12353
CRM-12353
Coleman Watts [Mon, 15 Apr 2013 03:43:38 +0000 (20:43 -0700)]
Fix user email CRM-12285
Tim Otten [Mon, 15 Apr 2013 02:06:40 +0000 (19:06 -0700)]
givi - Add "--setup" and "--gencode" options
Tim Otten [Mon, 15 Apr 2013 01:47:12 +0000 (18:47 -0700)]
givi - Misc improvements:
* When outputting commands, display repo name instead of relative path
* Add --repos option
* Add hidden "push" action
* Add disabled "merge-forward" action. (This was previously drafted but ultimately went with tools/scripts/merge-forward.)
Donald A. Lobo [Mon, 15 Apr 2013 01:37:28 +0000 (18:37 -0700)]
CRM-12353
----------------------------------------
* CRM-12353: installments array value not set
http://issues.civicrm.org/jira/browse/CRM-12353
dlobo [Mon, 15 Apr 2013 01:33:50 +0000 (18:33 -0700)]
Merge pull request #426 from dlobo/CRM-12352
CRM-12352
Tim Otten [Mon, 15 Apr 2013 01:14:53 +0000 (18:14 -0700)]
SyntaxConformanceAllEntitiesTest - Remove debug code
Donald A. Lobo [Mon, 15 Apr 2013 01:00:06 +0000 (18:00 -0700)]
CRM-12352
----------------------------------------
* CRM-12352: missing single quotes around arrayed variable reference
http://issues.civicrm.org/jira/browse/CRM-12352
eileen [Sun, 14 Apr 2013 23:17:08 +0000 (11:17 +1200)]
CRM-12350 remove relevant tests to get full pass-rate
eileen [Sun, 14 Apr 2013 22:55:44 +0000 (10:55 +1200)]
CRM-12350 amend relationship test to pass. Note this could be a regressing but regression is old if so
eileen [Sun, 14 Apr 2013 22:50:07 +0000 (10:50 +1200)]
CRM-12350 skip payment processor, entity tag
Kurund Jalmi [Sun, 14 Apr 2013 18:19:41 +0000 (11:19 -0700)]
Merge pull request #423 from dlobo/NoticeFixes
fix notices on save
Kurund Jalmi [Sun, 14 Apr 2013 18:19:09 +0000 (11:19 -0700)]
Merge pull request #422 from colemanw/buildCustomData
Restore buildCustomData to contribution forms CRM-12331
Donald A. Lobo [Sun, 14 Apr 2013 17:29:21 +0000 (10:29 -0700)]
fix notices on save
Coleman Watts [Sun, 14 Apr 2013 16:45:08 +0000 (09:45 -0700)]
Restore buildCustomData to contribution forms CRM-12331
Kurund Jalmi [Sun, 14 Apr 2013 16:41:26 +0000 (09:41 -0700)]
Merge pull request #421 from colemanw/jcss
Fix select height in joomla
Coleman Watts [Sun, 14 Apr 2013 03:47:05 +0000 (20:47 -0700)]
Fix select height in joomla
Kurund Jalmi [Sun, 14 Apr 2013 02:59:45 +0000 (19:59 -0700)]
Merge pull request #420 from davecivicrm/CRM-12216
CRM-12216 Add help on the Activity form for the option to create separat...
Dave Greenberg [Sun, 14 Apr 2013 01:30:39 +0000 (18:30 -0700)]
CRM-12216 Add help on the Activity form for the option to create separate activity records for each contact during bulk activity creation. (There was no .hpl file for that template, so adding that.)
----------------------------------------
* CRM-12216: add an option to create separate activities for each target contacts
http://issues.civicrm.org/jira/browse/CRM-12216
Kurund Jalmi [Sun, 14 Apr 2013 01:18:39 +0000 (18:18 -0700)]
Merge pull request #419 from kurund/CRM-12096
worked on CRM-12096, fixed the missing navigation menu on joomla 3.x
Kurund Jalmi [Sun, 14 Apr 2013 01:17:30 +0000 (18:17 -0700)]
Merge pull request #418 from davecivicrm/CRM-12345
CRM-12345 Fix typo in MembershipType.tpl.
Dave Greenberg [Sun, 14 Apr 2013 01:06:06 +0000 (18:06 -0700)]
CRM-12345 Fix typo in MembershipType.tpl.
----------------------------------------
* CRM-12345: typo in text templates/CRM/Member/Form/MembershipType.tpl
http://issues.civicrm.org/jira/browse/CRM-12345
kurund [Sat, 13 Apr 2013 22:51:49 +0000 (04:21 +0530)]
worked on CRM-12096, fixed the missing navigation menu on joomla 3.x
----------------------------------------
* CRM-12096:
http://issues.civicrm.org/jira/browse/CRM-12096
Kurund Jalmi [Sat, 13 Apr 2013 18:49:52 +0000 (11:49 -0700)]
Merge pull request #414 from dlobo/CRM-12341
CRM-12341 - use wildcards only as suffix
Kurund Jalmi [Sat, 13 Apr 2013 18:48:01 +0000 (11:48 -0700)]
Merge pull request #415 from dlobo/CRM-12347
CRM-12347
Tim Otten [Sat, 13 Apr 2013 18:44:50 +0000 (11:44 -0700)]
Merge pull request #416 from dlobo/CRM-8963
CRM-8963
Donald A. Lobo [Sat, 13 Apr 2013 18:42:48 +0000 (11:42 -0700)]
CRM-12347, eliminate debug short circuit
----------------------------------------
* CRM-12347: Rebuild Smart Group Cache errors out if limit=50 configured in parameters
http://issues.civicrm.org/jira/browse/CRM-12347
Donald A. Lobo [Sat, 13 Apr 2013 18:39:51 +0000 (11:39 -0700)]
CRM-8963 - fix a few more PHP 5.4 warnings
----------------------------------------
* CRM-8963: Batch update profile: states do not change with country
http://issues.civicrm.org/jira/browse/CRM-8963
Donald A. Lobo [Sat, 13 Apr 2013 18:28:28 +0000 (11:28 -0700)]
CRM-12347
----------------------------------------
* CRM-12347: Rebuild Smart Group Cache errors out if limit=50 configured in parameters
http://issues.civicrm.org/jira/browse/CRM-12347
Donald A. Lobo [Sat, 13 Apr 2013 15:11:01 +0000 (08:11 -0700)]
CRM-8963
----------------------------------------
* CRM-8963: Batch update profile: states do not change with country
http://issues.civicrm.org/jira/browse/CRM-8963
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
projects / civicrm-core.git / log