civicrm-core.git
11 years agoImprovments in demo management scripts
Deepak Srivastava [Tue, 23 Apr 2013 15:41:54 +0000 (21:11 +0530)]
Improvments in demo management scripts

11 years agoscripts for managing demo sites and their pristines
Deepak Srivastava [Fri, 19 Apr 2013 13:55:27 +0000 (19:25 +0530)]
scripts for managing demo sites and their pristines

11 years agoMerge pull request #453 from mlutfy/fix-43-actdatetimeformat
Kurund Jalmi [Tue, 16 Apr 2013 20:42:50 +0000 (13:42 -0700)]
Merge pull request #453 from mlutfy/fix-43-actdatetimeformat

Activity followup_date time format should use localization settings.

11 years agoActivity followup_date time format should use localization settings.
Mathieu Lutfy [Tue, 16 Apr 2013 17:56:20 +0000 (13:56 -0400)]
Activity followup_date time format should use localization settings.

11 years agoUpdate civicrm_generated.mysql
Tim Otten [Tue, 16 Apr 2013 17:43:57 +0000 (10:43 -0700)]
Update civicrm_generated.mysql

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08
Tim Otten [Tue, 16 Apr 2013 17:40:13 +0000 (10:40 -0700)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml

11 years agoMerge pull request #448 from pradpnayak/CRM-12284
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

11 years agoMerge pull request #446 from pratik-joshi/CRM-12348_qa
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 ...

11 years agoMerge pull request #452 from deepak-srivastava/ninja
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

11 years agomarked 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

11 years ago-- notice fixes for CRM-12284
Pradeep Dorugade [Tue, 16 Apr 2013 12:12:41 +0000 (17:42 +0530)]
-- notice fixes for CRM-12284

11 years agofix for notice found while QA of CRM-12348, and added a missing execute statement
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

11 years agoMerge pull request #445 from deepak-srivastava/crm43
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

11 years agomark clickatell as stable
Deepak Srivastava [Tue, 16 Apr 2013 05:41:07 +0000 (11:11 +0530)]
mark clickatell as stable

11 years agoupdated info and zip files inorder to upload extensions on civicrm.org
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

11 years agoupdated zip files for sms extension
Deepak Srivastava [Mon, 15 Apr 2013 08:08:27 +0000 (13:38 +0530)]
updated zip files for sms extension

11 years agoMerge pull request #444 from totten/givi-review
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

11 years agogivi - 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

11 years agoMerge pull request #440 from davecivicrm/CRM-12351
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...

11 years agoMerge pull request #441 from eileenmcnaughton/4.3
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

11 years agoMerge pull request #442 from yashodha/CRM-12274
Kurund Jalmi [Tue, 16 Apr 2013 00:07:39 +0000 (17:07 -0700)]
Merge pull request #442 from yashodha/CRM-12274

Crm 12274

11 years agoMerge pull request #439 from kurund/CRM-12235
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...

11 years agoimprove logging of progress to reflect whether a receipt is sent
eileen [Mon, 15 Apr 2013 23:37:26 +0000 (11:37 +1200)]
improve logging of progress to reflect whether a receipt is sent

11 years agowhitespace remove trailing spaces
eileen [Mon, 15 Apr 2013 23:35:28 +0000 (11:35 +1200)]
whitespace remove trailing spaces

11 years ago CRM-1227
yashodha [Mon, 15 Apr 2013 22:56:28 +0000 (04:26 +0530)]
 CRM-1227

11 years agoMerge pull request #438 from davecivicrm/CRM-12325
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...

11 years agoworked on CRM-12235, added missing feature of inline edit for multi-value custom...
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

11 years agoCRM-12325 Corrected erroneous help info on message template page and form, and consol...
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

11 years agoCRM-12274
yashodha [Mon, 15 Apr 2013 19:25:51 +0000 (00:55 +0530)]
CRM-12274

11 years agoCRM-12274
yashodha [Mon, 15 Apr 2013 18:17:51 +0000 (23:47 +0530)]
CRM-12274

11 years agoMerge pull request #437 from kurund/updateCMSEmail
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...

11 years agoMerge pull request #436 from dlobo/CRM-12274
dlobo [Mon, 15 Apr 2013 18:31:11 +0000 (11:31 -0700)]
Merge pull request #436 from dlobo/CRM-12274

CRM-12274

11 years agoCRM-12274
Donald A. Lobo [Mon, 15 Apr 2013 18:30:17 +0000 (11:30 -0700)]
CRM-12274

----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274

11 years agoworked on CRM-12285, udpate CMS email if primary email of contact is updated.
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

11 years agoMerge pull request #429 from colemanw/userEmail
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

11 years agoMerge pull request #433 from dlobo/CRM-12356
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

11 years agoMerge pull request #431 from ravishnair/CRM-12348
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

11 years agoMerge pull request #435 from dlobo/master
dlobo [Mon, 15 Apr 2013 17:25:22 +0000 (10:25 -0700)]
Merge pull request #435 from dlobo/master

Initial commit of changes for elimination of activities

11 years agoCRM-12357
Donald A. Lobo [Mon, 15 Apr 2013 17:19:16 +0000 (10:19 -0700)]
CRM-12357

----------------------------------------
* CRM-12357: Split Mailings into separate tab if activity creation is disabled
  http://issues.civicrm.org/jira/browse/CRM-12357

11 years agoCRM-12351 Add .tpl for 4.3.1 upgrade and query to populate civicrm_dedupe_rule_group...
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

11 years agoGive WP more flexibility in layout of WP code vs CiviCRM location
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

11 years ago-- CRM-12348 Minor Fix
Ravish Nair [Mon, 15 Apr 2013 09:43:16 +0000 (15:13 +0530)]
-- CRM-12348 Minor Fix

11 years agoMerge pull request #430 from pratik-joshi/CRM-12344
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 ...

11 years agoCRM-12344 fix : this commit fixes the issue mentioned in description as well 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

11 years agoMerge pull request #428 from totten/4.3-givi
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

11 years agoMerge pull request #427 from dlobo/CRM-12353
Kurund Jalmi [Mon, 15 Apr 2013 06:50:07 +0000 (23:50 -0700)]
Merge pull request #427 from dlobo/CRM-12353

CRM-12353

11 years agoMerge pull request #424 from yashodha/CRM-12274
Kurund Jalmi [Mon, 15 Apr 2013 06:49:38 +0000 (23:49 -0700)]
Merge pull request #424 from yashodha/CRM-12274

CRM-12274

11 years agoFix user email CRM-12285
Coleman Watts [Mon, 15 Apr 2013 03:43:38 +0000 (20:43 -0700)]
Fix user email CRM-12285

11 years agogivi - Add "--setup" and "--gencode" options
Tim Otten [Mon, 15 Apr 2013 02:06:40 +0000 (19:06 -0700)]
givi - Add "--setup" and "--gencode" options

11 years agogivi - Misc improvements:
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.)

