Merge branch 'master' into redesign
Audited09a350682187
Actions

Description

Merge branch 'master' into redesign

Details

Group Auditors

Provenance

epriestley	Authored on
epriestley	Pushed on May 29 2014, 10:04 PM

Parents

rPe05f427f3dd1: Compress the Aphlict client SWF.
rPeb14c3085bc9: [redesign] Tokens and List

Branches

Unknown

Tags

Unknown

Event Timeline

chad accepted this commit.May 30 2014, 2:09 AM

Merged Changes

e05f427f3dd1 Compress the Aphlict client SWF.
Author
joshuaspence
Revisions
D9333: Compress the Aphlict client SWF.
Browse Repository
No Builds
No Audits
91109805a50c Leafy minerals.
Author
epriestley
Browse Repository
No Builds
Audited
81d95cf682a5 Make default view of "Applications" app a full-page launcher
Author
epriestley
Revisions
D9297: Make default view of "Applications" app a full-page launcher
Browse Repository
No Builds
No Audits
2f668493a0fb Don't attempt to discover parents commits for untracked branchs.
Author
joshuaspence
Revisions
D9322: Don't attempt to discover parents commits for untracked branchs.
Browse Repository
No Builds
No Audits
3929309225c7 Update config to point at modern custom field article.
Author
epriestley
Revisions
D9331: Update config to point at modern custom field article.
Browse Repository
No Builds
No Audits
63ed126b2a12 Point github.com/facebook URIs at github.com/phacility insead
Author
epriestley
Revisions
D9328: Point github.com/facebook URIs at github.com/phacility insead
Browse Repository
No Builds
No Audits
a42ec32c98b6 Modify the Aphlict client to use `LocalConnection`.
Author
joshuaspence
Revisions
D9327: Modify the Aphlict client to use `LocalConnection`.
Browse Repository
No Builds
No Audits
7f2b6412a2e8 Fix an issue with Phrequent where range_start might not be defined
Author
epriestley
Browse Repository
No Builds
Audited
b20142c0febe Fix PhabricatorPolicyDataTestCase
Author
James Rhodes <jamesr@pageuppeople.com>
Revisions
D9326: Fix PhabricatorPolicyDataTestCase
Browse Repository
No Builds
No Audits
dd3dfde98360 T4446: Fix Elasticsearch support for 1.0 and above
Author
WikiChad
Revisions
D9321: T4446: Fix Elasticsearch support for 1.0 and above
Browse Repository
No Builds
No Audits
c7a7574f0c8e Remove oneline feed story
Author
chad
Revisions
D9320: Remove oneline feed story
Browse Repository
No Builds
No Audits
1855e6675868 Add some file types to `pygments.dropdown-choices`.
Author
joshuaspence
Revisions
D9319: Add some file types to `pygments.dropdown-choices`.
Browse Repository
No Builds
No Audits
2aef04a78afb Fix Diffusion blame/highlight for logged-out users
Author
epriestley
Revisions
D9310: Fix Diffusion blame/highlight for logged-out users
Browse Repository
No Builds
No Audits
71d2b0868b73 Fix typo: behvaior->behavior
Author
Stepan Generalov <psi.pk.ru@gmail.com>
Browse Repository
No Builds
Audited
70ec8052fddc Fix issue when editing a project with no secondary hash tags
Author
epriestley
Revisions
D9300: Fix issue when editing a project with no secondary hash tags
Browse Repository
No Builds
No Audits
92ccadaa42d2 Create an empty state for dashboards
Author
lpriestley
Revisions
D9312: Create an empty state for dashboards
Browse Repository
No Builds
No Audits
33aa39580652 Delete some junko garbage
Author
epriestley
Revisions
D9311: Delete some junko garbage
Browse Repository
No Builds
No Audits
1daa0aa36e26 Syntax highlight `.arclint` files as JSON.
Author
joshuaspence
Revisions
D9305: Syntax highlight `.arclint` files as JSON.
Browse Repository
No Builds
No Audits
607f4bfab8d1 Remove dedicated "Jump Nav" navigation element
Author
lpriestley
Revisions
D9301: Remove dedicated "Jump Nav" navigation element
Browse Repository
No Builds
No Audits
b93c2f68521d Fix two Passphrase credential type issues
Author
epriestley
Revisions
D9299: Fix two Passphrase credential type issues
Browse Repository
No Builds
No Audits
b7a8c0b20004 Fix references to `set-config --show` in docs
Author
sophiebits
Revisions
D9298: Fix references to `set-config --show` in docs
Browse Repository
No Builds
No Audits

