(stable) Promote 2015 Week 49

resources/celerity/map.php

@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '91bbffc2',
+    'core.pkg.css' => '4d47b0a9',
     'core.pkg.js' => '47dc9ebb',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
@@ -36,7 +36,7 @@ return array(
     'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
     'rsrc/css/application/base/phui-theme.css' => '6b451f24',
-    'rsrc/css/application/base/standard-page-view.css' => 'a1096ed4',
+    'rsrc/css/application/base/standard-page-view.css' => '3c99cdf4',
     'rsrc/css/application/calendar/calendar-icon.css' => 'c69aa59f',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
@@ -82,7 +82,7 @@ return array(
     'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
     'rsrc/css/application/paste/paste.css' => 'b2f5a543',
     'rsrc/css/application/people/people-profile.css' => '25970776',
-    'rsrc/css/application/phame/phame.css' => 'bb147387',
+    'rsrc/css/application/phame/phame.css' => 'cea3c9e1',
     'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
     'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49',
     'rsrc/css/application/pholio/pholio.css' => '95174bdd',
@@ -103,8 +103,8 @@ return array(
     'rsrc/css/application/slowvote/slowvote.css' => 'da0afb1b',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => '78e8d7ea',
+    'rsrc/css/core/core.css' => 'a76cefc9',
-    'rsrc/css/core/remarkup.css' => '88e1ebb6',
+    'rsrc/css/core/remarkup.css' => 'b1c10368',
     'rsrc/css/core/syntax.css' => '9fd11da8',
     'rsrc/css/core/z-index.css' => '57ddcaa2',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
@@ -126,7 +126,8 @@ return array(
     'rsrc/css/phui/phui-box.css' => 'a5bb366d',
     'rsrc/css/phui/phui-button.css' => '16020a60',
     'rsrc/css/phui/phui-crumbs-view.css' => '414406b5',
-    'rsrc/css/phui/phui-document-pro.css' => '5f75ed99',
+    'rsrc/css/phui/phui-document-pro.css' => 'e0fad431',
+    'rsrc/css/phui/phui-document-summary.css' => '8c1e0aca',
     'rsrc/css/phui/phui-document.css' => 'a4a1c3b9',
     'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
     'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
@@ -264,7 +265,7 @@ return array(
     'rsrc/favicons/mask-icon.svg' => '0460cb1f',
     'rsrc/image/BFCFDA.png' => 'd5ec91f4',
     'rsrc/image/actions/edit.png' => '2fc41442',
-    'rsrc/image/avatar.png' => '3eb28cd9',
+    'rsrc/image/avatar.png' => 'e132bb6a',
     'rsrc/image/checker_dark.png' => 'd8e65881',
     'rsrc/image/checker_light.png' => 'a0155918',
     'rsrc/image/checker_lighter.png' => 'd5da91b6',
@@ -319,6 +320,16 @@ return array(
     'rsrc/image/people/lincoln.png' => '9369126d',
     'rsrc/image/people/mckinley.png' => 'fb8f16ce',
     'rsrc/image/people/taft.png' => 'd7bc402c',
+    'rsrc/image/people/user0.png' => '03dacaea',
+    'rsrc/image/people/user1.png' => '4a4e7702',
+    'rsrc/image/people/user2.png' => '47a0ee40',
+    'rsrc/image/people/user3.png' => '835ff627',
+    'rsrc/image/people/user4.png' => 'b0e830f1',
+    'rsrc/image/people/user5.png' => '9c95b369',
+    'rsrc/image/people/user6.png' => 'ba3fbfb0',
+    'rsrc/image/people/user7.png' => 'da613924',
+    'rsrc/image/people/user8.png' => 'f1035edf',
+    'rsrc/image/people/user9.png' => '66730be3',
     'rsrc/image/people/washington.png' => '40dd301c',
     'rsrc/image/phrequent_active.png' => 'a466a8ed',
     'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
@@ -419,6 +430,7 @@ return array(
     'rsrc/js/application/repository/repository-crossreference.js' => 'e5339c43',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
+    'rsrc/js/application/transactions/behavior-comment-actions.js' => 'f2c64202',
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
     'rsrc/js/application/transactions/behavior-show-older-transactions.js' => 'dbbf48b6',
     'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => 'b23b49e6',
@@ -497,6 +509,8 @@ return array(
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '8cf6d262',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => 'bd4c8dca',
+    'rsrc/js/phuix/PHUIXFormControl.js' => 'f9fba5ee',
+    'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
     'almanac-css' => 'dbb9b3af',
@@ -560,6 +574,7 @@ return array(
     'javelin-behavior-audit-preview' => 'd835b03a',
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-choose-control' => '6153c708',
+    'javelin-behavior-comment-actions' => 'f2c64202',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
     'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
     'javelin-behavior-conpherence-menu' => '1d45c74d',
@@ -727,7 +742,7 @@ return array(
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => '78e8d7ea',
+    'phabricator-core-css' => 'a76cefc9',
     'phabricator-countdown-css' => 'e7544472',
     'phabricator-dashboard-css' => 'eb458607',
     'phabricator-drag-and-drop-file-upload' => 'ad10aeac',
@@ -749,13 +764,13 @@ return array(
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '6920d200',
-    'phabricator-remarkup-css' => '88e1ebb6',
+    'phabricator-remarkup-css' => 'b1c10368',
     'phabricator-search-results-css' => '7dea472c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => 'bec2458e',
     'phabricator-slowvote-css' => 'da0afb1b',
     'phabricator-source-code-view-css' => 'cbeef983',
-    'phabricator-standard-page-view' => 'a1096ed4',
+    'phabricator-standard-page-view' => '3c99cdf4',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => 'df5e11d2',
     'phabricator-tooltip' => '1d298e3a',
@@ -771,7 +786,7 @@ return array(
     'phabricator-uiexample-reactor-sendclass' => '1def2711',
     'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
     'phabricator-zindex-css' => '57ddcaa2',
-    'phame-css' => 'bb147387',
+    'phame-css' => 'cea3c9e1',
     'pholio-css' => '95174bdd',
     'pholio-edit-css' => '3ad9d1ee',
     'pholio-inline-comments-css' => '8e545e49',
@@ -789,8 +804,9 @@ return array(
     'phui-calendar-list-css' => 'c1c7f338',
     'phui-calendar-month-css' => '476be7e0',
     'phui-crumbs-view-css' => '414406b5',
+    'phui-document-summary-view-css' => '8c1e0aca',
     'phui-document-view-css' => 'a4a1c3b9',
-    'phui-document-view-pro-css' => '5f75ed99',
+    'phui-document-view-pro-css' => 'e0fad431',
     'phui-feed-story-css' => 'b7b26d23',
     'phui-font-icon-base-css' => 'ecbbb4c2',
     'phui-fontkit-css' => '9cda225e',
@@ -821,6 +837,8 @@ return array(
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '8cf6d262',
     'phuix-dropdown-menu' => 'bd4c8dca',
+    'phuix-form-control-view' => 'f9fba5ee',
+    'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
     'policy-transaction-detail-css' => '82100a43',
@@ -1765,6 +1783,10 @@ return array(
       'javelin-util',
       'javelin-request',
     ),
+    'bff6884b' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     'c1700f6f' => array(
       'javelin-install',
       'javelin-util',
@@ -1971,6 +1993,14 @@ return array(
       'javelin-workflow',
       'javelin-json',
     ),
+    'f2c64202' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-dom',
+      'phuix-form-control-view',
+      'phuix-icon-view',
+    ),
     'f36e01af' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -2027,6 +2057,10 @@ return array(
       'javelin-util',
       'phabricator-busy',
     ),
+    'f9fba5ee' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     'fa0f4fc2' => array(
       'javelin-behavior',
       'javelin-dom',

resources/sql/autopatches/20151128.phame.blog.picture.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phame.phame_blog
+  ADD profileImagePHID VARBINARY(64);

resources/sql/autopatches/20151130.phurl.mailkey.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phurl.phurl_url
+  ADD mailKey binary(20) NOT NULL;

resources/sql/autopatches/20151130.phurl.mailkey.2.php

@@ -0,0 +1,18 @@
+<?php
+
+$table = new PhabricatorPhurlURL();
+$conn_w = $table->establishConnection('w');
+$iterator = new LiskMigrationIterator($table);
+foreach ($iterator as $url) {
+  $id = $url->getID();
+
+  echo pht('Adding mail key for Phurl %d...', $id);
+  echo "\n";
+
+  queryfx(
+    $conn_w,
+    'UPDATE %T SET mailKey = %s WHERE id = %d',
+    $table->getTableName(),
+    Filesystem::readRandomCharacters(20),
+    $id);
+}

resources/sql/autopatches/20151202.versioneddraft.1.sql

@@ -0,0 +1,10 @@
+CREATE TABLE {$NAMESPACE}_draft.draft_versioneddraft (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  version INT UNSIGNED NOT NULL,
+  properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_object` (objectPHID, authorPHID, version)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

scripts/sql/manage_storage.php

@@ -63,16 +63,17 @@ try {
           $default_namespace),
       ),
       array(
-        'name'  => 'dryrun',
+        'name'    => 'dryrun',
-        'help'  => pht(
+        'help'    => pht(
           'Do not actually change anything, just show what would be changed.'),
       ),
       array(
-        'name' => 'disable-utf8mb4',
+        'name'    => 'disable-utf8mb4',
-        'help' => pht(
+        'help'    => pht(
-          'Disable utf8mb4, even if the database supports it. This is an '.
+          'Disable %s, even if the database supports it. This is an '.
           'advanced feature used for testing changes to Phabricator; you '.
-          'should not normally use this flag.'),
+          'should not normally use this flag.',
+          'utf8mb4'),
       ),
     ));
 } catch (PhutilArgumentUsageException $ex) {
@@ -83,12 +84,12 @@ try {
 // First, test that the Phabricator configuration is set up correctly. After
 // we know this works we'll test any administrative credentials specifically.
 
-$test_api = new PhabricatorStorageManagementAPI();
+$test_api = id(new PhabricatorStorageManagementAPI())
-$test_api->setUser($default_user);
+  ->setUser($default_user)
-$test_api->setHost($default_host);
+  ->setHost($default_host)
-$test_api->setPort($default_port);
+  ->setPort($default_port)
-$test_api->setPassword($conf->getPassword());
+  ->setPassword($conf->getPassword())
-$test_api->setNamespace($args->getArg('namespace'));
+  ->setNamespace($args->getArg('namespace'));
 
 try {
   queryfx(
@@ -113,13 +114,10 @@ try {
       '--password'),
     pht('Raw MySQL Error'),
     $ex->getMessage());
-
   echo phutil_console_wrap($message);
-
   exit(1);
 }
 
-
 if ($args->getArg('password') === null) {
   // This is already a PhutilOpaqueEnvelope.
   $password = $conf->getPassword();
@@ -129,14 +127,14 @@ if ($args->getArg('password') === null) {
   PhabricatorEnv::overrideConfig('mysql.pass', $args->getArg('password'));
 }
 
-$api = new PhabricatorStorageManagementAPI();
+$api = id(new PhabricatorStorageManagementAPI())
-$api->setUser($args->getArg('user'));
+  ->setUser($args->getArg('user'))
-PhabricatorEnv::overrideConfig('mysql.user', $args->getArg('user'));
+  ->setHost($default_host)
-$api->setHost($default_host);
+  ->setPort($default_port)
-$api->setPort($default_port);
+  ->setPassword($password)
-$api->setPassword($password);
+  ->setNamespace($args->getArg('namespace'))
-$api->setNamespace($args->getArg('namespace'));
+  ->setDisableUTF8MB4($args->getArg('disable-utf8mb4'));
-$api->setDisableUTF8MB4($args->getArg('disable-utf8mb4'));
+PhabricatorEnv::overrideConfig('mysql.user', $api->getUser());
 
 try {
   queryfx(
@@ -154,9 +152,7 @@ try {
       '--password'),
     pht('Raw MySQL Error'),
     $ex->getMessage());
-
   echo phutil_console_wrap($message);
-
   exit(1);
 }
 

src/__phutil_library_map__.php

@@ -103,6 +103,7 @@ phutil_register_library_map(array(
     'AphrontAjaxResponse' => 'aphront/response/AphrontAjaxResponse.php',
     'AphrontApplicationConfiguration' => 'aphront/configuration/AphrontApplicationConfiguration.php',
     'AphrontBarView' => 'view/widget/bars/AphrontBarView.php',
+    'AphrontBoolHTTPParameterType' => 'aphront/httpparametertype/AphrontBoolHTTPParameterType.php',
     'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
     'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
     'AphrontController' => 'aphront/AphrontController.php',
@@ -139,12 +140,14 @@ phutil_register_library_map(array(
     'AphrontHTTPProxyResponse' => 'aphront/response/AphrontHTTPProxyResponse.php',
     'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php',
     'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php',
+    'AphrontIntHTTPParameterType' => 'aphront/httpparametertype/AphrontIntHTTPParameterType.php',
     'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
     'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
     'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
     'AphrontJavelinView' => 'view/AphrontJavelinView.php',
     'AphrontKeyboardShortcutsAvailableView' => 'view/widget/AphrontKeyboardShortcutsAvailableView.php',
     'AphrontListFilterView' => 'view/layout/AphrontListFilterView.php',
+    'AphrontListHTTPParameterType' => 'aphront/httpparametertype/AphrontListHTTPParameterType.php',
     'AphrontMalformedRequestException' => 'aphront/exception/AphrontMalformedRequestException.php',
     'AphrontMoreView' => 'view/layout/AphrontMoreView.php',
     'AphrontMultiColumnView' => 'view/layout/AphrontMultiColumnView.php',
@@ -1402,6 +1405,7 @@ phutil_register_library_map(array(
     'NuanceSourceViewController' => 'applications/nuance/controller/NuanceSourceViewController.php',
     'NuanceTransaction' => 'applications/nuance/storage/NuanceTransaction.php',
     'OwnersConduitAPIMethod' => 'applications/owners/conduit/OwnersConduitAPIMethod.php',
+    'OwnersEditConduitAPIMethod' => 'applications/owners/conduit/OwnersEditConduitAPIMethod.php',
     'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php',
     'OwnersQueryConduitAPIMethod' => 'applications/owners/conduit/OwnersQueryConduitAPIMethod.php',
     'PHIDConduitAPIMethod' => 'applications/phid/conduit/PHIDConduitAPIMethod.php',
@@ -1441,6 +1445,7 @@ phutil_register_library_map(array(
     'PHUIDiffTableOfContentsListView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsListView.php',
     'PHUIDiffTwoUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php',
     'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php',
+    'PHUIDocumentSummaryView' => 'view/phui/PHUIDocumentSummaryView.php',
     'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php',
     'PHUIDocumentViewPro' => 'view/phui/PHUIDocumentViewPro.php',
     'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php',
@@ -1843,6 +1848,7 @@ phutil_register_library_map(array(
     'PhabricatorChatLogQuery' => 'applications/chatlog/query/PhabricatorChatLogQuery.php',
     'PhabricatorChunkedFileStorageEngine' => 'applications/files/engine/PhabricatorChunkedFileStorageEngine.php',
     'PhabricatorClusterConfigOptions' => 'applications/config/option/PhabricatorClusterConfigOptions.php',
+    'PhabricatorCommentEditEngineExtension' => 'applications/transactions/editengineextension/PhabricatorCommentEditEngineExtension.php',
     'PhabricatorCommentEditField' => 'applications/transactions/editfield/PhabricatorCommentEditField.php',
     'PhabricatorCommentEditType' => 'applications/transactions/edittype/PhabricatorCommentEditType.php',
     'PhabricatorCommitBranchesField' => 'applications/repository/customfield/PhabricatorCommitBranchesField.php',
@@ -1975,6 +1981,9 @@ phutil_register_library_map(array(
     'PhabricatorCustomFieldAttachment' => 'infrastructure/customfield/field/PhabricatorCustomFieldAttachment.php',
     'PhabricatorCustomFieldConfigOptionType' => 'infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php',
     'PhabricatorCustomFieldDataNotAvailableException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldDataNotAvailableException.php',
+    'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditEngineExtension.php',
+    'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
+    'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
     'PhabricatorCustomFieldHeraldField' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldField.php',
     'PhabricatorCustomFieldHeraldFieldGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldFieldGroup.php',
     'PhabricatorCustomFieldImplementationIncompleteException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldImplementationIncompleteException.php',
@@ -2114,7 +2123,9 @@ phutil_register_library_map(array(
     'PhabricatorEditEngine' => 'applications/transactions/editengine/PhabricatorEditEngine.php',
     'PhabricatorEditEngineAPIMethod' => 'applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php',
     'PhabricatorEditEngineConfiguration' => 'applications/transactions/storage/PhabricatorEditEngineConfiguration.php',
+    'PhabricatorEditEngineConfigurationDefaultCreateController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php',
     'PhabricatorEditEngineConfigurationDefaultsController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultsController.php',
+    'PhabricatorEditEngineConfigurationDisableController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDisableController.php',
     'PhabricatorEditEngineConfigurationEditController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationEditController.php',
     'PhabricatorEditEngineConfigurationEditEngine' => 'applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php',
     'PhabricatorEditEngineConfigurationEditor' => 'applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php',
@@ -2129,6 +2140,8 @@ phutil_register_library_map(array(
     'PhabricatorEditEngineConfigurationTransactionQuery' => 'applications/transactions/query/PhabricatorEditEngineConfigurationTransactionQuery.php',
     'PhabricatorEditEngineConfigurationViewController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php',
     'PhabricatorEditEngineController' => 'applications/transactions/controller/PhabricatorEditEngineController.php',
+    'PhabricatorEditEngineExtension' => 'applications/transactions/editengineextension/PhabricatorEditEngineExtension.php',
+    'PhabricatorEditEngineExtensionModule' => 'applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php',
     'PhabricatorEditEngineListController' => 'applications/transactions/controller/PhabricatorEditEngineListController.php',
     'PhabricatorEditEngineQuery' => 'applications/transactions/query/PhabricatorEditEngineQuery.php',
     'PhabricatorEditEngineSearchEngine' => 'applications/transactions/query/PhabricatorEditEngineSearchEngine.php',
@@ -2557,6 +2570,7 @@ phutil_register_library_map(array(
     'PhabricatorOwnersOwner' => 'applications/owners/storage/PhabricatorOwnersOwner.php',
     'PhabricatorOwnersPackage' => 'applications/owners/storage/PhabricatorOwnersPackage.php',
     'PhabricatorOwnersPackageDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php',
+    'PhabricatorOwnersPackageEditEngine' => 'applications/owners/editor/PhabricatorOwnersPackageEditEngine.php',
     'PhabricatorOwnersPackageFunctionDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageFunctionDatasource.php',
     'PhabricatorOwnersPackageOwnerDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php',
     'PhabricatorOwnersPackagePHIDType' => 'applications/owners/phid/PhabricatorOwnersPackagePHIDType.php',
@@ -2574,6 +2588,7 @@ phutil_register_library_map(array(
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
+    'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDResolver' => 'applications/phid/resolver/PhabricatorPHIDResolver.php',
     'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
     'PhabricatorPHIDTypeTestCase' => 'applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php',
@@ -2590,7 +2605,6 @@ phutil_register_library_map(array(
     'PhabricatorPasswordSettingsPanel' => 'applications/settings/panel/PhabricatorPasswordSettingsPanel.php',
     'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php',
     'PhabricatorPasteApplication' => 'applications/paste/application/PhabricatorPasteApplication.php',
-    'PhabricatorPasteCommentController' => 'applications/paste/controller/PhabricatorPasteCommentController.php',
     'PhabricatorPasteConfigOptions' => 'applications/paste/config/PhabricatorPasteConfigOptions.php',
     'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php',
     'PhabricatorPasteDAO' => 'applications/paste/storage/PhabricatorPasteDAO.php',
@@ -2703,6 +2717,7 @@ phutil_register_library_map(array(
     'PhabricatorPolicyDAO' => 'applications/policy/storage/PhabricatorPolicyDAO.php',
     'PhabricatorPolicyDataTestCase' => 'applications/policy/__tests__/PhabricatorPolicyDataTestCase.php',
     'PhabricatorPolicyEditController' => 'applications/policy/controller/PhabricatorPolicyEditController.php',
+    'PhabricatorPolicyEditEngineExtension' => 'applications/policy/editor/PhabricatorPolicyEditEngineExtension.php',
     'PhabricatorPolicyEditField' => 'applications/transactions/editfield/PhabricatorPolicyEditField.php',
     'PhabricatorPolicyException' => 'applications/policy/exception/PhabricatorPolicyException.php',
     'PhabricatorPolicyExplainController' => 'applications/policy/controller/PhabricatorPolicyExplainController.php',
@@ -2794,6 +2809,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectUserFunctionDatasource' => 'applications/project/typeahead/PhabricatorProjectUserFunctionDatasource.php',
     'PhabricatorProjectViewController' => 'applications/project/controller/PhabricatorProjectViewController.php',
     'PhabricatorProjectWatchController' => 'applications/project/controller/PhabricatorProjectWatchController.php',
+    'PhabricatorProjectsEditEngineExtension' => 'applications/project/editor/PhabricatorProjectsEditEngineExtension.php',
     'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
     'PhabricatorProjectsPolicyRule' => 'applications/project/policyrule/PhabricatorProjectsPolicyRule.php',
     'PhabricatorProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorProtocolAdapter.php',
@@ -3084,6 +3100,7 @@ phutil_register_library_map(array(
     'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSubscribersHeraldAction.php',
     'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php',
     'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
+    'PhabricatorSubscriptionsEditEngineExtension' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditEngineExtension.php',
     'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
     'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php',
     'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
@@ -3209,6 +3226,7 @@ phutil_register_library_map(array(
     'PhabricatorUsersPolicyRule' => 'applications/people/policyrule/PhabricatorUsersPolicyRule.php',
     'PhabricatorUsersSearchField' => 'applications/people/searchfield/PhabricatorUsersSearchField.php',
     'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php',
+    'PhabricatorVersionedDraft' => 'applications/draft/storage/PhabricatorVersionedDraft.php',
     'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
     'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
@@ -3285,6 +3303,8 @@ phutil_register_library_map(array(
     'PhameBlogFeedController' => 'applications/phame/controller/blog/PhameBlogFeedController.php',
     'PhameBlogListController' => 'applications/phame/controller/blog/PhameBlogListController.php',
     'PhameBlogLiveController' => 'applications/phame/controller/blog/PhameBlogLiveController.php',
+    'PhameBlogManageController' => 'applications/phame/controller/blog/PhameBlogManageController.php',
+    'PhameBlogProfilePictureController' => 'applications/phame/controller/blog/PhameBlogProfilePictureController.php',
     'PhameBlogQuery' => 'applications/phame/query/PhameBlogQuery.php',
     'PhameBlogReplyHandler' => 'applications/phame/mail/PhameBlogReplyHandler.php',
     'PhameBlogSearchEngine' => 'applications/phame/query/PhameBlogSearchEngine.php',
@@ -3299,16 +3319,21 @@ phutil_register_library_map(array(
     'PhameController' => 'applications/phame/controller/PhameController.php',
     'PhameCreatePostConduitAPIMethod' => 'applications/phame/conduit/PhameCreatePostConduitAPIMethod.php',
     'PhameDAO' => 'applications/phame/storage/PhameDAO.php',
+    'PhameDescriptionView' => 'applications/phame/view/PhameDescriptionView.php',
+    'PhameHomeController' => 'applications/phame/controller/PhameHomeController.php',
     'PhamePost' => 'applications/phame/storage/PhamePost.php',
     'PhamePostCommentController' => 'applications/phame/controller/post/PhamePostCommentController.php',
     'PhamePostController' => 'applications/phame/controller/post/PhamePostController.php',
     'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
     'PhamePostEditor' => 'applications/phame/editor/PhamePostEditor.php',
     'PhamePostFramedController' => 'applications/phame/controller/post/PhamePostFramedController.php',
+    'PhamePostHistoryController' => 'applications/phame/controller/post/PhamePostHistoryController.php',
     'PhamePostListController' => 'applications/phame/controller/post/PhamePostListController.php',
+    'PhamePostListView' => 'applications/phame/view/PhamePostListView.php',
     'PhamePostMailReceiver' => 'applications/phame/mail/PhamePostMailReceiver.php',
     'PhamePostNewController' => 'applications/phame/controller/post/PhamePostNewController.php',
     'PhamePostNotLiveController' => 'applications/phame/controller/post/PhamePostNotLiveController.php',
+    'PhamePostPreviewController' => 'applications/phame/controller/post/PhamePostPreviewController.php',
     'PhamePostPublishController' => 'applications/phame/controller/post/PhamePostPublishController.php',
     'PhamePostQuery' => 'applications/phame/query/PhamePostQuery.php',
     'PhamePostReplyHandler' => 'applications/phame/mail/PhamePostReplyHandler.php',
@@ -3887,6 +3912,7 @@ phutil_register_library_map(array(
     'AphrontAjaxResponse' => 'AphrontResponse',
     'AphrontApplicationConfiguration' => 'Phobject',
     'AphrontBarView' => 'AphrontView',
+    'AphrontBoolHTTPParameterType' => 'AphrontHTTPParameterType',
     'AphrontCSRFException' => 'AphrontException',
     'AphrontCalendarEventView' => 'AphrontView',
     'AphrontController' => 'Phobject',
@@ -3926,24 +3952,26 @@ phutil_register_library_map(array(
     'AphrontHTTPProxyResponse' => 'AphrontResponse',
     'AphrontHTTPSink' => 'Phobject',
     'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase',
+    'AphrontIntHTTPParameterType' => 'AphrontHTTPParameterType',
     'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
     'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
     'AphrontJSONResponse' => 'AphrontResponse',
     'AphrontJavelinView' => 'AphrontView',
     'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
     'AphrontListFilterView' => 'AphrontView',
+    'AphrontListHTTPParameterType' => 'AphrontHTTPParameterType',
     'AphrontMalformedRequestException' => 'AphrontException',
     'AphrontMoreView' => 'AphrontView',
     'AphrontMultiColumnView' => 'AphrontView',
     'AphrontMySQLDatabaseConnectionTestCase' => 'PhabricatorTestCase',
     'AphrontNullView' => 'AphrontView',
     'AphrontPHIDHTTPParameterType' => 'AphrontHTTPParameterType',
-    'AphrontPHIDListHTTPParameterType' => 'AphrontHTTPParameterType',
+    'AphrontPHIDListHTTPParameterType' => 'AphrontListHTTPParameterType',
     'AphrontPHPHTTPSink' => 'AphrontHTTPSink',
     'AphrontPageView' => 'AphrontView',
     'AphrontPlainTextResponse' => 'AphrontResponse',
     'AphrontProgressBarView' => 'AphrontBarView',
-    'AphrontProjectListHTTPParameterType' => 'AphrontHTTPParameterType',
+    'AphrontProjectListHTTPParameterType' => 'AphrontListHTTPParameterType',
     'AphrontProxyResponse' => array(
       'AphrontResponse',
       'AphrontResponseProducerInterface',
@@ -3963,13 +3991,13 @@ phutil_register_library_map(array(
     'AphrontStackTraceView' => 'AphrontView',
     'AphrontStandaloneHTMLResponse' => 'AphrontHTMLResponse',
     'AphrontStringHTTPParameterType' => 'AphrontHTTPParameterType',
-    'AphrontStringListHTTPParameterType' => 'AphrontHTTPParameterType',
+    'AphrontStringListHTTPParameterType' => 'AphrontListHTTPParameterType',
     'AphrontTableView' => 'AphrontView',
     'AphrontTagView' => 'AphrontView',
     'AphrontTokenizerTemplateView' => 'AphrontView',
     'AphrontTypeaheadTemplateView' => 'AphrontView',
     'AphrontUnhandledExceptionResponse' => 'AphrontStandaloneHTMLResponse',
-    'AphrontUserListHTTPParameterType' => 'AphrontHTTPParameterType',
+    'AphrontUserListHTTPParameterType' => 'AphrontListHTTPParameterType',
     'AphrontView' => array(
       'Phobject',
       'PhutilSafeHTMLProducerInterface',
@@ -5382,6 +5410,7 @@ phutil_register_library_map(array(
     'NuanceSourceViewController' => 'NuanceController',
     'NuanceTransaction' => 'PhabricatorApplicationTransaction',
     'OwnersConduitAPIMethod' => 'ConduitAPIMethod',
+    'OwnersEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
     'OwnersQueryConduitAPIMethod' => 'OwnersConduitAPIMethod',
     'PHIDConduitAPIMethod' => 'ConduitAPIMethod',
@@ -5421,6 +5450,7 @@ phutil_register_library_map(array(
     'PHUIDiffTableOfContentsListView' => 'AphrontView',
     'PHUIDiffTwoUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
     'PHUIDocumentExample' => 'PhabricatorUIExample',
+    'PHUIDocumentSummaryView' => 'AphrontTagView',
     'PHUIDocumentView' => 'AphrontTagView',
     'PHUIDocumentViewPro' => 'AphrontTagView',
     'PHUIFeedStoryExample' => 'PhabricatorUIExample',
@@ -5890,6 +5920,7 @@ phutil_register_library_map(array(
     'PhabricatorChatLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorChunkedFileStorageEngine' => 'PhabricatorFileStorageEngine',
     'PhabricatorClusterConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorCommentEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorCommentEditField' => 'PhabricatorEditField',
     'PhabricatorCommentEditType' => 'PhabricatorEditType',
     'PhabricatorCommitBranchesField' => 'PhabricatorCommitCustomField',
@@ -6044,6 +6075,9 @@ phutil_register_library_map(array(
     'PhabricatorCustomFieldAttachment' => 'Phobject',
     'PhabricatorCustomFieldConfigOptionType' => 'PhabricatorConfigOptionType',
     'PhabricatorCustomFieldDataNotAvailableException' => 'Exception',
+    'PhabricatorCustomFieldEditEngineExtension' => 'PhabricatorEditEngineExtension',
+    'PhabricatorCustomFieldEditField' => 'PhabricatorEditField',
+    'PhabricatorCustomFieldEditType' => 'PhabricatorEditType',
     'PhabricatorCustomFieldHeraldField' => 'HeraldField',
     'PhabricatorCustomFieldHeraldFieldGroup' => 'HeraldFieldGroup',
     'PhabricatorCustomFieldImplementationIncompleteException' => 'Exception',
@@ -6209,7 +6243,9 @@ phutil_register_library_map(array(
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorPolicyInterface',
     ),
+    'PhabricatorEditEngineConfigurationDefaultCreateController' => 'PhabricatorEditEngineController',
     'PhabricatorEditEngineConfigurationDefaultsController' => 'PhabricatorEditEngineController',
+    'PhabricatorEditEngineConfigurationDisableController' => 'PhabricatorEditEngineController',
     'PhabricatorEditEngineConfigurationEditController' => 'PhabricatorEditEngineController',
     'PhabricatorEditEngineConfigurationEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorEditEngineConfigurationEditor' => 'PhabricatorApplicationTransactionEditor',
@@ -6224,6 +6260,8 @@ phutil_register_library_map(array(
     'PhabricatorEditEngineConfigurationTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorEditEngineConfigurationViewController' => 'PhabricatorEditEngineController',
     'PhabricatorEditEngineController' => 'PhabricatorApplicationTransactionController',
+    'PhabricatorEditEngineExtension' => 'Phobject',
+    'PhabricatorEditEngineExtensionModule' => 'PhabricatorConfigModule',
     'PhabricatorEditEngineListController' => 'PhabricatorEditEngineController',
     'PhabricatorEditEngineQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorEditEngineSearchEngine' => 'PhabricatorApplicationSearchEngine',
@@ -6719,6 +6757,7 @@ phutil_register_library_map(array(
       'PhabricatorCustomFieldInterface',
     ),
     'PhabricatorOwnersPackageDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorOwnersPackageEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorOwnersPackageFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorOwnersPackageOwnerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorOwnersPackagePHIDType' => 'PhabricatorPHIDType',
@@ -6735,6 +6774,7 @@ phutil_register_library_map(array(
     'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPHID' => 'Phobject',
     'PhabricatorPHIDConstants' => 'Phobject',
+    'PhabricatorPHIDListEditField' => 'PhabricatorEditField',
     'PhabricatorPHIDResolver' => 'Phobject',
     'PhabricatorPHIDType' => 'Phobject',
     'PhabricatorPHIDTypeTestCase' => 'PhutilTestCase',
@@ -6762,7 +6802,6 @@ phutil_register_library_map(array(
       'PhabricatorSpacesInterface',
     ),
     'PhabricatorPasteApplication' => 'PhabricatorApplication',
-    'PhabricatorPasteCommentController' => 'PhabricatorPasteController',
     'PhabricatorPasteConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPasteController' => 'PhabricatorController',
     'PhabricatorPasteDAO' => 'PhabricatorLiskDAO',
@@ -6890,6 +6929,7 @@ phutil_register_library_map(array(
     'PhabricatorPolicyDAO' => 'PhabricatorLiskDAO',
     'PhabricatorPolicyDataTestCase' => 'PhabricatorTestCase',
     'PhabricatorPolicyEditController' => 'PhabricatorPolicyController',
+    'PhabricatorPolicyEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorPolicyEditField' => 'PhabricatorEditField',
     'PhabricatorPolicyException' => 'Exception',
     'PhabricatorPolicyExplainController' => 'PhabricatorPolicyController',
@@ -7006,6 +7046,7 @@ phutil_register_library_map(array(
     'PhabricatorProjectUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorProjectViewController' => 'PhabricatorProjectController',
     'PhabricatorProjectWatchController' => 'PhabricatorProjectController',
+    'PhabricatorProjectsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorProtocolAdapter' => 'Phobject',
@@ -7352,6 +7393,7 @@ phutil_register_library_map(array(
     'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication',
     'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
+    'PhabricatorSubscriptionsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
     'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction',
     'PhabricatorSubscriptionsListController' => 'PhabricatorController',
@@ -7417,7 +7459,7 @@ phutil_register_library_map(array(
     'PhabricatorTokenReceiverQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorTokenTokenPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener',
-    'PhabricatorTokenizerEditField' => 'PhabricatorEditField',
+    'PhabricatorTokenizerEditField' => 'PhabricatorPHIDListEditField',
     'PhabricatorTokensApplication' => 'PhabricatorApplication',
     'PhabricatorTokensSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorTooltipUIExample' => 'PhabricatorUIExample',
@@ -7497,6 +7539,7 @@ phutil_register_library_map(array(
     'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorUsersSearchField' => 'PhabricatorSearchTokenizerField',
     'PhabricatorVCSResponse' => 'AphrontResponse',
+    'PhabricatorVersionedDraft' => 'PhabricatorDraftDAO',
     'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
@@ -7581,6 +7624,7 @@ phutil_register_library_map(array(
       'PhabricatorSubscribableInterface',
       'PhabricatorFlaggableInterface',
       'PhabricatorProjectInterface',
+      'PhabricatorDestructibleInterface',
       'PhabricatorApplicationTransactionInterface',
     ),
     'PhameBlogArchiveController' => 'PhameBlogController',
@@ -7591,6 +7635,8 @@ phutil_register_library_map(array(
     'PhameBlogFeedController' => 'PhameBlogController',
     'PhameBlogListController' => 'PhameBlogController',
     'PhameBlogLiveController' => 'PhameBlogController',
+    'PhameBlogManageController' => 'PhameBlogController',
+    'PhameBlogProfilePictureController' => 'PhameBlogController',
     'PhameBlogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhameBlogReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'PhameBlogSearchEngine' => 'PhabricatorApplicationSearchEngine',
@@ -7605,6 +7651,8 @@ phutil_register_library_map(array(
     'PhameController' => 'PhabricatorController',
     'PhameCreatePostConduitAPIMethod' => 'PhameConduitAPIMethod',
     'PhameDAO' => 'PhabricatorLiskDAO',
+    'PhameDescriptionView' => 'AphrontTagView',
+    'PhameHomeController' => 'PhamePostController',
     'PhamePost' => array(
       'PhameDAO',
       'PhabricatorPolicyInterface',
@@ -7613,6 +7661,7 @@ phutil_register_library_map(array(
       'PhabricatorProjectInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorSubscribableInterface',
+      'PhabricatorDestructibleInterface',
       'PhabricatorTokenReceiverInterface',
     ),
     'PhamePostCommentController' => 'PhamePostController',
@@ -7620,10 +7669,13 @@ phutil_register_library_map(array(
     'PhamePostEditController' => 'PhamePostController',
     'PhamePostEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhamePostFramedController' => 'PhamePostController',
+    'PhamePostHistoryController' => 'PhamePostController',
     'PhamePostListController' => 'PhamePostController',
+    'PhamePostListView' => 'AphrontTagView',
     'PhamePostMailReceiver' => 'PhabricatorObjectMailReceiver',
     'PhamePostNewController' => 'PhamePostController',
     'PhamePostNotLiveController' => 'PhamePostController',
+    'PhamePostPreviewController' => 'PhamePostController',
     'PhamePostPublishController' => 'PhamePostController',
     'PhamePostQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhamePostReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',

src/aphront/httpparametertype/AphrontBoolHTTPParameterType.php

@@ -0,0 +1,29 @@
+<?php
+
+final class AphrontBoolHTTPParameterType
+  extends AphrontHTTPParameterType {
+
+  protected function getParameterValue(AphrontRequest $request, $key) {
+    return $request->getBool($key);
+  }
+
+  protected function getParameterTypeName() {
+    return 'bool';
+  }
+
+  protected function getParameterFormatDescriptions() {
+    return array(
+      pht('A boolean value (true or false).'),
+    );
+  }
+
+  protected function getParameterExamples() {
+    return array(
+      'v=true',
+      'v=false',
+      'v=1',
+      'v=0',
+    );
+  }
+
+}

src/aphront/httpparametertype/AphrontIntHTTPParameterType.php

@@ -0,0 +1,26 @@
+<?php
+
+final class AphrontIntHTTPParameterType
+  extends AphrontHTTPParameterType {
+
+  protected function getParameterValue(AphrontRequest $request, $key) {
+    return $request->getInt($key);
+  }
+
+  protected function getParameterTypeName() {
+    return 'int';
+  }
+
+  protected function getParameterFormatDescriptions() {
+    return array(
+      pht('An integer.'),
+    );
+  }
+
+  protected function getParameterExamples() {
+    return array(
+      'v=123',
+    );
+  }
+
+}

src/aphront/httpparametertype/AphrontListHTTPParameterType.php

@@ -0,0 +1,10 @@
+<?php
+
+abstract class AphrontListHTTPParameterType
+  extends AphrontHTTPParameterType {
+
+  protected function getParameterDefault() {
+    return array();
+  }
+
+}

src/aphront/httpparametertype/AphrontPHIDListHTTPParameterType.php

@@ -1,7 +1,7 @@
 <?php
 
 final class AphrontPHIDListHTTPParameterType
-  extends AphrontHTTPParameterType {
+  extends AphrontListHTTPParameterType {
 
   protected function getParameterValue(AphrontRequest $request, $key) {
     $type = new AphrontStringListHTTPParameterType();

src/aphront/httpparametertype/AphrontProjectListHTTPParameterType.php

@@ -1,7 +1,7 @@
 <?php
 
 final class AphrontProjectListHTTPParameterType
-  extends AphrontHTTPParameterType {
+  extends AphrontListHTTPParameterType {
 
   protected function getParameterValue(AphrontRequest $request, $key) {
     $type = new AphrontStringListHTTPParameterType();

src/aphront/httpparametertype/AphrontStringListHTTPParameterType.php

@@ -1,7 +1,7 @@
 <?php
 
 final class AphrontStringListHTTPParameterType
-  extends AphrontHTTPParameterType {
+  extends AphrontListHTTPParameterType {
 
   protected function getParameterValue(AphrontRequest $request, $key) {
     $list = $request->getArr($key, null);

src/aphront/httpparametertype/AphrontUserListHTTPParameterType.php

@@ -1,7 +1,7 @@
 <?php
 
 final class AphrontUserListHTTPParameterType
-  extends AphrontHTTPParameterType {
+  extends AphrontListHTTPParameterType {
 
   protected function getParameterValue(AphrontRequest $request, $key) {
     $type = new AphrontStringListHTTPParameterType();

src/applications/almanac/controller/AlmanacBindingEditController.php

@@ -110,14 +110,14 @@ final class AlmanacBindingEditController
       $crumbs->addTextCrumb(pht('Edit Binding'));
     }
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
+
   }
 
 }

src/applications/almanac/controller/AlmanacBindingViewController.php

@@ -55,15 +55,14 @@ final class AlmanacBindingViewController
       new AlmanacBindingTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-        $this->buildAlmanacPropertiesTable($binding),
+        array(
-        $timeline,
+          $box,
-      ),
+          $this->buildAlmanacPropertiesTable($binding),
-      array(
+          $timeline,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacConsoleController.php

@@ -40,14 +40,14 @@ final class AlmanacConsoleController extends AlmanacController {
       ->setHeaderText(pht('Console'))
       ->setObjectList($menu);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle(pht('Almanac Console'))
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title'  => pht('Almanac Console'),
       ));
+
   }
 
 }

src/applications/almanac/controller/AlmanacDeviceEditController.php

@@ -151,13 +151,12 @@ final class AlmanacDeviceEditController
       $crumbs->addTextCrumb(pht('Edit'));
     }
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacDeviceViewController.php

@@ -57,18 +57,17 @@ final class AlmanacDeviceViewController
       new AlmanacDeviceTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-        $interfaces,
+        array(
-        $this->buildAlmanacPropertiesTable($device),
+          $box,
-        $this->buildSSHKeysTable($device),
+          $interfaces,
-        $this->buildServicesTable($device),
+          $this->buildAlmanacPropertiesTable($device),
-        $timeline,
+          $this->buildSSHKeysTable($device),
-      ),
+          $this->buildServicesTable($device),
-      array(
+          $timeline,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacInterfaceEditController.php

@@ -142,13 +142,12 @@ final class AlmanacInterfaceEditController
       $crumbs->addTextCrumb(pht('Edit Interface'));
     }
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacNetworkEditController.php

@@ -130,13 +130,12 @@ final class AlmanacNetworkEditController
       $crumbs->addTextCrumb(pht('Edit'));
     }
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacNetworkViewController.php

@@ -42,14 +42,13 @@ final class AlmanacNetworkViewController
       new AlmanacNetworkTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-        $timeline,
+        array(
-      ),
+          $box,
-      array(
+          $timeline,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacServiceEditController.php

@@ -168,13 +168,12 @@ final class AlmanacServiceEditController
       $crumbs->addTextCrumb(pht('Edit'));
     }
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
   }
 

src/applications/almanac/controller/AlmanacServiceViewController.php

@@ -56,17 +56,16 @@ final class AlmanacServiceViewController
       new AlmanacServiceTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-        $bindings,
+        array(
-        $this->buildAlmanacPropertiesTable($service),
+          $box,
-        $timeline,
+          $bindings,
-      ),
+          $this->buildAlmanacPropertiesTable($service),
-      array(
+          $timeline,
-        'title' => $title,
+    ));
-      ));
   }
 
   private function buildPropertyList(AlmanacService $service) {

src/applications/audit/application/PhabricatorAuditApplication.php

@@ -47,6 +47,7 @@ final class PhabricatorAuditApplication extends PhabricatorApplication {
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
+    $limit = self::MAX_STATUS_ITEMS;
 
     $phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);
 
@@ -54,14 +55,16 @@ final class PhabricatorAuditApplication extends PhabricatorApplication {
       ->setViewer($user)
       ->withAuthorPHIDs(array($user->getPHID()))
       ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_CONCERN)
-      ->setLimit(self::MAX_STATUS_ITEMS);
+      ->setLimit($limit);
     $commits = $query->execute();
 
     $count = count($commits);
-    $count_str = self::formatStatusCount(
+    if ($count >= $limit) {
-      $count,
+      $count_str = pht('%s+ Problem Commit(s)', new PhutilNumber($limit - 1));
-      '%s Problem Commits',
+    } else {
-      '%d Problem Commit(s)');
+      $count_str = pht('%s Problem Commit(s)', new PhutilNumber($count));
+    }
+
     $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
@@ -72,14 +75,16 @@ final class PhabricatorAuditApplication extends PhabricatorApplication {
       ->setViewer($user)
       ->withNeedsAuditByPHIDs($phids)
       ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_OPEN)
-      ->setLimit(self::MAX_STATUS_ITEMS);
+      ->setLimit($limit);
     $commits = $query->execute();
 
     $count = count($commits);
-    $count_str = self::formatStatusCount(
+    if ($count >= $limit) {
-      $count,
+      $count_str = pht('%s+ Problem Commit(s)', new PhutilNumber($limit - 1));
-      '%s Commits Awaiting Audit',
+    } else {
-      '%d Commit(s) Awaiting Audit');
+      $count_str = pht('%s Problem Commit(s)', new PhutilNumber($count));
+    }
+
     $type = PhabricatorApplicationStatusView::TYPE_WARNING;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)

src/applications/auth/provider/PhabricatorJIRAAuthProvider.php

@@ -171,7 +171,7 @@ final class PhabricatorJIRAAuthProvider extends PhabricatorOAuth1AuthProvider {
           "The PHP 'openssl' extension is not installed. You must install ".
           "this extension in order to add a JIRA authentication provider, ".
           "because JIRA OAuth requests use the RSA-SHA1 signing algorithm. ".
-          "Install the 'openssl' extension, restart your webserver, and try ".
+          "Install the 'openssl' extension, restart Phabricator, and try ".
           "again."));
     }
 

src/applications/badges/controller/PhabricatorBadgesController.php

@@ -1,3 +1,10 @@
 <?php
 
-abstract class PhabricatorBadgesController extends PhabricatorController {}
+abstract class PhabricatorBadgesController extends PhabricatorController {
+
+  public function buildApplicationMenu() {
+    return $this->newApplicationMenu()
+      ->setSearchEngine(new PhabricatorBadgesSearchEngine());
+  }
+
+}

src/applications/badges/controller/PhabricatorBadgesEditController.php

@@ -199,13 +199,12 @@ final class PhabricatorBadgesEditController
       ->setHeaderText($title)
       ->appendChild($form);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $box,
-        'title' => $title,
       ));
   }
 

src/applications/badges/controller/PhabricatorBadgesEditRecipientsController.php

@@ -106,14 +106,13 @@ final class PhabricatorBadgesEditRecipientsController
     $crumbs->addTextCrumb($badge->getName(), $badge_url);
     $crumbs->addTextCrumb(pht('Recipients'));
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $form_box,
+      ->appendChild(
-        $recipient_list,
+        array(
-      ),
+          $form_box,
-      array(
+          $recipient_list,
-        'title' => $title,
       ));
   }
 

src/applications/badges/controller/PhabricatorBadgesListController.php

@@ -8,28 +8,9 @@ final class PhabricatorBadgesListController
   }
 
   public function handleRequest(AphrontRequest $request) {
-    $query_key = $request->getURIData('queryKey');
+    return id(new PhabricatorBadgesSearchEngine())
-    $controller = id(new PhabricatorApplicationSearchController())
+      ->setController($this)
-      ->setQueryKey($query_key)
+      ->buildResponse();
-      ->setSearchEngine(new PhabricatorBadgesSearchEngine())
-      ->setNavigation($this->buildSideNavView());
-
-    return $this->delegateToController($controller);
-  }
-
-  public function buildSideNavView() {
-    $user = $this->getRequest()->getUser();
-
-    $nav = new AphrontSideNavFilterView();
-    $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
-
-    id(new PhabricatorBadgesSearchEngine())
-      ->setViewer($user)
-      ->addNavigationItems($nav->getMenu());
-
-    $nav->selectFilter(null);
-
-    return $nav;
   }
 
   protected function buildApplicationCrumbs() {

src/applications/badges/controller/PhabricatorBadgesViewController.php

@@ -64,17 +64,16 @@ final class PhabricatorBadgesViewController
 
     $add_comment = $this->buildCommentForm($badge);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $box,
+      ->setPageObjectPHIDs(array($badge->getPHID()))
-        $recipient_list,
+      ->appendChild(
-        $timeline,
+        array(
-        $add_comment,
+          $box,
-      ),
+          $recipient_list,
-      array(
+          $timeline,
-        'title' => $title,
+          $add_comment,
-        'pageObjects' => array($badge->getPHID()),
       ));
   }
 

src/applications/base/PhabricatorApplication.php

@@ -288,22 +288,6 @@ abstract class PhabricatorApplication
     return array();
   }
 
-  /**
-   * @return string
-   * @task ui
-   */
-  final public static function formatStatusCount(
-    $count,
-    $limit_string = '%s',
-    $base_string = '%d') {
-    if ($count == self::MAX_STATUS_ITEMS) {
-      $count_str = pht($limit_string, ($count - 1).'+');
-    } else {
-      $count_str = pht($base_string, $count);
-    }
-    return $count_str;
-  }
-
 
   /**
    * You can provide an optional piece of flavor text for the application. This
@@ -640,7 +624,7 @@ abstract class PhabricatorApplication
       '(?P<id>[0-9]\d*)/)?'.
       '(?:'.
         '(?:'.
-          '(?P<editAction>parameters)'.
+          '(?P<editAction>parameters|nodefault|comment)'.
           '|'.
           '(?:form/(?P<formKey>[^/]+))'.
         ')'.

src/applications/base/controller/PhabricatorController.php

@@ -463,9 +463,6 @@ abstract class PhabricatorController extends AphrontController {
       $page->setUser($viewer);
     }
 
-    // TODO: Remove after removing callsites to addExtraQuicksandConfig().
-    $page->addQuicksandConfig($this->extraQuicksandConfig);
-
     return $page;
   }
 
@@ -533,22 +530,6 @@ abstract class PhabricatorController extends AphrontController {
 /* -(  Deprecated  )--------------------------------------------------------- */
 
 
-  /**
-   * DEPRECATED.
-   */
-  private $extraQuicksandConfig = array();
-
-
-  /**
-   * DEPRECATED. Use @{method:newPage} and call addQuicksandConfig().
-   */
-  public function addExtraQuicksandConfig($config) {
-    // TODO: When this method is removed,
-    $this->extraQuicksandConfig += $config;
-    return $this;
-  }
-
-
   /**
    * DEPRECATED. Use @{method:newPage}.
    */

src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php

@@ -87,7 +87,7 @@ final class PhabricatorOpcodeCacheSpec extends PhabricatorCacheSpec {
           'The "%s" setting is currently disabled in your PHP configuration, '.
           'but Phabricator is running in development mode. This option should '.
           'normally be enabled in development so you do not need to restart '.
-          'your webserver after making changes to the code.',
+          'anything after making changes to the code.',
           'apc.stat');
 
         $this
@@ -135,8 +135,8 @@ final class PhabricatorOpcodeCacheSpec extends PhabricatorCacheSpec {
 
         $message = pht(
           'In development, OPcache should be configured to always reload '.
-          'code so the webserver does not need to be restarted after making '.
+          'code so nothing needs to be restarted after making changes. To do '.
-          'changes. To do this, enable "%s" and set "%s" to 0.',
+          'this, enable "%s" and set "%s" to 0.',
           'opcache.validate_timestamps',
           'opcache.revalidate_freq');
 

src/applications/calendar/util/CalendarTimeUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This class is useful for generating various time objects, relative to the
  * user and their timezone.

src/applications/config/check/PhabricatorBinariesSetupCheck.php

@@ -96,10 +96,11 @@ final class PhabricatorBinariesSetupCheck extends PhabricatorSetupCheck {
           'You have at least one repository configured which uses this '.
           'version control system. It will not work without the VCS binary.');
         $this->raiseWarning($binary, $message);
+        continue;
       }
 
       $version = null;
-      switch ($binary) {
+      switch ($vcs['versionControlSystem']) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
           $minimum_version = null;
           $bad_versions = array();

src/applications/config/module/PhabricatorConfigVersionsModule.php

@@ -14,13 +14,11 @@ final class PhabricatorConfigVersionsModule
   public function renderModuleStatus(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
-
+    $versions = $this->loadVersions($viewer);
-    $versions = $this->loadVersions();
 
     $version_property_list = id(new PHUIPropertyListView());
-    foreach ($versions as $version) {
+    foreach ($versions as $name => $version) {
-      list($name, $hash) = $version;
+      $version_property_list->addProperty($name, $version);
-      $version_property_list->addProperty($name, $hash);
     }
 
     $object_box = id(new PHUIObjectBoxView())
@@ -39,26 +37,23 @@ final class PhabricatorConfigVersionsModule
     return $object_box;
   }
 
-  private function loadVersions() {
+  private function loadVersions(PhabricatorUser $viewer) {
     $specs = array(
-      array(
+      'phabricator',
-        'name' => pht('Phabricator Version'),
+      'arcanist',
-        'root' => 'phabricator',
+      'phutil',
-      ),
-      array(
-        'name' => pht('Arcanist Version'),
-        'root' => 'arcanist',
-      ),
-      array(
-        'name' => pht('libphutil Version'),
-        'root' => 'phutil',
-      ),
     );
 
+    $all_libraries = PhutilBootloader::getInstance()->getAllLibraries();
+    $other_libraries = array_diff($all_libraries, ipull($specs, 'lib'));
+    $specs = $specs + $other_libraries;
+
+
     $futures = array();
-    foreach ($specs as $key => $spec) {
+    foreach ($specs as $lib) {
-      $root = dirname(phutil_get_library_root($spec['root']));
+      $root = dirname(phutil_get_library_root($lib));
-      $futures[$key] = id(new ExecFuture('git log --format=%%H -n 1 --'))
+      $futures[$lib] =
+        id(new ExecFuture('git log --format=%s -n 1 --', '%H %ct'))
         ->setCWD($root);
     }
 
@@ -66,14 +61,15 @@ final class PhabricatorConfigVersionsModule
     foreach ($futures as $key => $future) {
       list($err, $stdout) = $future->resolve();
       if (!$err) {
-        $name = trim($stdout);
+        list($hash, $epoch) = explode(' ', $stdout);
+        $version = pht('%s (%s)', $hash, phabricator_date($epoch, $viewer));
       } else {
-        $name = pht('Unknown');
+        $version = pht('Unknown');
       }
-      $results[$key] = array($specs[$key]['name'], $name);
+      $results[$key] = $version;
     }
 
-    return array_select_keys($results, array_keys($specs));
+    return $results;
   }
 
 }

src/applications/config/option/PhabricatorUIConfigOptions.php

@@ -85,7 +85,7 @@ EOJSON;
               'is true and otherwise view policy user; mismatches in these '.
               'policy settings will result in a broken logo for some users.'.
               "\n\n".
-              'You should restart your webserver after updating this value '.
+              'You should restart Phabricator after updating this value '.
               'to see this change take effect.'.
               "\n\n".
               'As this feature is experimental, please read [[ %s | T4214 ]] '.

src/applications/config/view/PhabricatorSetupIssueView.php

@@ -87,9 +87,10 @@ final class PhabricatorSetupIssueView extends AphrontView {
         "OS X, you might want to try Homebrew.");
 
       $restart_info = pht(
-        'After installing new PHP extensions, <strong>restart your webserver '.
+        'After installing new PHP extensions, <strong>restart Phabricator '.
-        'for the changes to take effect</strong>.',
+        'for the changes to take effect</strong>. For help with restarting '.
-        hsprintf(''));
+        'Phabricator, see %s in the documentation.',
+        $this->renderRestartLink());
 
       $description[] = phutil_tag(
         'div',
@@ -412,9 +413,10 @@ final class PhabricatorSetupIssueView extends AphrontView {
       'p',
       array(),
       pht(
-        'After editing the PHP configuration, <strong>restart your '.
+        'After editing the PHP configuration, <strong>restart Phabricator for '.
-        'webserver for the changes to take effect</strong>.',
+        'the changes to take effect</strong>. For help with restarting '.
-        hsprintf('')));
+        'Phabricator, see %s in the documentation.',
+        $this->renderRestartLink()));
 
     return phutil_tag(
       'div',
@@ -547,4 +549,15 @@ final class PhabricatorSetupIssueView extends AphrontView {
       ));
   }
 
+  private function renderRestartLink() {
+    $doc_href = PhabricatorEnv::getDoclink('Restarting Phabricator');
+    return phutil_tag(
+      'a',
+      array(
+        'href' => $doc_href,
+        'target' => '_blank',
+      ),
+      pht('Restarting Phabricator'));
+  }
+
 }

src/applications/countdown/controller/PhabricatorCountdownController.php

@@ -2,27 +2,9 @@
 
 abstract class PhabricatorCountdownController extends PhabricatorController {
 
-  public function buildSideNavView($for_app = false) {
-    $user = $this->getRequest()->getUser();
-
-    $nav = new AphrontSideNavFilterView();
-    $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
-
-    if ($for_app) {
-      $nav->addFilter('create', pht('Create Countdown'));
-    }
-
-    id(new PhabricatorCountdownSearchEngine())
-      ->setViewer($user)
-      ->addNavigationItems($nav->getMenu());
-
-    $nav->selectFilter(null);
-
-    return $nav;
-  }
-
   public function buildApplicationMenu() {
-    return $this->buildSideNavView($for_app = true)->getMenu();
+    return $this->newApplicationMenu()
+      ->setSearchEngine(new PhabricatorCountdownSearchEngine());
   }
 
   protected function buildApplicationCrumbs() {

src/applications/countdown/controller/PhabricatorCountdownEditController.php

@@ -184,14 +184,13 @@ final class PhabricatorCountdownEditController
       ->setFormErrors($errors)
       ->setForm($form);
 
-    return $this->buildApplicationPage(
+    return $this->newPage()
-      array(
+      ->setTitle($page_title)
-        $crumbs,
+      ->setCrumbs($crumbs)
-        $form_box,
+      ->appendChild(
-      ),
+        array(
-      array(
+          $form_box,
-        'title' => $page_title,
+        ));
-      ));
   }
 
 }

src/applications/countdown/controller/PhabricatorCountdownListController.php

@@ -8,15 +8,9 @@ final class PhabricatorCountdownListController
   }
 
   public function handleRequest(AphrontRequest $request) {
-    $querykey = $request->getURIData('queryKey');
+    return id(new PhabricatorCountdownSearchEngine())
-
+      ->setController($this)
-    $controller = id(new PhabricatorApplicationSearchController())
+      ->buildResponse();
-      ->setQueryKey($querykey)
-      ->setSearchEngine(new PhabricatorCountdownSearchEngine())
-      ->setNavigation($this->buildSideNavView());
-
-    return $this->delegateToController($controller);
   }
 
-
 }

src/applications/countdown/controller/PhabricatorCountdownViewController.php

@@ -61,20 +61,22 @@ final class PhabricatorCountdownViewController
 
     $add_comment = $this->buildCommentForm($countdown);
 
-    $content = array(
-      $crumbs,
-      $object_box,
-      $countdown_view,
-      $timeline,
-      $add_comment,
-    );
 
-    return $this->buildApplicationPage(
+
-      $content,
+    return $this->newPage()
-      array(
+      ->setTitle($title)
-        'title' => $title,
+      ->setCrumbs($crumbs)
-        'pageObjects' => array($countdown->getPHID()),
+      ->setPageObjectPHIDs(
-      ));
+        array(
+          $countdown->getPHID(),
+        ))
+      ->appendChild(
+        array(
+          $object_box,
+          $countdown_view,
+          $timeline,
+          $add_comment,
+        ));
   }
 
   private function buildActionListView(PhabricatorCountdown $countdown) {

src/applications/differential/application/PhabricatorDifferentialApplication.php

@@ -104,21 +104,23 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
   }
 
   public function loadStatus(PhabricatorUser $user) {
+    $limit = self::MAX_STATUS_ITEMS;
+
     $revisions = id(new DifferentialRevisionQuery())
       ->setViewer($user)
       ->withResponsibleUsers(array($user->getPHID()))
       ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
       ->needRelationships(true)
-      ->setLimit(self::MAX_STATUS_ITEMS)
+      ->setLimit($limit)
       ->execute();
 
     $status = array();
-    if (count($revisions) == self::MAX_STATUS_ITEMS) {
+    if (count($revisions) >= $limit) {
       $all_count = count($revisions);
-      $all_count_str = self::formatStatusCount(
+      $all_count_str = pht(
-        $all_count,
+        '%s+ Active Review(s)',
-        '%s Active Reviews',
+        new PhutilNumber($limit - 1));
-        '%d Active Review(s)');
+
       $type = PhabricatorApplicationStatusView::TYPE_WARNING;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
@@ -131,10 +133,10 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
           array($user->getPHID()));
 
       $blocking = count($blocking);
-      $blocking_str = self::formatStatusCount(
+      $blocking_str = pht(
-        $blocking,
+        '%s Review(s) Blocking Others',
-        '%s Reviews Blocking Others',
+        new PhutilNumber($blocking));
-        '%d Review(s) Blocking Others');
+
       $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
@@ -142,10 +144,10 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
         ->setCount($blocking);
 
       $active = count($active);
-      $active_str = self::formatStatusCount(
+      $active_str = pht(
-        $active,
+        '%s Review(s) Need Attention',
-        '%s Reviews Need Attention',
+        new PhutilNumber($active));
-        '%d Review(s) Need Attention');
+
       $type = PhabricatorApplicationStatusView::TYPE_WARNING;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
@@ -153,10 +155,10 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
         ->setCount($active);
 
       $waiting = count($waiting);
-      $waiting_str = self::formatStatusCount(
+      $waiting_str = pht(
-        $waiting,
+        '%s Review(s) Waiting on Others',
-        '%s Reviews Waiting on Others',
+        new PhutilNumber($waiting));
-        '%d Review(s) Waiting on Others');
+
       $type = PhabricatorApplicationStatusView::TYPE_INFO;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)

src/applications/diviner/cache/DivinerAtomCache.php

@@ -13,7 +13,7 @@ final class DivinerAtomCache extends DivinerDiskCache {
   private $writeAtoms = array();
 
   public function __construct($cache_directory) {
-    return parent::__construct($cache_directory, 'diviner-atom-cache');
+    parent::__construct($cache_directory, 'diviner-atom-cache');
   }
 
   public function delete() {

src/applications/diviner/cache/DivinerPublishCache.php

@@ -6,7 +6,7 @@ final class DivinerPublishCache extends DivinerDiskCache {
   private $index;
 
   public function __construct($cache_directory) {
-    return parent::__construct($cache_directory, 'diviner-publish-cache');
+    parent::__construct($cache_directory, 'diviner-publish-cache');
   }
 
 

src/applications/diviner/controller/DivinerAtomController.php

@@ -75,8 +75,7 @@ final class DivinerAtomController extends DivinerController {
     $document = id(new PHUIDocumentViewPro())
       ->setBook($book->getTitle(), $group_name)
       ->setHeader($header)
-      ->addClass('diviner-view')
+      ->addClass('diviner-view');
-      ->setPropertyList($prop_list);
 
     if ($atom) {
       $this->buildDefined($properties, $symbol);
@@ -243,10 +242,10 @@ final class DivinerAtomController extends DivinerController {
       array(
         $crumbs,
         $document,
+        $prop_list,
       ),
       array(
         'title' => $symbol->getTitle(),
-        'class' => 'pro-white-background',
       ));
   }
 

src/applications/diviner/controller/DivinerBookController.php

@@ -111,7 +111,6 @@ final class DivinerBookController extends DivinerController {
       ),
       array(
         'title' => $book->getTitle(),
-        'class' => 'pro-white-background',
       ));
   }
 

src/applications/diviner/controller/DivinerMainController.php

@@ -79,7 +79,6 @@ final class DivinerMainController extends DivinerController {
       ),
       array(
         'title' => pht('Documentation Books'),
-        'class' => 'pro-white-background',
       ));
   }
 }

src/applications/draft/storage/PhabricatorVersionedDraft.php

@@ -0,0 +1,83 @@
+<?php
+
+final class PhabricatorVersionedDraft extends PhabricatorDraftDAO {
+
+  const KEY_VERSION = 'draft.version';
+
+  protected $objectPHID;
+  protected $authorPHID;
+  protected $version;
+  protected $properties = array();
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_SERIALIZATION => array(
+        'properties' => self::SERIALIZATION_JSON,
+      ),
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'version' => 'uint32',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_object' => array(
+          'columns' => array('objectPHID', 'authorPHID', 'version'),
+          'unique' => true,
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function setProperty($key, $value) {
+    $this->properties[$key] = $value;
+    return $this;
+  }
+
+  public function getProperty($key, $default = null) {
+    return idx($this->properties, $key, $default);
+  }
+
+  public static function loadDraft(
+    $object_phid,
+    $viewer_phid) {
+
+    return id(new PhabricatorVersionedDraft())->loadOneWhere(
+      'objectPHID = %s AND authorPHID = %s ORDER BY version DESC LIMIT 1',
+      $object_phid,
+      $viewer_phid);
+  }
+
+  public static function loadOrCreateDraft(
+    $object_phid,
+    $viewer_phid,
+    $version) {
+
+    $draft = self::loadDraft($object_phid, $viewer_phid);
+    if ($draft) {
+      return $draft;
+    }
+
+    return id(new PhabricatorVersionedDraft())
+      ->setObjectPHID($object_phid)
+      ->setAuthorPHID($viewer_phid)
+      ->setVersion($version)
+      ->save();
+  }
+
+  public static function purgeDrafts(
+    $object_phid,
+    $viewer_phid,
+    $version) {
+
+    $draft = new PhabricatorVersionedDraft();
+    $conn_w = $draft->establishConnection('w');
+
+    queryfx(
+      $conn_w,
+      'DELETE FROM %T WHERE objectPHID = %s AND authorPHID = %s
+        AND version <= %d',
+      $draft->getTableName(),
+      $object_phid,
+      $viewer_phid,
+      $version);
+  }
+
+}

src/applications/files/engine/PhabricatorChunkedFileStorageEngine.php

@@ -143,7 +143,7 @@ final class PhabricatorChunkedFileStorageEngine
    */
   private function getWritableEngine() {
     // NOTE: We can't just load writable engines or we'll loop forever.
-    $engines = PhabricatorFileStorageEngine::loadAllEngines();
+    $engines = parent::loadAllEngines();
 
     foreach ($engines as $engine) {
       if ($engine->isChunkEngine()) {

src/applications/flag/application/PhabricatorFlagsApplication.php

@@ -34,6 +34,7 @@ final class PhabricatorFlagsApplication extends PhabricatorApplication {
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
+    $limit = self::MAX_STATUS_ITEMS;
 
     $flags = id(new PhabricatorFlagQuery())
       ->setViewer($user)
@@ -42,10 +43,12 @@ final class PhabricatorFlagsApplication extends PhabricatorApplication {
       ->execute();
 
     $count = count($flags);
-    $count_str = self::formatStatusCount(
+    if ($count >= $limit) {
-      $count,
+      $count_str = pht('%s+ Flagged Object(s)', new PhutilNumber($limit - 1));
-      '%s Flagged Objects',
+    } else {
-      '%d Flagged Object(s)');
+      $count_str = pht('%s Flagged Object(s)', new PhutilNumber($count));
+    }
+
     $type = PhabricatorApplicationStatusView::TYPE_WARNING;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)

src/applications/herald/controller/HeraldController.php

@@ -18,24 +18,19 @@ abstract class HeraldController extends PhabricatorController {
     return $crumbs;
   }
 
-  public function buildSideNavView($for_app = false) {
+  public function buildSideNavView() {
-    $user = $this->getRequest()->getUser();
+    $viewer = $this->getViewer();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
-    if ($for_app) {
-      $nav->addFilter('new', pht('Create Rule'));
-    }
-
     id(new HeraldRuleSearchEngine())
-      ->setViewer($user)
+      ->setViewer($viewer)
       ->addNavigationItems($nav->getMenu());
 
-    $nav
+    $nav->addLabel(pht('Utilities'))
-      ->addLabel(pht('Utilities'))
+        ->addFilter('test', pht('Test Console'))
-      ->addFilter('test', pht('Test Console'))
+        ->addFilter('transcript', pht('Transcripts'));
-      ->addFilter('transcript', pht('Transcripts'));
 
     $nav->selectFilter(null);
 

src/applications/herald/controller/HeraldNewController.php

@@ -206,13 +206,14 @@ final class HeraldNewController extends HeraldController {
       ->buildApplicationCrumbs()
       ->addTextCrumb(pht('Create Rule'));
 
-    return $this->buildApplicationPage(
+    $title = pht('Create Herald Rule');
-      array(
+
-        $crumbs,
+    return $this->newPage()
-        $form_box,
+      ->setTitle($title)
-      ),
+      ->setCrumbs($crumbs)
-      array(
+      ->appendChild(
-        'title' => pht('Create Herald Rule'),
+        array(
+          $form_box,
       ));
   }
 

src/applications/herald/controller/HeraldRuleController.php

@@ -247,13 +247,14 @@ final class HeraldRuleController extends HeraldController {
       ->buildApplicationCrumbs()
       ->addTextCrumb($title);
 
-    return $this->buildApplicationPage(
+    $title = pht('Edit Rule');
-      array(
+
-        $crumbs,
+    return $this->newPage()
-        $form_box,
+      ->setTitle($title)
-      ),
+      ->setCrumbs($crumbs)
-      array(
+      ->appendChild(
-        'title' => pht('Edit Rule'),
+        array(
+          $form_box,
       ));
   }
 

src/applications/herald/controller/HeraldRuleViewController.php

@@ -49,14 +49,15 @@ final class HeraldRuleViewController extends HeraldController {
       new HeraldTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
+    $title = $rule->getName();
-      array(
+
-        $crumbs,
+    return $this->newPage()
-        $object_box,
+      ->setTitle($title)
-        $timeline,
+      ->setCrumbs($crumbs)
-      ),
+      ->appendChild(
-      array(
+        array(
-        'title' => $rule->getName(),
+          $object_box,
+          $timeline,
       ));
   }
 

src/applications/herald/controller/HeraldTestConsoleController.php

@@ -102,19 +102,19 @@ final class HeraldTestConsoleController extends HeraldController {
       ->setFormErrors($errors)
       ->setForm($form);
 
-    $nav = $this->buildSideNavView();
-    $nav->selectFilter('test');
-    $nav->appendChild($box);
-
     $crumbs = id($this->buildApplicationCrumbs())
       ->addTextCrumb(pht('Test Console'));
-    $nav->setCrumbs($crumbs);
 
-    return $this->buildApplicationPage(
+    $title = pht('Test Console');
-      $nav,
+
-      array(
+    return $this->newPage()
-        'title' => pht('Test Console'),
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild(
+        array(
+          $box,
       ));
+
   }
 
 }

src/applications/herald/controller/HeraldTranscriptController.php

@@ -81,13 +81,14 @@ final class HeraldTranscriptController extends HeraldController {
         $this->getApplicationURI('/transcript/'))
       ->addTextCrumb($xscript->getID());
 
-    return $this->buildApplicationPage(
+    $title = pht('Transcript');
-      array(
+
-        $crumbs,
+    return $this->newPage()
-        $content,
+      ->setTitle($title)
-      ),
+      ->setCrumbs($crumbs)
-      array(
+      ->appendChild(
-        'title' => pht('Transcript'),
+        array(
+          $content,
       ));
   }
 

src/applications/herald/controller/HeraldTranscriptListController.php

@@ -2,16 +2,12 @@
 
 final class HeraldTranscriptListController extends HeraldController {
 
-  public function buildSideNavView($for_app = false) {
+  public function buildSideNavView() {
     $user = $this->getRequest()->getUser();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
-    if ($for_app) {
-      $nav->addFilter('new', pht('Create Rule'));
-    }
-
     id(new HeraldTranscriptSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
@@ -31,14 +27,9 @@ final class HeraldTranscriptListController extends HeraldController {
   }
 
   public function handleRequest(AphrontRequest $request) {
-    $querykey = $request->getURIData('queryKey');
+    return id(new HeraldTranscriptSearchEngine())
-
+      ->setController($this)
-    $controller = id(new PhabricatorApplicationSearchController())
+      ->buildResponse();
-      ->setQueryKey($querykey)
-      ->setSearchEngine(new HeraldTranscriptSearchEngine())
-      ->setNavigation($this->buildSideNavView());
-
-    return $this->delegateToController($controller);
   }
 
 }

src/applications/herald/query/HeraldTranscriptSearchEngine.php

@@ -76,7 +76,7 @@ final class HeraldTranscriptSearchEngine
 
   protected function getBuiltinQueryNames() {
     return array(
-      'all' => pht('All'),
+      'all' => pht('All Transcripts'),
     );
   }