11 years agoCRM-12353
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

11 years agoMerge pull request #426 from dlobo/CRM-12352
dlobo [Mon, 15 Apr 2013 01:33:50 +0000 (18:33 -0700)]
Merge pull request #426 from dlobo/CRM-12352

CRM-12352

11 years agoSyntaxConformanceAllEntitiesTest - Remove debug code
Tim Otten [Mon, 15 Apr 2013 01:14:53 +0000 (18:14 -0700)]
SyntaxConformanceAllEntitiesTest - Remove debug code

11 years agoCRM-12352
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

11 years agoCRM-12350 remove relevant tests to get full pass-rate
eileen [Sun, 14 Apr 2013 23:17:08 +0000 (11:17 +1200)]
CRM-12350 remove relevant tests to get full pass-rate

11 years agoCRM-12350 amend relationship test to pass. Note this could be a regressing but regres...
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

11 years agoCRM-12350 skip payment processor, entity tag
eileen [Sun, 14 Apr 2013 22:50:07 +0000 (10:50 +1200)]
CRM-12350 skip payment processor, entity tag

11 years agoCRM-12274
yashodha [Sun, 14 Apr 2013 20:55:47 +0000 (02:25 +0530)]
CRM-12274

11 years agoMerge pull request #423 from dlobo/NoticeFixes
Kurund Jalmi [Sun, 14 Apr 2013 18:19:41 +0000 (11:19 -0700)]
Merge pull request #423 from dlobo/NoticeFixes

fix notices on save

11 years agoMerge pull request #422 from colemanw/buildCustomData
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

11 years agofix notices on save
Donald A. Lobo [Sun, 14 Apr 2013 17:29:21 +0000 (10:29 -0700)]
fix notices on save