Changes (84)

Path

Size

conf/

default.conf.php

resources/

celerity/

map.php

packages.php

sql/

patches/

20131004.dxreviewers.php

scripts/

install/

install_rhel-derivs.sh

install_ubuntu.sh

src/

aphront/

console/

plugin/

DarkConsoleErrorLogPlugin.php

applications/

audit/

application/

PhabricatorApplicationAudit.php

auth/

application/

PhabricatorApplicationAuth.php

base/

PhabricatorApplication.php

calendar/

application/

PhabricatorApplicationCalendar.php

chatlog/

applications/

PhabricatorApplicationChatLog.php

conduit/

application/

PhabricatorApplicationConduit.php

config/

application/

PhabricatorApplicationConfig.php

option/

PhabricatorSyntaxHighlightingConfigOptions.php

conpherence/

application/

PhabricatorApplicationConpherence.php

countdown/

application/

PhabricatorApplicationCountdown.php

daemon/

application/

PhabricatorApplicationDaemons.php

dashboard/

application/

PhabricatorApplicationDashboard.php

controller/

PhabricatorDashboardViewController.php

differential/

application/

PhabricatorApplicationDifferential.php

customfield/

DifferentialTestPlanField.php

diffusion/

application/

PhabricatorApplicationDiffusion.php

controller/

DiffusionBrowseFileController.php

diviner/

application/

PhabricatorApplicationDiviner.php

doorkeeper/

application/

PhabricatorApplicationDoorkeeper.php

drydock/

application/

PhabricatorApplicationDrydock.php

fact/

application/

PhabricatorApplicationFact.php

feed/

application/

PhabricatorApplicationFeed.php

flag/

application/

PhabricatorApplicationFlags.php

harbormaster/

application/

PhabricatorApplicationHarbormaster.php

home/

controller/

PhabricatorHomeMainController.php

legalpad/

application/

PhabricatorApplicationLegalpad.php

maniphest/

config/

PhabricatorManiphestConfigOptions.php

meta/

application/

PhabricatorApplicationApplications.php

controller/

PhabricatorApplicationDetailViewController.php

PhabricatorApplicationEditController.php

PhabricatorApplicationUninstallController.php

PhabricatorApplicationsController.php

PhabricatorApplicationsListController.php

query/

PhabricatorAppSearchEngine.php

PhabricatorApplicationQuery.php

metamta/

application/

PhabricatorApplicationMetaMTA.php

notification/

application/

PhabricatorApplicationNotifications.php

nuance/

application/

PhabricatorApplicationNuance.php

oauthserver/

application/

PhabricatorApplicationOAuthServer.php

owners/

application/

PhabricatorApplicationOwners.php

passphrase/

application/

PhabricatorApplicationPassphrase.php

controller/

PassphraseCredentialEditController.php

paste/

application/

PhabricatorApplicationPaste.php

people/

application/

PhabricatorApplicationPeople.php

phlux/

application/

PhabricatorApplicationPhlux.php

pholio/

application/

PhabricatorApplicationPholio.php

phortune/

application/

PhabricatorApplicationPhortune.php

phrequent/

application/

PhabricatorApplicationPhrequent.php

storage/

