civicrm-core.git
9 years ago-- Moved upgrade changes to 4.6alpha4 release
NileemaJadhav [Wed, 21 Jan 2015 06:55:12 +0000 (12:25 +0530)]
-- Moved upgrade changes to 4.6alpha4 release

9 years agoResolve conflict
NileemaJadhav [Wed, 21 Jan 2015 05:38:06 +0000 (11:08 +0530)]
Resolve conflict

9 years agoCCRM-15821 Provide option to notify PCP owner
NileemaJadhav [Fri, 16 Jan 2015 13:39:35 +0000 (19:09 +0530)]
CCRM-15821 Provide option to notify PCP owner

9 years agoCRM-15821 Add PCP owner notifications message templates
NileemaJadhav [Fri, 16 Jan 2015 13:38:35 +0000 (19:08 +0530)]
CRM-15821 Add PCP owner notifications message templates

----------------------------------------
* CRM-15821: Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
  https://issues.civicrm.org/jira/browse/CRM-15821

9 years agoUpdate version to 4.6.alpha4
CiviCRM [Wed, 21 Jan 2015 11:19:16 +0000 (03:19 -0800)]
Update version to 4.6.alpha4

9 years agoMerge pull request #4962 from totten/master-angular-ts
Tim Otten [Wed, 21 Jan 2015 09:17:13 +0000 (01:17 -0800)]
Merge pull request #4962 from totten/master-angular-ts

CRM-15832 - AngularJS - Aggregate and localize strings+partials

9 years agoCRM-15832 - Fix domain used by core Angular apps
Tim Otten [Wed, 21 Jan 2015 06:59:16 +0000 (22:59 -0800)]
CRM-15832 - Fix domain used by core Angular apps

The old code was based on a misunderstanding. I thought that we had separate
translation domains for each Civi component.  This is half true -- when the
translators work on them, there are separate .po files for each component.
However, when we distribute the final .mo files, the components are
aggregated together into one "civicrm.mo".  Thus, at runtime, there is
really only one domain for the core app.

There are other domains the extensions, and there are a couple contexts
within the civicrm domain (eg for states/provinces), but that's irrelevant
to core's CiviCase and CiviMail UIs.

9 years agoMerge pull request #4987 from totten/master-gitify
Tim Otten [Wed, 21 Jan 2015 06:42:09 +0000 (22:42 -0800)]
Merge pull request #4987 from totten/master-gitify

CRM-15840 - gitify - Fix for Civi v4.6+

9 years agoMerge pull request #4988 from lcdservices/CRM-15849
colemanw [Wed, 21 Jan 2015 02:43:15 +0000 (21:43 -0500)]
Merge pull request #4988 from lcdservices/CRM-15849

CRM-15849 add where clause for greetings

9 years agoCRM-15849: fix translation string, comments
Brian Shaughnessy [Wed, 21 Jan 2015 02:28:29 +0000 (21:28 -0500)]
CRM-15849: fix translation string, comments

9 years agoCRM-15849 add where clause for greetings
Brian Shaughnessy [Wed, 21 Jan 2015 01:20:09 +0000 (20:20 -0500)]
CRM-15849 add where clause for greetings

9 years agoCRM-15840 - gitify - Fix for Civi v4.6+
Tim Otten [Tue, 20 Jan 2015 23:11:14 +0000 (15:11 -0800)]
CRM-15840 - gitify - Fix for Civi v4.6+

9 years agoMerge pull request #4984 from davecivicrm/CRM-15819
Dave Greenberg [Tue, 20 Jan 2015 20:29:01 +0000 (12:29 -0800)]
Merge pull request #4984 from davecivicrm/CRM-15819

CRM-15819 - separate permission for Message Templates editing.
NOTE: Test failure unrelated to this PR.

9 years agoMerge pull request #4983 from colemanw/CRM-15842
colemanw [Tue, 20 Jan 2015 18:14:16 +0000 (13:14 -0500)]
Merge pull request #4983 from colemanw/CRM-15842

CRM-15842 - Improve custom field multiple record display options

9 years agoCRM-15819 - separate permission for Message Templates editing.
Dave Greenberg [Tue, 20 Jan 2015 17:48:31 +0000 (09:48 -0800)]
CRM-15819 - separate permission for Message Templates editing.

