diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php --- a/src/applications/base/PhabricatorApplication.php +++ b/src/applications/base/PhabricatorApplication.php @@ -12,12 +12,9 @@ implements PhabricatorPolicyInterface { const GROUP_CORE = 'core'; - const GROUP_COMMUNICATION = 'communication'; - const GROUP_ORGANIZATION = 'organization'; const GROUP_UTILITIES = 'util'; const GROUP_ADMIN = 'admin'; const GROUP_DEVELOPER = 'developer'; - const GROUP_MISC = 'misc'; const TILE_INVISIBLE = 'invisible'; const TILE_HIDE = 'hide'; @@ -27,12 +24,9 @@ public static function getApplicationGroups() { return array( self::GROUP_CORE => pht('Core Applications'), - self::GROUP_COMMUNICATION => pht('Communication'), - self::GROUP_ORGANIZATION => pht('Organization'), self::GROUP_UTILITIES => pht('Utilities'), self::GROUP_ADMIN => pht('Administration'), self::GROUP_DEVELOPER => pht('Developer Tools'), - self::GROUP_MISC => pht('Miscellaneous Applications'), ); } @@ -147,7 +141,7 @@ } public function getApplicationGroup() { - return self::GROUP_MISC; + return self::GROUP_CORE; } public function getTitleGlyph() { diff --git a/src/applications/calendar/application/PhabricatorApplicationCalendar.php b/src/applications/calendar/application/PhabricatorApplicationCalendar.php --- a/src/applications/calendar/application/PhabricatorApplicationCalendar.php +++ b/src/applications/calendar/application/PhabricatorApplicationCalendar.php @@ -24,10 +24,6 @@ return "\xE2\x8C\xA8"; } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php --- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php +++ b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php @@ -23,7 +23,7 @@ } public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; + return self::GROUP_UTILITIES; } public function getRoutes() { diff --git a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php --- a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php +++ b/src/applications/conpherence/application/PhabricatorApplicationConpherence.php @@ -1,8 +1,5 @@ array( diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php --- a/src/applications/people/application/PhabricatorApplicationPeople.php +++ b/src/applications/people/application/PhabricatorApplicationPeople.php @@ -22,10 +22,6 @@ return pht('Sort of a social utility.'); } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function canUninstall() { return false; } diff --git a/src/applications/phame/application/PhabricatorApplicationPhame.php b/src/applications/phame/application/PhabricatorApplicationPhame.php --- a/src/applications/phame/application/PhabricatorApplicationPhame.php +++ b/src/applications/phame/application/PhabricatorApplicationPhame.php @@ -22,10 +22,6 @@ return PhabricatorEnv::getDoclink('Phame User Guide'); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/pholio/application/PhabricatorApplicationPholio.php b/src/applications/pholio/application/PhabricatorApplicationPholio.php --- a/src/applications/pholio/application/PhabricatorApplicationPholio.php +++ b/src/applications/pholio/application/PhabricatorApplicationPholio.php @@ -22,11 +22,6 @@ return pht('Things before they were cool.'); } - public function getApplicationGroup() { - // TODO: Move to CORE, this just keeps it out of the side menu. - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorApplicationPhriction.php --- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php +++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php @@ -58,10 +58,6 @@ ); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function getApplicationOrder() { return 0.140; } diff --git a/src/applications/ponder/application/PhabricatorApplicationPonder.php b/src/applications/ponder/application/PhabricatorApplicationPonder.php --- a/src/applications/ponder/application/PhabricatorApplicationPonder.php +++ b/src/applications/ponder/application/PhabricatorApplicationPonder.php @@ -37,10 +37,6 @@ ); } - public function getApplicationGroup() { - return self::GROUP_COMMUNICATION; - } - public function isBeta() { return true; } diff --git a/src/applications/project/application/PhabricatorApplicationProject.php b/src/applications/project/application/PhabricatorApplicationProject.php --- a/src/applications/project/application/PhabricatorApplicationProject.php +++ b/src/applications/project/application/PhabricatorApplicationProject.php @@ -22,10 +22,6 @@ return pht('Group stuff into big piles.'); } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function getRemarkupRules() { return array( new ProjectRemarkupRule(), diff --git a/src/applications/releeph/application/PhabricatorApplicationReleeph.php b/src/applications/releeph/application/PhabricatorApplicationReleeph.php --- a/src/applications/releeph/application/PhabricatorApplicationReleeph.php +++ b/src/applications/releeph/application/PhabricatorApplicationReleeph.php @@ -18,10 +18,6 @@ return 'releeph'; } - public function getApplicationGroup() { - return self::GROUP_ORGANIZATION; - } - public function isInstalled() { if (PhabricatorEnv::getEnvConfig('releeph.installed')) { return parent::isInstalled();