PhrequentTimeBlock.php

policy/

__tests__/

PhabricatorPolicyDataTestCase.php

ponder/

application/

PhabricatorApplicationPonder.php

project/

application/

PhabricatorApplicationProject.php

editor/

PhabricatorProjectTransactionEditor.php

releeph/

application/

PhabricatorApplicationReleeph.php

repository/

application/

PhabricatorApplicationRepositories.php

engine/

PhabricatorRepositoryPullEngine.php

management/

PhabricatorRepositoryManagementParentsWorkflow.php

search/

application/

PhabricatorApplicationSearch.php

engine/

PhabricatorSearchEngineElastic.php

settings/

application/

PhabricatorApplicationSettings.php

tokens/

application/

PhabricatorApplicationTokens.php

uiexample/

application/

PhabricatorApplicationUIExamples.php

docs/

user/

feedback.diviner

installation_guide.diviner

userguide/

arcanist.diviner

arcanist_new_project.diviner

arcanist_quick_start.diviner

view/

phui/

PHUIFeedStoryView.php

PHUIObjectItemView.php

support/

aphlict/

client/

build_aphlict_client.sh

src/

Aphlict.as

AphlictClient.as

AphlictMaster.as

webroot/

rsrc/

css/

application/

directory/

phabricator-jump-nav.css

phui/

phui-object-item-list-view.css

swf/

aphlict.swf

rP09a350682187

View Options

conf/default.conf.php

View Options

resources/celerity/map.php

View Options

resources/celerity/packages.php

View Options

resources/sql/patches/20131004.dxreviewers.php

View Options

scripts/install/install_rhel-derivs.sh

View Options

scripts/install/install_ubuntu.sh

View Options

src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php

View Options

src/applications/audit/application/PhabricatorApplicationAudit.php

View Options

src/applications/auth/application/PhabricatorApplicationAuth.php

View Options

src/applications/base/PhabricatorApplication.php

View Options

src/applications/calendar/application/PhabricatorApplicationCalendar.php

View Options

src/applications/chatlog/applications/PhabricatorApplicationChatLog.php

View Options

src/applications/conduit/application/PhabricatorApplicationConduit.php

View Options

src/applications/config/application/PhabricatorApplicationConfig.php

View Options

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

View Options

src/applications/conpherence/application/PhabricatorApplicationConpherence.php

View Options

src/applications/countdown/application/PhabricatorApplicationCountdown.php

View Options

src/applications/daemon/application/PhabricatorApplicationDaemons.php

View Options

src/applications/dashboard/application/PhabricatorApplicationDashboard.php

View Options

src/applications/dashboard/controller/PhabricatorDashboardViewController.php

View Options

src/applications/differential/application/PhabricatorApplicationDifferential.php

View Options

src/applications/differential/customfield/DifferentialTestPlanField.php

View Options

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

View Options

src/applications/diffusion/controller/DiffusionBrowseFileController.php

View Options

src/applications/diviner/application/PhabricatorApplicationDiviner.php

View Options

src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php

View Options

src/applications/drydock/application/PhabricatorApplicationDrydock.php

View Options

src/applications/fact/application/PhabricatorApplicationFact.php

View Options

src/applications/feed/application/PhabricatorApplicationFeed.php

View Options

src/applications/flag/application/PhabricatorApplicationFlags.php

View Options

src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php

View Options

src/applications/home/controller/PhabricatorHomeMainController.php

View Options

src/applications/legalpad/application/PhabricatorApplicationLegalpad.php

View Options

src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php

View Options

src/applications/meta/application/PhabricatorApplicationApplications.php

View Options

src/applications/meta/controller/PhabricatorApplicationDetailViewController.php

View Options

src/applications/meta/controller/PhabricatorApplicationEditController.php

View Options

src/applications/meta/controller/PhabricatorApplicationUninstallController.php

View Options