11 years agoRestore buildCustomData to contribution forms CRM-12331
Coleman Watts [Sun, 14 Apr 2013 16:45:08 +0000 (09:45 -0700)]
Restore buildCustomData to contribution forms CRM-12331

11 years agoMerge pull request #421 from colemanw/jcss
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

11 years agoFix select height in joomla
Coleman Watts [Sun, 14 Apr 2013 03:47:05 +0000 (20:47 -0700)]
Fix select height in joomla

11 years agoMerge pull request #420 from davecivicrm/CRM-12216
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...

11 years agoCRM-12216 Add help on the Activity form for the option to create separate activity...
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

11 years agoMerge pull request #419 from kurund/CRM-12096
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

11 years agoMerge pull request #418 from davecivicrm/CRM-12345
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.

11 years agoCRM-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

11 years agoworked on CRM-12096, fixed the missing navigation menu on joomla 3.x
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

11 years agoMerge pull request #414 from dlobo/CRM-12341
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

11 years agoMerge pull request #415 from dlobo/CRM-12347
Kurund Jalmi [Sat, 13 Apr 2013 18:48:01 +0000 (11:48 -0700)]
Merge pull request #415 from dlobo/CRM-12347

CRM-12347

11 years agoMerge pull request #416 from dlobo/CRM-8963
Tim Otten [Sat, 13 Apr 2013 18:44:50 +0000 (11:44 -0700)]
Merge pull request #416 from dlobo/CRM-8963

CRM-8963

11 years agoCRM-12347, eliminate debug short circuit
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

11 years agoCRM-8963 - fix a few more PHP 5.4 warnings
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

11 years agoCRM-12347
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

11 years agoCRM-8963
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

11 years agoCRM-12341 - use wildcards only as suffix
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

11 years agoMerge pull request #360 from pradpnayak/CRM-12284
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.

11 years agoMerge pull request #411 from yashodha/CRM-12274
Kurund Jalmi [Sat, 13 Apr 2013 06:39:08 +0000 (23:39 -0700)]
Merge pull request #411 from yashodha/CRM-12274

CRM-12274

11 years agoMerge pull request #412 from colemanw/versionCheck
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

11 years agoMerge pull request #413 from colemanw/CRM-12329
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

11 years agoRemove 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

11 years agoFix version comparisons CRM-12335
Coleman Watts [Sat, 13 Apr 2013 04:15:36 +0000 (21:15 -0700)]
Fix version comparisons CRM-12335

11 years agoCRM-12274
yashodha [Fri, 12 Apr 2013 19:06:10 +0000 (00:36 +0530)]
CRM-12274

11 years agoMerge pull request #410 from dlobo/CRM-12333
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

11 years agoCRM-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

11 years agoMerge pull request #409 from dlobo/CRM-12334
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

11 years agoMerge pull request #386 from mlutfy/tpl-mailformat
Kurund Jalmi [Fri, 12 Apr 2013 18:27:48 +0000 (11:27 -0700)]
Merge pull request #386 from mlutfy/tpl-mailformat

Make it possible to hide the pref mail format in a buildForm hook

11 years agoCRM-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

11 years agoMerge pull request #399 from agh1/batch-countrystatecounty-4.3
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

11 years agoMerge pull request #408 from yashodha/CRM-12274
Kurund Jalmi [Fri, 12 Apr 2013 18:20:37 +0000 (11:20 -0700)]
Merge pull request #408 from yashodha/CRM-12274

CRM-12274

11 years agoMerge pull request #407 from lcdservices/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

11 years agoCRM-12274
yashodha [Fri, 12 Apr 2013 17:42:16 +0000 (23:12 +0530)]
CRM-12274

11 years agoCRM-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

11 years agoMerge pull request #405 from dlobo/CRM-12332
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

11 years agoMerge pull request #402 from eileenmcnaughton/4.3
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

11 years agoCRM-12332 and fix spelling
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

11 years agoMerge pull request #401 from eileenmcnaughton/settingtestnew
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

11 years agoMerge pull request #404 from ravishnair/CRM-12328testCase
Kurund Jalmi [Fri, 12 Apr 2013 15:52:29 +0000 (08:52 -0700)]
Merge pull request #404 from ravishnair/CRM-12328testCase

-- CRM-12328 testcase