----------------------------------------
* CRM-15819: create separate permission for editing message templates
  https://issues.civicrm.org/jira/browse/CRM-15819

9 years agoCRM-15842 - Improve custom field multiple record display options
Coleman Watts [Tue, 20 Jan 2015 17:20:19 +0000 (12:20 -0500)]
CRM-15842 - Improve custom field multiple record display options

----------------------------------------
* CRM-15842: Custom field form improvements
  https://issues.civicrm.org/jira/browse/CRM-15842

9 years agoCRM-15842 - Custom group form cleanup
Coleman Watts [Tue, 20 Jan 2015 15:03:49 +0000 (10:03 -0500)]
CRM-15842 - Custom group form cleanup

----------------------------------------
* CRM-15842: Custom field form improvements
  https://issues.civicrm.org/jira/browse/CRM-15842

9 years agoMerge pull request #4981 from totten/master-cbf2
Tim Otten [Tue, 20 Jan 2015 08:10:49 +0000 (00:10 -0800)]
Merge pull request #4981 from totten/master-cbf2

INFRA-132 - Additional cleanups following latest merge with drupal/coder 8.x-2.x.

9 years agoMerge pull request #4980 from xurizaemon/CRM-15844
Yashodha Chaku [Tue, 20 Jan 2015 08:04:47 +0000 (13:34 +0530)]
Merge pull request #4980 from xurizaemon/CRM-15844

CRM-15844

9 years agoINFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 05:42:23 +0000 (21:42 -0800)]
INFRA-132 - Misc

9 years agoINFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 05:33:26 +0000 (21:33 -0800)]
INFRA-132 - Misc

9 years agoCRM-15844
Chris Burgess [Tue, 20 Jan 2015 05:07:47 +0000 (18:07 +1300)]
CRM-15844

Replace missing bracket :(

9 years agoINFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect
Tim Otten [Tue, 20 Jan 2015 04:28:23 +0000 (20:28 -0800)]
INFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect

9 years agoINFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 04:03:41 +0000 (20:03 -0800)]
INFRA-132 - Misc

9 years agoINFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:57:19 +0000 (19:57 -0800)]
INFRA-132 - Misc

9 years agoINFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:27:12 +0000 (19:27 -0800)]
INFRA-132 - Misc

9 years agoINFRA-132 - Drupal.Classes.ClassCreateInstance.ParenthesisMissing
Tim Otten [Tue, 20 Jan 2015 03:20:37 +0000 (19:20 -0800)]
INFRA-132 - Drupal.Classes.ClassCreateInstance.ParenthesisMissing

9 years agoINFRA-132 - Drupal.WhiteSpace.Comma.NoSpace
Tim Otten [Tue, 20 Jan 2015 03:19:56 +0000 (19:19 -0800)]
INFRA-132 - Drupal.WhiteSpace.Comma.NoSpace

9 years agoINFRA-132 - Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
Tim Otten [Tue, 20 Jan 2015 03:19:00 +0000 (19:19 -0800)]
INFRA-132 - Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines

9 years agoINFRA-132 - Squiz.Scope.MethodScope.Missing
Tim Otten [Tue, 20 Jan 2015 03:15:33 +0000 (19:15 -0800)]
INFRA-132 - Squiz.Scope.MethodScope.Missing

9 years agoINFRA-132 - Drupal.Array.Array.CommaLastItem
Tim Otten [Tue, 20 Jan 2015 03:11:49 +0000 (19:11 -0800)]
INFRA-132 - Drupal.Array.Array.CommaLastItem

9 years agoINFRA-132 - phpcbf Drupal.WhiteSpace.ScopeIndent.IncorrectExact
Tim Otten [Tue, 20 Jan 2015 02:46:18 +0000 (18:46 -0800)]
INFRA-132 - phpcbf Drupal.WhiteSpace.ScopeIndent.IncorrectExact

The automated cleanup sometimes screws with long, commented
code blocks and with statements that end "));", so I reviewed
the diff manually fixed any egregious examples.

9 years agoCRM-15844
Chris Burgess [Tue, 20 Jan 2015 01:56:36 +0000 (14:56 +1300)]
CRM-15844

9 years agoINFRA-132 - Copyright header - Drupal.WhiteSpace.ScopeIndent.IncorrectExact
Tim Otten [Tue, 20 Jan 2015 01:48:35 +0000 (17:48 -0800)]
INFRA-132 - Copyright header - Drupal.WhiteSpace.ScopeIndent.IncorrectExact