src/applications/meta/controller/PhabricatorApplicationsController.php

View Options

src/applications/meta/controller/PhabricatorApplicationsListController.php

View Options

src/applications/meta/query/PhabricatorAppSearchEngine.php

View Options

src/applications/meta/query/PhabricatorApplicationQuery.php

View Options

src/applications/metamta/application/PhabricatorApplicationMetaMTA.php

View Options

src/applications/notification/application/PhabricatorApplicationNotifications.php

View Options

src/applications/nuance/application/PhabricatorApplicationNuance.php

View Options

src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php

View Options

src/applications/owners/application/PhabricatorApplicationOwners.php

View Options

src/applications/passphrase/application/PhabricatorApplicationPassphrase.php

View Options

src/applications/passphrase/controller/PassphraseCredentialEditController.php

View Options

src/applications/paste/application/PhabricatorApplicationPaste.php

View Options

src/applications/people/application/PhabricatorApplicationPeople.php

View Options

src/applications/phlux/application/PhabricatorApplicationPhlux.php

View Options

src/applications/pholio/application/PhabricatorApplicationPholio.php

View Options

src/applications/phortune/application/PhabricatorApplicationPhortune.php

View Options

src/applications/phrequent/application/PhabricatorApplicationPhrequent.php

View Options

src/applications/phrequent/storage/PhrequentTimeBlock.php

View Options

src/applications/policy/tests/PhabricatorPolicyDataTestCase.php

View Options

src/applications/ponder/application/PhabricatorApplicationPonder.php

View Options

src/applications/project/application/PhabricatorApplicationProject.php

View Options

src/applications/project/editor/PhabricatorProjectTransactionEditor.php

View Options

src/applications/releeph/application/PhabricatorApplicationReleeph.php

View Options

src/applications/repository/application/PhabricatorApplicationRepositories.php

View Options

src/applications/repository/engine/PhabricatorRepositoryPullEngine.php

View Options

src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php

View Options

src/applications/search/application/PhabricatorApplicationSearch.php

View Options

src/applications/search/engine/PhabricatorSearchEngineElastic.php

View Options

src/applications/settings/application/PhabricatorApplicationSettings.php

View Options

src/applications/tokens/application/PhabricatorApplicationTokens.php

View Options

src/applications/uiexample/application/PhabricatorApplicationUIExamples.php

View Options

src/docs/user/feedback.diviner

View Options

src/docs/user/installation_guide.diviner

View Options

src/docs/user/userguide/arcanist.diviner

View Options

src/docs/user/userguide/arcanist_new_project.diviner

View Options

src/docs/user/userguide/arcanist_quick_start.diviner

View Options

src/view/phui/PHUIFeedStoryView.php

View Options

src/view/phui/PHUIObjectItemView.php

View Options

support/aphlict/client/build_aphlict_client.sh

View Options

support/aphlict/client/src/Aphlict.as

View Options

support/aphlict/client/src/AphlictClient.as

View Options

support/aphlict/client/src/AphlictMaster.as

View Options

webroot/rsrc/css/application/directory

View Options

webroot/rsrc/css/application/directory/phabricator-jump-nav.css

View Options

webroot/rsrc/css/phui/phui-object-item-list-view.css

View Options

webroot/rsrc/swf/aphlict.swf

Merge branch 'master' into redesignAudited09a350682187Actions

Description

Details

Event Timeline

Merged Changes

Changes (84)

rP09a350682187

conf/default.conf.php

resources/celerity/map.php

resources/celerity/packages.php

resources/sql/patches/20131004.dxreviewers.php

scripts/install/install_rhel-derivs.sh

scripts/install/install_ubuntu.sh

src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php

src/applications/audit/application/PhabricatorApplicationAudit.php

src/applications/auth/application/PhabricatorApplicationAuth.php

src/applications/base/PhabricatorApplication.php

src/applications/calendar/application/PhabricatorApplicationCalendar.php

