Merge branch 'master' into blender-tweaks

Conflicts:
	scripts/celerity_mapper.php
	src/__celerity_resource_map__.php
	src/applications/differential/controller/DifferentialDiffCreateController.php
	src/applications/diffusion/controller/DiffusionBrowseFileController.php
	src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
	src/applications/files/storage/PhabricatorFile.php
	src/applications/maniphest/controller/ManiphestTaskListController.php
	src/applications/project/controller/PhabricatorProjectController.php
	src/applications/project/controller/PhabricatorProjectProfileController.php
	src/applications/repository/storage/PhabricatorRepository.php
	webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js

.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 ._*
-/webroot/rsrc/custom
 .#*
 *#
 *~

README

@@ -1,12 +1,22 @@
-Phabricator is an open source collection of web applications which make it
-easier to write, review, and share source code. Phabricator was developed at
-Facebook.
+Phabricator is an open source collection of web applications which help
+software companies build better software.
 
-It's pretty high-quality and usable, but under active development so things 
-may change quickly.
+Phabricator includes applications for:
 
-You can learn more about the project and find links to documentation and
-resources at: http://phabricator.org/
+  - reviewing and auditing source code;
+  - hosting and browsing repositories;
+  - assembling a party to venture forth;
+  - tracking bugs;
+  - hiding stuff from coworkers; and
+  - also some other things.
+
+You can learn more about the project (and find links to documentation and
+resources) here:
+
+  http://phabricator.org/
+
+Phabricator is developed and maintained by Phacility. The first version of
+Phabricator was originally built at Facebook.
 
 LICENSE
 

bin/celerity

@@ -0,0 +1 @@
+../scripts/setup/manage_celerity.php

bin/commit-hook

@@ -0,0 +1 @@
+../scripts/repository/commit_hook.php

bin/harbormaster

@@ -0,0 +1 @@
+../scripts/setup/manage_harbormaster.php

bin/ssh-connect

@@ -0,0 +1 @@
+../scripts/ssh/ssh-connect.php

conf/default.conf.php

