Sergey Sharybin c3138c6497 Merge branch 'master' into blender-tweaks ...

Conflicts:
	resources/celerity/map.php
	src/__phutil_library_map__.php
	src/applications/auth/application/PhabricatorApplicationAuth.php
	src/applications/base/controller/PhabricatorController.php
	src/applications/differential/customfield/DifferentialLintField.php
	src/applications/differential/customfield/DifferentialUnitField.php
	src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
	src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
	src/applications/feed/application/PhabricatorApplicationFeed.php
	src/applications/home/controller/PhabricatorHomeController.php
	src/applications/home/controller/PhabricatorHomeMainController.php
	src/applications/maniphest/constants/ManiphestTaskStatus.php
	src/applications/maniphest/controller/ManiphestController.php
	src/applications/maniphest/controller/ManiphestTaskDetailController.php
	src/applications/maniphest/controller/ManiphestTaskEditController.php
	src/applications/maniphest/controller/ManiphestTaskListController.php
	src/applications/maniphest/event/ManiphestActionMenuEventListener.php
	src/applications/maniphest/query/ManiphestTaskQuery.php
	src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	src/applications/maniphest/view/ManiphestTaskProjectsView.php
	src/applications/people/storage/PhabricatorUser.php
	src/applications/project/controller/PhabricatorProjectListController.php
	src/applications/project/controller/PhabricatorProjectProfileController.php
	src/applications/search/controller/PhabricatorApplicationSearchController.php
	src/applications/settings/controller/PhabricatorSettingsMainController.php
	src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
	src/view/phui/PHUIPropertyListView.php
	webroot/rsrc/css/sprite-menu.css

2014-06-05 17:07:20 +06:00

..

aphront

Delete license headers from files

2012-11-05 11:16:51 -08:00

cache

Update manage_cache.php

2013-11-21 12:36:00 -08:00

calendar

Increment copyright year and add 2017 dates to calendar import script

2014-01-30 09:05:25 -08:00

celerity

Convert ButtonBar to FontAwesome

2014-06-04 12:53:32 -07:00

daemon

Fix typo

2014-01-15 10:03:50 -08:00

diviner

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

drydock

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

fact

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

files

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

fpm

Delete license headers from files

2012-11-05 11:16:51 -08:00

gitadmin

Correction for the previous commit

2013-11-27 22:20:55 +06:00

install

Merge branch 'master' into blender-tweaks

2014-06-05 17:07:20 +06:00

lipsum

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

mail

Various linter fixes.

2014-02-26 12:44:58 -08:00

repository

Remove various old things in scripts/

2014-05-01 18:23:48 -07:00

search

Remove various old things in scripts/

2014-05-01 18:23:48 -07:00

setup

Add a bin/hunks script to manage migrations of hunk data

2014-06-03 18:01:23 -07:00

sms

Add SMS support

2014-05-09 12:47:21 -07:00

sql

Make all bin/* scripts locate their workflows dynamically

2013-12-27 13:15:48 -08:00

ssh

Provide a more helpful message if a user connects via raw SSH

2013-12-30 13:21:56 -08:00

svnauth

SVN auth script: enable commit access to /tags folder

2014-03-27 18:18:56 +06:00

symbols

Symbol import: preemptively error on non-utf8 symbols

2014-02-26 12:41:55 -08:00

user

Fix many lies in the "User Roles" document

2014-04-02 12:06:56 -07:00

util

Remove various old things in scripts/

2014-05-01 18:23:48 -07:00

__init_script__.php

Consolidate environmental initialization

2012-12-25 06:15:28 -08:00