src/applications/chatlog/applications/PhabricatorApplicationChatLog.php

src/applications/conduit/application/PhabricatorApplicationConduit.php

src/applications/config/application/PhabricatorApplicationConfig.php

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

src/applications/conpherence/application/PhabricatorApplicationConpherence.php

src/applications/countdown/application/PhabricatorApplicationCountdown.php

src/applications/daemon/application/PhabricatorApplicationDaemons.php

src/applications/dashboard/application/PhabricatorApplicationDashboard.php

src/applications/dashboard/controller/PhabricatorDashboardViewController.php

src/applications/differential/application/PhabricatorApplicationDifferential.php

src/applications/differential/customfield/DifferentialTestPlanField.php

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

src/applications/diffusion/controller/DiffusionBrowseFileController.php

src/applications/diviner/application/PhabricatorApplicationDiviner.php

src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php

src/applications/drydock/application/PhabricatorApplicationDrydock.php

src/applications/fact/application/PhabricatorApplicationFact.php

src/applications/feed/application/PhabricatorApplicationFeed.php

src/applications/flag/application/PhabricatorApplicationFlags.php

src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php

src/applications/home/controller/PhabricatorHomeMainController.php

src/applications/legalpad/application/PhabricatorApplicationLegalpad.php

src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php

src/applications/meta/application/PhabricatorApplicationApplications.php

src/applications/meta/controller/PhabricatorApplicationDetailViewController.php

src/applications/meta/controller/PhabricatorApplicationEditController.php

src/applications/meta/controller/PhabricatorApplicationUninstallController.php

src/applications/meta/controller/PhabricatorApplicationsController.php

src/applications/meta/controller/PhabricatorApplicationsListController.php

src/applications/meta/query/PhabricatorAppSearchEngine.php

src/applications/meta/query/PhabricatorApplicationQuery.php

src/applications/metamta/application/PhabricatorApplicationMetaMTA.php

src/applications/notification/application/PhabricatorApplicationNotifications.php

src/applications/nuance/application/PhabricatorApplicationNuance.php

src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php

src/applications/owners/application/PhabricatorApplicationOwners.php

src/applications/passphrase/application/PhabricatorApplicationPassphrase.php

src/applications/passphrase/controller/PassphraseCredentialEditController.php

src/applications/paste/application/PhabricatorApplicationPaste.php

src/applications/people/application/PhabricatorApplicationPeople.php

src/applications/phlux/application/PhabricatorApplicationPhlux.php

src/applications/pholio/application/PhabricatorApplicationPholio.php

src/applications/phortune/application/PhabricatorApplicationPhortune.php

src/applications/phrequent/application/PhabricatorApplicationPhrequent.php

src/applications/phrequent/storage/PhrequentTimeBlock.php

src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php

src/applications/ponder/application/PhabricatorApplicationPonder.php

src/applications/project/application/PhabricatorApplicationProject.php

src/applications/project/editor/PhabricatorProjectTransactionEditor.php

src/applications/releeph/application/PhabricatorApplicationReleeph.php

src/applications/repository/application/PhabricatorApplicationRepositories.php

src/applications/repository/engine/PhabricatorRepositoryPullEngine.php

src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php

src/applications/search/application/PhabricatorApplicationSearch.php

src/applications/search/engine/PhabricatorSearchEngineElastic.php

src/applications/settings/application/PhabricatorApplicationSettings.php

src/applications/tokens/application/PhabricatorApplicationTokens.php

src/applications/uiexample/application/PhabricatorApplicationUIExamples.php

src/docs/user/feedback.diviner

src/docs/user/installation_guide.diviner

src/docs/user/userguide/arcanist.diviner

src/docs/user/userguide/arcanist_new_project.diviner

Merge branch 'master' into redesign
Audited09a350682187
Actions

src/applications/policy/tests/PhabricatorPolicyDataTestCase.php