@@ -299,13 +299,6 @@ return array(
   'metamta.mail-adapter'        =>
     'PhabricatorMailImplementationPHPMailerLiteAdapter',
 
-  // When email is sent, try to hand it off to the MTA immediately instead of
-  // queueing it for delivery by the daemons. If you are running the Phabricator
-  // daemons with "phd start", you should disable this to provide a (sometimes
-  // substantial) performance boost. It's on by default to make setup and
-  // configuration a little easier.
-  'metamta.send-immediately'    => true,
-
   // When email is sent, what format should Phabricator use for user's
   // email addresses? Valid values are:
   //  - 'short' - 'gwashington <gwashington@example.com>'
@@ -550,15 +543,6 @@ return array(
 
 // -- Auth ------------------------------------------------------------------ //
 
-  // Maximum number of simultaneous web sessions each user is permitted to have.
-  // Setting this to "1" will prevent a user from logging in on more than one
-  // browser at the same time.
-  'auth.sessions.web'           => 5,
-
-  // Maximum number of simultaneous Conduit sessions each user is permitted
-  // to have.
-  'auth.sessions.conduit'       => 5,
-
   // If true, email addresses must be verified (by clicking a link in an
   // email) before a user can login. By default, verification is optional
   // unless 'auth.email-domains' is nonempty (see below).
@@ -865,11 +849,6 @@ return array(
   // not actually be receiving thorough review.
   'differential.enable-email-accept' => false,
 
-  // If you set this to true, users won't need to login to view differential
-  // revisions.  Anonymous users will have read-only access and won't be able to
-  // interact with the revisions.
-  'differential.anonymous-access' => false,
-
   // List of file regexps that should be treated as if they are generated by
   // an automatic process, and thus get hidden by default in differential.
   'differential.generated-paths' => array(
@@ -1033,10 +1012,6 @@ return array(
   // "phd debug" are always launched in trace mdoe. See also 'phd.verbose'.
   'phd.trace' => false,
 
-  // Path to custom celerity resource map relative to 'phabricator/src'.
-  // See also `scripts/celerity_mapper.php`.
-  'celerity.resource-path' => '__celerity_resource_map__.php',
-
   // This value is an input to the hash function when building resource hashes.
   // It has no security value, but if you accidentally poison user caches (by
   // pushing a bad patch or having something go wrong with a CDN, e.g.) you can

externals/amazon-ses/ses.php

@@ -568,6 +568,7 @@ final class SimpleEmailServiceRequest
   * @return integer
   */
   private function __responseWriteCallback(&$curl, &$data) {
+    if(!isset($this->response->body)) $this->response->body = '';
     $this->response->body .= $data;
     return strlen($data);
   }
@@ -739,4 +740,4 @@ final class SimpleEmailServiceMessage {
  */
 final class SimpleEmailServiceException extends Exception {
 
-}
+}

externals/wordlist/LICENSE.txt

@@ -0,0 +1,15 @@
+The following copyright statement applies to this wordlists collection as a whole:
+Copyright (c) 2002,2003 by Solar Designer of Openwall Project
+
+The homepage URL for this wordlists collection is:
+
+http://www.openwall.com/wordlists/
+
+You're allowed to use and redistribute this wordlists collection or parts thereof, with or without modification, provided that credit is given where it is due, any modified versions are marked as such, this license is kept intact and included with each copy, and NO FEE IS CHARGED FOR OBTAINING A COPY except as negotiated with the copyright holder. In particular, you are NOT permitted to charge for bandwidth, physical media, and/or shipping. You're also not permitted to bundle this wordlists collection with a product you charge for.
+
+If redistribution for a fee is what you're after, please contact the copyright holder to negotiate special terms for the downloadable or the extended CD-ready version of this collection.
+
+It was a significant amount of work to compile this collection and having a monopoly on regulating the CD sales is my way to compensate for the time already spent and to allow for further work.
+
+--
+Alexander Peslyak aka Solar Designer <solar at openwall.com>

resources/celerity/packages.php

@@ -0,0 +1,180 @@
+<?php
+
+return array(
+  'javelin.pkg.js' => array(
+    'javelin-util',
+    'javelin-install',
+    'javelin-event',
+    'javelin-stratcom',
+    'javelin-behavior',
+    'javelin-resource',
+    'javelin-request',
+    'javelin-vector',
+    'javelin-dom',
+    'javelin-json',
+    'javelin-uri',
+    'javelin-workflow',
+    'javelin-mask',
+    'javelin-typeahead',
+    'javelin-typeahead-normalizer',
+    'javelin-typeahead-source',
+    'javelin-typeahead-preloaded-source',
+    'javelin-typeahead-ondemand-source',
+    'javelin-tokenizer',
+    'javelin-history',
+  ),
+  'core.pkg.js' => array(
+    'javelin-behavior-aphront-basic-tokenizer',
+    'javelin-behavior-workflow',
+    'javelin-behavior-aphront-form-disable-on-submit',
+    'phabricator-keyboard-shortcut-manager',
+    'phabricator-keyboard-shortcut',
+    'javelin-behavior-phabricator-keyboard-shortcuts',
+    'javelin-behavior-refresh-csrf',
+    'javelin-behavior-phabricator-watch-anchor',
+    'javelin-behavior-phabricator-autofocus',
+    'phabricator-menu-item',
+    'phabricator-dropdown-menu',
+    'phabricator-phtize',
+    'javelin-behavior-phabricator-oncopy',
+    'phabricator-tooltip',
+    'javelin-behavior-phabricator-tooltips',
+    'phabricator-prefab',
+    'javelin-behavior-device',
+    'javelin-behavior-toggle-class',
+    'javelin-behavior-lightbox-attachments',
+    'phabricator-busy',
+    'javelin-aphlict',
+    'phabricator-notification',
+    'javelin-behavior-aphlict-listen',
+    'javelin-behavior-phabricator-search-typeahead',
+    'javelin-behavior-konami',
+    'javelin-behavior-aphlict-dropdown',
+    'javelin-behavior-history-install',
+    'javelin-behavior-phabricator-gesture',
+
+    'javelin-behavior-phabricator-active-nav',
+    'javelin-behavior-phabricator-nav',
+    'javelin-behavior-phabricator-remarkup-assist',
+    'phabricator-textareautils',
+    'phabricator-file-upload',
+    'javelin-behavior-global-drag-and-drop',
+    'javelin-behavior-phabricator-reveal-content',
+    'phabricator-hovercard',
+    'javelin-behavior-phabricator-hovercards',
+    'javelin-color',
+    'javelin-fx',
+  ),
+  'core.pkg.css' => array(
+    'phabricator-core-css',
+    'phabricator-zindex-css',
+    'phui-button-css',
+    'phabricator-standard-page-view',
+    'aphront-dialog-view-css',
+    'phui-form-view-css',
+    'aphront-panel-view-css',
+    'aphront-table-view-css',
+    'aphront-tokenizer-control-css',
+    'aphront-typeahead-control-css',
+    'aphront-list-filter-view-css',
+
+    'phabricator-jump-nav',
+
+    'phabricator-remarkup-css',
+    'syntax-highlighting-css',
+    'aphront-pager-view-css',
+    'phabricator-transaction-view-css',
+    'aphront-tooltip-css',
+    'phabricator-flag-css',
+    'aphront-error-view-css',
+
+    'sprite-icons-css',
+    'sprite-gradient-css',
+    'sprite-menu-css',
+    'sprite-apps-large-css',
+    'sprite-status-css',
+
+    'phabricator-main-menu-view',
+    'phabricator-notification-css',
+    'phabricator-notification-menu-css',
+    'lightbox-attachment-css',
+    'phui-header-view-css',
+    'phabricator-filetree-view-css',
+    'phabricator-nav-view-css',
+    'phabricator-side-menu-view-css',
+    'phabricator-crumbs-view-css',
+    'phui-object-item-list-view-css',
+    'global-drag-and-drop-css',
+    'phui-spacing-css',
+    'phui-form-css',
+    'phui-icon-view-css',
+
+    'phabricator-application-launch-view-css',
+    'phabricator-action-list-view-css',
+    'phui-property-list-view-css',
+    'phui-tag-view-css',
+    'phui-list-view-css',
+  ),
+  'differential.pkg.css' => array(
+    'differential-core-view-css',
+    'differential-changeset-view-css',
+    'differential-results-table-css',
+    'differential-revision-history-css',
+    'differential-revision-list-css',
+    'differential-table-of-contents-css',
+    'differential-revision-comment-css',
+    'differential-revision-add-comment-css',
+    'differential-revision-comment-list-css',
+    'phabricator-object-selector-css',
+    'phabricator-content-source-view-css',
+    'differential-local-commits-view-css',
+    'inline-comment-summary-css',
+  ),
+  'differential.pkg.js' => array(
+    'phabricator-drag-and-drop-file-upload',
+    'phabricator-shaped-request',
+
+    'javelin-behavior-differential-feedback-preview',
+    'javelin-behavior-differential-edit-inline-comments',
+    'javelin-behavior-differential-populate',
+    'javelin-behavior-differential-show-more',
+    'javelin-behavior-differential-diff-radios',
+    'javelin-behavior-differential-accept-with-errors',
+    'javelin-behavior-differential-comment-jump',
+    'javelin-behavior-differential-add-reviewers-and-ccs',
+    'javelin-behavior-differential-keyboard-navigation',
+    'javelin-behavior-aphront-drag-and-drop-textarea',
+    'javelin-behavior-phabricator-object-selector',
+    'javelin-behavior-repository-crossreference',
+    'javelin-behavior-load-blame',
+
+    'differential-inline-comment-editor',
+    'javelin-behavior-differential-dropdown-menus',
+    'javelin-behavior-differential-toggle-files',
+    'javelin-behavior-differential-user-select',
+  ),
+  'diffusion.pkg.css' => array(
+    'diffusion-commit-view-css',
+    'diffusion-icons-css',
+  ),
+  'diffusion.pkg.js' => array(
+    'javelin-behavior-diffusion-pull-lastmodified',
+    'javelin-behavior-diffusion-commit-graph',
+    'javelin-behavior-audit-preview',
+  ),
+  'maniphest.pkg.css' => array(
+    'maniphest-task-summary-css',
+    'phabricator-project-tag-css',
+  ),
+  'maniphest.pkg.js' => array(
+    'javelin-behavior-maniphest-batch-selector',
+    'javelin-behavior-maniphest-transaction-controls',
+    'javelin-behavior-maniphest-transaction-preview',
+    'javelin-behavior-maniphest-transaction-expand',
+    'javelin-behavior-maniphest-subpriority-editor',
+  ),
+  'darkconsole.pkg.js' => array(
+    'javelin-behavior-dark-console',
+    'javelin-behavior-error-log',
+  ),
+);