9 years agoINFRA-132 - Drupal.Classes.ClassDeclaration
Tim Otten [Tue, 20 Jan 2015 01:20:28 +0000 (17:20 -0800)]
INFRA-132 - Drupal.Classes.ClassDeclaration

9 years agoMerge pull request #4979 from xurizaemon/codingstandards-12
Tim Otten [Tue, 20 Jan 2015 01:45:34 +0000 (17:45 -0800)]
Merge pull request #4979 from xurizaemon/codingstandards-12

Coding standards cleanup sprint.

9 years agoMerge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12
Chris Burgess [Tue, 20 Jan 2015 00:49:01 +0000 (13:49 +1300)]
Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12

Conflicts:
CRM/Core/Page.php

9 years agoCoding standards cleanup sprint.
Chris Burgess [Tue, 20 Jan 2015 00:42:53 +0000 (13:42 +1300)]
Coding standards cleanup sprint.

See https://pad.riseup.net/p/QOOHQpetSXXo

This is batch 12.

9 years agoMerge branch 'batch-20'
Tim Otten [Tue, 20 Jan 2015 00:14:01 +0000 (16:14 -0800)]
Merge branch 'batch-20'

9 years agoMerge branch 'master' into batch-20
Tim Otten [Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)]
Merge branch 'master' into batch-20

9 years agoINFRA-132 - Batch 20 - Restore non-function comments
Tim Otten [Tue, 20 Jan 2015 00:11:21 +0000 (16:11 -0800)]
INFRA-132 - Batch 20 - Restore non-function comments

9 years agoMerge pull request #4977 from colemanw/CRM-15812
colemanw [Mon, 19 Jan 2015 21:24:34 +0000 (16:24 -0500)]
Merge pull request #4977 from colemanw/CRM-15812

CRM-15812 - Remove linebreaks from within {ts} strings

9 years agoMerge pull request #4963 from rohankatkar/CRM-15830
Monish Deb [Mon, 19 Jan 2015 19:30:40 +0000 (01:00 +0530)]
Merge pull request #4963 from rohankatkar/CRM-15830

Fix for CRM-15830

9 years agoCRM-15812 - Remove linebreaks from within {ts} strings
Coleman Watts [Mon, 19 Jan 2015 18:00:33 +0000 (13:00 -0500)]
CRM-15812 - Remove linebreaks from within {ts} strings

----------------------------------------
* CRM-15812: Translated strings not shown
  https://issues.civicrm.org/jira/browse/CRM-15812

9 years agoMerge pull request #4976 from colemanw/delOldUpgraders
colemanw [Mon, 19 Jan 2015 17:26:56 +0000 (12:26 -0500)]
Merge pull request #4976 from colemanw/delOldUpgraders

Remove ancient upgrade scripts part 2

9 years agoRemove ancient upgrade scripts part 2
Coleman Watts [Mon, 19 Jan 2015 15:51:39 +0000 (10:51 -0500)]
Remove ancient upgrade scripts part 2

9 years agoMerge pull request #4975 from rohankatkar/CRM-15838
Monish Deb [Mon, 19 Jan 2015 11:28:57 +0000 (16:58 +0530)]
Merge pull request #4975 from rohankatkar/CRM-15838

Additional changes for CRM-15838

