Merge branch 'master' into redesign-2015

resources/celerity/map.php

@@ -114,7 +114,7 @@ return array(
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
     'rsrc/css/font/font-awesome.css' => 'e2e712fe',
     'rsrc/css/font/font-lato.css' => '5f05d817',
-    'rsrc/css/font/font-slabo.css' => '7a85ea13',
+    'rsrc/css/font/font-slabo.css' => '1f520937',
     'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853',
@@ -370,10 +370,10 @@ return array(
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/herald/HeraldRuleEditor.js' => '271ffdd7',
+    'rsrc/js/application/herald/HeraldRuleEditor.js' => 'b2cae298',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
-    'rsrc/js/application/maniphest/behavior-batch-editor.js' => 'f5d1233b',
+    'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => '7b98d7c5',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => '88f0c5b3',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
@@ -390,7 +390,7 @@ return array(
     'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '3f5d6dbf',
     'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c',
     'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
-    'rsrc/js/application/policy/behavior-policy-control.js' => '9a340b3d',
+    'rsrc/js/application/policy/behavior-policy-control.js' => '7d470398',
     'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
     'rsrc/js/application/ponder/behavior-votebox.js' => '4e9b766b',
     'rsrc/js/application/projects/behavior-project-boards.js' => 'ba4fa35c',
@@ -522,11 +522,11 @@ return array(
     'diviner-shared-css' => '38813222',
     'font-fontawesome' => 'e2e712fe',
     'font-lato' => '5f05d817',
-    'font-slabo' => '7a85ea13',
+    'font-slabo' => '1f520937',
     'global-drag-and-drop-css' => '697324ad',
     'harbormaster-css' => '49d64eb4',
     'herald-css' => '826075fa',
-    'herald-rule-editor' => '271ffdd7',
+    'herald-rule-editor' => 'b2cae298',
     'herald-test-css' => '778b008e',
     'inline-comment-summary-css' => '51efda3a',
     'javelin-aphlict' => '5359e785',
@@ -585,7 +585,7 @@ return array(
     'javelin-behavior-lightbox-attachments' => 'f8ba29d7',
     'javelin-behavior-line-chart' => '88f0c5b3',
     'javelin-behavior-load-blame' => '42126667',
-    'javelin-behavior-maniphest-batch-editor' => 'f5d1233b',
+    'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
     'javelin-behavior-maniphest-batch-selector' => '7b98d7c5',
     'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
     'javelin-behavior-maniphest-subpriority-editor' => '84845b5b',
@@ -622,7 +622,7 @@ return array(
     'javelin-behavior-pholio-mock-view' => 'fbe497e7',
     'javelin-behavior-phui-dropdown-menu' => '54733475',
     'javelin-behavior-phui-object-box-tabs' => '2bfa2836',
-    'javelin-behavior-policy-control' => '9a340b3d',
+    'javelin-behavior-policy-control' => '7d470398',
     'javelin-behavior-policy-rule-editor' => '5e9f347c',
     'javelin-behavior-ponder-votebox' => '4e9b766b',
     'javelin-behavior-project-boards' => 'ba4fa35c',
@@ -973,6 +973,9 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
+    '1f520937' => array(
+      'phui-fontkit-css',
+    ),
     '2035b9cb' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1010,15 +1013,6 @@ return array(
       'phabricator-drag-and-drop-file-upload',
       'phabricator-draggable-list',
     ),
-    '271ffdd7' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-json',
-      'phabricator-prefab',
-    ),
     '2818f5ce' => array(
       'javelin-install',
       'javelin-util',
@@ -1414,6 +1408,14 @@ return array(
       'javelin-util',
       'phabricator-busy',
     ),
+    '782ab6e7' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+      'multirow-row-manager',
+      'javelin-json',
+    ),
     '7927a7d3' => array(
       'javelin-behavior',
       'javelin-quicksand',
@@ -1422,9 +1424,6 @@ return array(
       'owners-path-editor',
       'javelin-behavior',
     ),
-    '7a85ea13' => array(
-      'phui-fontkit-css',
-    ),
     '7b98d7c5' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1437,6 +1436,15 @@ return array(
       'javelin-request',
       'javelin-router',
     ),
+    '7d470398' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'phuix-dropdown-menu',
+      'phuix-action-list-view',
+      'phuix-action-view',
+      'javelin-workflow',
+    ),
     '7e41274a' => array(
       'javelin-install',
     ),
@@ -1582,15 +1590,6 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
-    '9a340b3d' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'phuix-dropdown-menu',
-      'phuix-action-list-view',
-      'phuix-action-view',
-      'javelin-workflow',
-    ),
     '9f36c42d' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1707,6 +1706,15 @@ return array(
       'javelin-uri',
       'javelin-request',
     ),
+    'b2cae298' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-json',
+      'phabricator-prefab',
+    ),
     'b3a4b884' => array(
       'javelin-behavior',
       'phabricator-prefab',
@@ -1970,14 +1978,6 @@ return array(
       'javelin-request',
       'phabricator-keyboard-shortcut',
     ),
-    'f5d1233b' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-      'multirow-row-manager',
-      'javelin-json',
-    ),
     'f6555212' => array(
       'javelin-install',
       'javelin-reactornode',