revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00
Code Issues Releases Wiki Activity

Merge 2015 Redesign ("redesign-2015" -> "master")

Browse source 
For discussion, see T8549.
This commit is contained in:
epriestley 2015-07-05 05:15:26 -07:00
commit 7cc8a73d1e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/celerity/map.php
View file

@ -113,7 +113,7 @@ return array(
'rsrc/css/core/z-index.css' => '63689f49',
'rsrc/css/diviner/diviner-shared.css' => '5a337049',
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
'rsrc/css/font/font-lato.css' => 'a428b083',
'rsrc/css/font/font-lato.css' => 'a50055d6',
'rsrc/css/font/font-roboto-slab.css' => 'f24a53cb',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
@ -162,6 +162,10 @@ return array(
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d',
'rsrc/externals/font/lato/Lato-italic.woff' => '43ca3e0b',
'rsrc/externals/font/lato/Lato-italic.woff2' => '2ac41e31',
'rsrc/externals/font/lato/Lato-regular.woff' => 'db6a36dd',
'rsrc/externals/font/lato/Lato-regular.woff2' => 'ee7b304d',
'rsrc/externals/font/lato/lato-bold.eot' => 'a3a1bea1',
'rsrc/externals/font/lato/lato-bold.ttf' => '0175a547',
'rsrc/externals/font/lato/lato-bold.woff' => '1a242f22',
@ -172,12 +176,8 @@ return array(
'rsrc/externals/font/lato/lato-bolditalic.woff2' => '2646b573',
'rsrc/externals/font/lato/lato-italic.eot' => 'ed898a9e',
'rsrc/externals/font/lato/lato-italic.ttf' => '8715fd11',
'rsrc/externals/font/lato/lato-italic.woff' => 'a08f6653',
'rsrc/externals/font/lato/lato-italic.woff2' => '45c7ea4e',
'rsrc/externals/font/lato/lato-regular.eot' => 'c10e72a8',
'rsrc/externals/font/lato/lato-regular.ttf' => 'cdf9db5f',
'rsrc/externals/font/lato/lato-regular.woff' => 'fbf67de9',
'rsrc/externals/font/lato/lato-regular.woff2' => '74a95363',
'rsrc/externals/font/robotoslab/robotoslab-regular.eot' => 'eaefe21c',
'rsrc/externals/font/robotoslab/robotoslab-regular.ttf' => '4bfef7d5',
'rsrc/externals/font/robotoslab/robotoslab-regular.woff' => '7f0552f9',
@ -532,7 +532,7 @@ return array(
'diffusion-source-css' => '66fdf661',
'diviner-shared-css' => '5a337049',
'font-fontawesome' => 'e2e712fe',
'font-lato' => 'a428b083',
'font-lato' => 'a50055d6',
'font-roboto-slab' => 'f24a53cb',
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => '49d64eb4',
@ -1590,14 +1590,14 @@ return array(
'javelin-vector',
'javelin-install',
),
'a428b083' => array(
'phui-fontkit-css',
),
'a464fe03' => array(
'javelin-behavior',
'javelin-uri',
'phabricator-notification',
),
'a50055d6' => array(
'phui-fontkit-css',
),
'a80d0378' => array(
'javelin-behavior',
'javelin-stratcom',

2
src/applications/base/controller/PhabricatorController.php
View file

@ -216,7 +216,7 @@ abstract class PhabricatorController extends AphrontController {
// later on.
$spaces = PhabricatorSpacesNamespaceQuery::getSpacesExist();
if ($spaces) {
$viewer_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpacesExist(
$viewer_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpaces(
$user);
if (!$viewer_spaces) {
$controller = new PhabricatorSpacesNoAccessController();