9 years agoAdditional commit for CRM-15838
Web Access [Mon, 19 Jan 2015 10:09:56 +0000 (15:39 +0530)]
Additional commit for CRM-15838

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40
kurund [Mon, 19 Jan 2015 09:45:47 +0000 (15:15 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40

9 years agoMerge pull request #4969 from lynxlynxlynx/master
Monish Deb [Mon, 19 Jan 2015 09:43:58 +0000 (15:13 +0530)]
Merge pull request #4969 from lynxlynxlynx/master

Updated Slovenian "provinces": fixed names and added missing ones

9 years agoclean up for batch-20
yashodha [Mon, 19 Jan 2015 08:13:59 +0000 (13:43 +0530)]
clean up for batch-20

9 years agoMerge pull request #4973 from PalanteJon/cleanup-master
Tim Otten [Mon, 19 Jan 2015 06:53:05 +0000 (22:53 -0800)]
Merge pull request #4973 from PalanteJon/cleanup-master

INFRA-132 batch 2 cleanup

9 years agoCRM-15832 - crmResource - Fix handling of domains
Tim Otten [Sat, 17 Jan 2015 12:10:39 +0000 (04:10 -0800)]
CRM-15832 - crmResource - Fix handling of domains

9 years agoCRM-15832 - crmResource - Include the locale in the resource-bundle URL.
Tim Otten [Sat, 17 Jan 2015 00:22:06 +0000 (16:22 -0800)]
CRM-15832 - crmResource - Include the locale in the resource-bundle URL.

9 years agoCRM-15832 - Rename CRM_Core_Page_Angular to Civi\Angular\Page\Main
Tim Otten [Fri, 16 Jan 2015 11:35:01 +0000 (03:35 -0800)]
CRM-15832 - Rename CRM_Core_Page_Angular to Civi\Angular\Page\Main

9 years agoCRM-15832 - Update various modules to use crmResource
Tim Otten [Fri, 16 Jan 2015 11:16:07 +0000 (03:16 -0800)]
CRM-15832 - Update various modules to use crmResource

9 years agoCRM-15832 - crmResource - Add module to load partials+strings in batches.
Tim Otten [Fri, 16 Jan 2015 11:14:48 +0000 (03:14 -0800)]
CRM-15832 - crmResource - Add module to load partials+strings in batches.

9 years agoINFRA-132 batch 2 cleanup
Jon goldberg [Mon, 19 Jan 2015 05:19:22 +0000 (00:19 -0500)]
INFRA-132 batch 2 cleanup

9 years agoMerge pull request #4972 from rohankatkar/Batch#17
Monish Deb [Mon, 19 Jan 2015 04:51:00 +0000 (10:21 +0530)]
Merge pull request #4972 from rohankatkar/Batch#17

Minor changes to Batch #17

9 years agoMinor changes to Batch #17
Web Access [Mon, 19 Jan 2015 04:46:39 +0000 (10:16 +0530)]
Minor changes to Batch #17

9 years agoMerge pull request #4971 from kurund/batch-16
Kurund Jalmi [Sun, 18 Jan 2015 19:12:09 +0000 (00:42 +0530)]
Merge pull request #4971 from kurund/batch-16

more cleanup batch 16

9 years agomore cleanup batch 16
kurund [Sun, 18 Jan 2015 16:50:20 +0000 (22:20 +0530)]
more cleanup batch 16

9 years agoMerge pull request #4970 from colemanw/CRM-15812
colemanw [Sun, 18 Jan 2015 00:11:57 +0000 (19:11 -0500)]
Merge pull request #4970 from colemanw/CRM-15812

CRM-15812 - Fix missing ts

9 years agoCRM-15812 - Fix missing ts
Coleman Watts [Sun, 18 Jan 2015 00:09:13 +0000 (19:09 -0500)]
CRM-15812 - Fix missing ts

----------------------------------------
* CRM-15812: Translated strings not shown
  https://issues.civicrm.org/jira/browse/CRM-15812

9 years agocivicrm_state_province.tpl: added missing Slovenian "provinces"
Jaka Kranjc [Sat, 17 Jan 2015 21:41:45 +0000 (22:41 +0100)]
civicrm_state_province.tpl: added missing Slovenian "provinces"

9 years agoUse proper names for Slovenian municipalities
Jaka Kranjc [Sat, 17 Jan 2015 20:45:02 +0000 (21:45 +0100)]
Use proper names for Slovenian municipalities

long live unicode!

9 years agocivicrm_state_province.tpl: added missing newline at EOF
Jaka Kranjc [Sat, 17 Jan 2015 20:26:55 +0000 (21:26 +0100)]
civicrm_state_province.tpl: added missing newline at EOF

9 years agoCRM-15832 - Angular - Add page which aggregates partials+strings
Tim Otten [Fri, 16 Jan 2015 06:29:34 +0000 (22:29 -0800)]
CRM-15832 - Angular - Add page which aggregates partials+strings

9 years agoCRM-15832 - getAngularModules - Move from CRM_Core_Page_Angular to Civi\Angular\Manager
Tim Otten [Fri, 16 Jan 2015 06:28:28 +0000 (22:28 -0800)]
CRM-15832 - getAngularModules - Move from CRM_Core_Page_Angular to Civi\Angular\Manager

9 years agoCRM_Core_Page, CRM_Core_Form - Fix for PHP 5.3 namespaces
Tim Otten [Fri, 16 Jan 2015 11:34:37 +0000 (03:34 -0800)]
CRM_Core_Page, CRM_Core_Form - Fix for PHP 5.3 namespaces

9 years agoCRM_Core_Invoke - Backport support for PHP 5.3 namespaces
Tim Otten [Fri, 16 Jan 2015 06:24:42 +0000 (22:24 -0800)]
CRM_Core_Invoke - Backport support for PHP 5.3 namespaces

This is a partial backport of 0fc3cacbd2714be493afda6a33eda93846deaca2.  It
includes support for PHP 5.3 namespaces but not for Symfony request/response
objects.

9 years agoCRM-15832 - getAngularModules - Cleanup
Tim Otten [Fri, 16 Jan 2015 02:40:51 +0000 (18:40 -0800)]
CRM-15832 - getAngularModules - Cleanup

9 years agoCRM-15832 - getAngularModules - Declare partials, css, and js using globs
Tim Otten [Fri, 16 Jan 2015 02:33:51 +0000 (18:33 -0800)]
CRM-15832 - getAngularModules - Declare partials, css, and js using globs

9 years agoCRM-15832 - CRM_Core_Resources - Add glob() function
Tim Otten [Fri, 16 Jan 2015 02:33:30 +0000 (18:33 -0800)]
CRM-15832 - CRM_Core_Resources - Add glob() function

9 years agoCRM/Event/Form/ManageEvent/Registration.php - Fix static usage warning
Tim Otten [Sat, 17 Jan 2015 11:41:52 +0000 (03:41 -0800)]
CRM/Event/Form/ManageEvent/Registration.php - Fix static usage warning

9 years agoCRM.ts() - Respect domains when selecting/transmitting strings
Tim Otten [Sat, 17 Jan 2015 11:42:54 +0000 (03:42 -0800)]
CRM.ts() - Respect domains when selecting/transmitting strings

Previousy, all strings from all JS files were translated in the default
'civicrm' domain, and they were transmitted via CRM.strings.

Now, strings from extension JS files are translated in their respective
domains, and they are transmitted via CRM['strings::'+domain].  If a string
is unavailable in the extension's domain, then it is translated using the
default 'civicrm' domain.

Strings from core JS files are still processed as before.

9 years agoMerge pull request #4950 from atif-shaikh/CRM-15826
Tim Otten [Sat, 17 Jan 2015 09:46:28 +0000 (01:46 -0800)]
Merge pull request #4950 from atif-shaikh/CRM-15826

CRM-15826 - CiviCase core bugs

9 years agoCRM-15832 - CRM_Core_Resources - Move translateScript to class. Add HTML support.
Tim Otten [Fri, 16 Jan 2015 04:05:40 +0000 (20:05 -0800)]
CRM-15832 - CRM_Core_Resources - Move translateScript to class. Add HTML support.

For the moment, it looks like the existing JS string-extractor actually
works for Angular-style HTML partials.  This is not entirely a coincidence
(since our Angular convention was purposefully derived from our JS
convention), but luck/circumstance is a big factor, and this may not work in
the long-run.  This commit makes it easy to use different string-extractors
for different file-types.

9 years agoMerge pull request #4961 from pratikshad/core-bugs
Monish Deb [Fri, 16 Jan 2015 13:06:34 +0000 (18:36 +0530)]
Merge pull request #4961 from pratikshad/core-bugs

Fixed Division by zero warning in Contribution Repeat CiviReport

9 years agoFix for CRM-15830
Web Access [Fri, 16 Jan 2015 12:54:48 +0000 (18:24 +0530)]
Fix for CRM-15830

9 years agoflush out inappropriate changes
atif-shaikh [Fri, 16 Jan 2015 11:12:08 +0000 (16:42 +0530)]
flush out inappropriate changes

9 years agoMake sure that the "Change Timeline" business logic runs in a transaction
atif-shaikh [Fri, 16 Jan 2015 11:06:39 +0000 (16:36 +0530)]
Make sure that the "Change Timeline" business logic runs in a transaction

9 years agoFixed warning of Division by zero in CiviReport
pratikshad [Fri, 16 Jan 2015 10:37:40 +0000 (16:07 +0530)]
Fixed warning of Division by zero in CiviReport

9 years agoMerge pull request #4954 from monishdeb/CRM-15812
Kurund Jalmi [Fri, 16 Jan 2015 10:13:04 +0000 (15:43 +0530)]
Merge pull request #4954 from monishdeb/CRM-15812

CRM-15812 fix - Translated strings not shown

9 years agoCRM-15812 fix - Translated strings not shown
monishdeb [Mon, 2 Feb 2015 13:41:03 +0000 (19:11 +0530)]
CRM-15812 fix - Translated strings not shown

https://issues.civicrm.org/jira/browse/CRM-15812

9 years agoMerge pull request #4958 from pratikshad/code-cleanup-batch-19
Kurund Jalmi [Fri, 16 Jan 2015 10:12:30 +0000 (15:42 +0530)]
Merge pull request #4958 from pratikshad/code-cleanup-batch-19

Clean up code for batch 19

9 years agoMerge pull request #4953 from monishdeb/4.5
Yashodha Chaku [Fri, 16 Jan 2015 10:10:34 +0000 (15:40 +0530)]
Merge pull request #4953 from monishdeb/4.5

CRM-15813 fix - Honoree Information profile overwrites contributor infor...

9 years agoCRM-15813 fix - Honoree Information profile overwrites contributor information
monishdeb [Mon, 2 Feb 2015 13:03:20 +0000 (18:33 +0530)]
CRM-15813 fix - Honoree Information profile overwrites contributor information

https://issues.civicrm.org/jira/browse/CRM-15813

9 years agoMerge pull request #4960 from monishdeb/INFRA-32
Kurund Jalmi [Fri, 16 Jan 2015 10:09:12 +0000 (15:39 +0530)]
Merge pull request #4960 from monishdeb/INFRA-32

INFRA-32 batch 11

9 years agoINFRA-32 batch 11
monishdeb [Tue, 3 Feb 2015 07:52:04 +0000 (13:22 +0530)]
INFRA-32 batch 11

9 years agoMerge pull request #4959 from rohankatkar/batch-17
Kurund Jalmi [Fri, 16 Jan 2015 10:09:05 +0000 (15:39 +0530)]
Merge pull request #4959 from rohankatkar/batch-17

INFRA 32 - Batch #17

9 years agoMerge pull request #4957 from civicrm/batch-18
Kurund Jalmi [Fri, 16 Jan 2015 10:07:52 +0000 (15:37 +0530)]
Merge pull request #4957 from civicrm/batch-18

clean up changes for batch 18

9 years agoINFRA 32 - Batch #17
Web Access [Fri, 16 Jan 2015 06:42:31 +0000 (12:12 +0530)]
INFRA 32 - Batch #17

9 years agoMerge pull request #4951 from pratikshad/code-cleanup-batch-15
Monish Deb [Fri, 16 Jan 2015 06:07:31 +0000 (11:37 +0530)]
Merge pull request #4951 from pratikshad/code-cleanup-batch-15

Fixed Code clean up for batch 15

9 years agoFixed return void for clean up batch-15
pratikshad [Fri, 16 Jan 2015 05:58:43 +0000 (11:28 +0530)]
Fixed return void  for clean up batch-15

9 years agoclean up changes for batch 18
yashodha [Fri, 16 Jan 2015 05:40:54 +0000 (11:10 +0530)]
clean up changes for batch 18

9 years agoClean up code for batch 19
pratikshad [Fri, 16 Jan 2015 05:36:39 +0000 (11:06 +0530)]
Clean up code for batch 19

9 years agoMerge pull request #4935 from atif-shaikh/CRM-15804
Monish Deb [Fri, 16 Jan 2015 05:25:52 +0000 (10:55 +0530)]
Merge pull request #4935 from atif-shaikh/CRM-15804

Crm 15804

9 years agoMerge pull request #4955 from atif-shaikh/master-cleanup
Yashodha Chaku [Fri, 16 Jan 2015 03:14:26 +0000 (08:44 +0530)]
Merge pull request #4955 from atif-shaikh/master-cleanup

INFRA-132 - Batch #8

9 years agoMerge pull request #4956 from colemanw/CRM-15820
colemanw [Thu, 15 Jan 2015 20:05:17 +0000 (15:05 -0500)]
Merge pull request #4956 from colemanw/CRM-15820

CRM-15820 - Exclude deleted contacts from group counts