Merge branch 'master' into phutil_tag
8f1311bbc182
Actions

Description

Merge branch 'master' into phutil_tag

(Final sync.)

Details

Provenance

epriestley	Authored on Feb 5 2013, 10:23 AM
themackabu	Pushed on Mar 25 2025, 8:07 PM

Parents

rP742ee44960b0: Fix show/hide applications on homepage
rP94f6b6ca4e69: Fix every HTML issue I could find

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

742ee44960b0 Fix show/hide applications on homepage
Author
epriestley
Browse Repository
No Builds
No Audits
e4a0c170799c fix Conpherence sorting
Author
Bob Trahan
Browse Repository
No Builds
No Audits
a211f977375d Conpherence - some widget and display stuff
Author
Bob Trahan
Browse Repository
No Builds
No Audits
112c2ebfbe5f make sort controls only show up if sorting will work
Author
Bob Trahan
Browse Repository
No Builds
No Audits
c7635d8bc681 fix space derp from cowboy commit rPc046aa64c16c7c2f956addba06dc7127a9f917be
Author
Bob Trahan
Browse Repository
No Builds
No Audits
af1f57b37ac3 Add a preference to completely disable the file tree
Author
epriestley
Browse Repository
No Builds
No Audits
0bb62d0c3173 Make collapsed navigation sticky
Author
vrana
Browse Repository
No Builds
No Audits
1322e9eda25c Implement import profile picture from Gravatar
Author
Brennan Taylor
Browse Repository
No Builds
No Audits
22d5eee82ab9 Unsquish "No File Chosen" text on image selection forms
Author
Brennan Taylor
Browse Repository
No Builds
No Audits
34c51a61b55d Delete preference for Diffusion symbols
Author
vrana
Browse Repository
No Builds
No Audits
8c99938aad55 Convert revision unsubscribers to edges
Author
vrana
Browse Repository
No Builds
No Audits
ccb206e984d1 Added a Disable Macros function that can be called in some contexts where…
Author
Debarghya Das
Browse Repository
No Builds
No Audits
39afb3fedb72 Suggest STRICT_ALL_TABLES during setup. Improve dev-mode comments.
Author
Bryan Cuccioli
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

conf/

default.conf.php

resources/

sql/

patches/

20130201.revisionunsubscribed.php

20130201.revisionunsubscribed.sql

src/

__phutil_library_map__.php

applications/

config/

check/

PhabricatorSetupCheckDatabase.php

conpherence/

controller/

ConpherenceListController.php

ConpherenceNewController.php

ConpherenceViewController.php

query/

ConpherenceThreadQuery.php

view/

ConpherenceTransactionView.php

differential/

controller/

DifferentialRevisionViewController.php

editor/

DifferentialRevisionEditor.php

storage/

DifferentialRevision.php

view/

DifferentialChangesetFileTreeSideNavBuilder.php

DifferentialChangesetListView.php

diffusion/

controller/

DiffusionBrowseFileController.php

DiffusionCommitController.php

directory/

controller/

PhabricatorDirectoryController.php

files/

storage/

PhabricatorFile.php

macro/

storage/

PhabricatorFileImageMacro.php

maniphest/

controller/

ManiphestTaskListController.php

phame/

controller/

blog/

PhameBlogEditController.php

post/

PhamePostEditController.php

settings/

panel/

PhabricatorSettingsPanelDiffPreferences.php

PhabricatorSettingsPanelDisplayPreferences.php

PhabricatorSettingsPanelProfile.php

storage/

PhabricatorUserPreferences.php

transactions/

editor/

PhabricatorApplicationTransactionEditor.php

infrastructure/

markup/

rule/

PhabricatorRemarkupRuleImageMacro.php

storage/

patch/

PhabricatorBuiltinPatchList.php

view/

form/

control/

AphrontFormImageControl.php

PhabricatorRemarkupControl.php

layout/

AphrontSideNavFilterView.php

webroot/

rsrc/

css/

aphront/

form-view.css

application/

conpherence/

widget-pane.css

sprite-conph.css

js/

application/

conpherence/

behavior-widget-pane.js

core/

behavior-file-tree.js

behavior-home-reveal-tiles.js

behavior-phabricator-nav.js

differential/

behavior-keyboard-nav.js

rP8f1311bbc182

View Options

conf/default.conf.php

View Options

resources/sql/patches/20130201.revisionunsubscribed.php

View Options

resources/sql/patches/20130201.revisionunsubscribed.sql

View Options

src/__phutil_library_map__.php

View Options

src/applications/config/check/PhabricatorSetupCheckDatabase.php

View Options

src/applications/conpherence/controller/ConpherenceListController.php

View Options

src/applications/conpherence/controller/ConpherenceNewController.php

View Options

src/applications/conpherence/controller/ConpherenceViewController.php

View Options

src/applications/conpherence/query/ConpherenceThreadQuery.php

View Options

src/applications/conpherence/view/ConpherenceTransactionView.php

View Options

src/applications/differential/controller/DifferentialRevisionViewController.php

View Options

src/applications/differential/editor/DifferentialRevisionEditor.php

View Options

src/applications/differential/storage/DifferentialRevision.php

View Options

src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php

View Options

src/applications/differential/view/DifferentialChangesetListView.php

View Options

src/applications/diffusion/controller/DiffusionBrowseFileController.php

View Options

src/applications/diffusion/controller/DiffusionCommitController.php

View Options

src/applications/directory/controller/PhabricatorDirectoryController.php

View Options

src/applications/files/storage/PhabricatorFile.php

View Options

src/applications/macro/storage/PhabricatorFileImageMacro.php

View Options

src/applications/maniphest/controller/ManiphestTaskListController.php

View Options

src/applications/phame/controller/blog/PhameBlogEditController.php

View Options

src/applications/phame/controller/post/PhamePostEditController.php

View Options

src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php

View Options

src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php

View Options

src/applications/settings/panel/PhabricatorSettingsPanelProfile.php

View Options

src/applications/settings/storage/PhabricatorUserPreferences.php

View Options

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

View Options

src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php

View Options

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

View Options

src/view/form/control/AphrontFormImageControl.php

View Options

src/view/form/control/PhabricatorRemarkupControl.php

View Options

src/view/layout/AphrontSideNavFilterView.php

View Options

webroot/rsrc/css/aphront/form-view.css

View Options

webroot/rsrc/css/application/conpherence/widget-pane.css

View Options

webroot/rsrc/css/sprite-conph.css

View Options

webroot/rsrc/js/application/conpherence/behavior-widget-pane.js

View Options

webroot/rsrc/js/application/core/behavior-file-tree.js

View Options

webroot/rsrc/js/application/core/behavior-home-reveal-tiles.js

View Options

webroot/rsrc/js/application/core/behavior-phabricator-nav.js

View Options

webroot/rsrc/js/application/differential/behavior-keyboard-nav.js

Merge branch 'master' into phutil_tag8f1311bbc182Actions

Description

Details

Event Timeline

Merged Changes

Changes (41)

rP8f1311bbc182

conf/default.conf.php

resources/sql/patches/20130201.revisionunsubscribed.php

resources/sql/patches/20130201.revisionunsubscribed.sql

src/__phutil_library_map__.php

src/applications/config/check/PhabricatorSetupCheckDatabase.php

src/applications/conpherence/controller/ConpherenceListController.php

src/applications/conpherence/controller/ConpherenceNewController.php

src/applications/conpherence/controller/ConpherenceViewController.php

src/applications/conpherence/query/ConpherenceThreadQuery.php

src/applications/conpherence/view/ConpherenceTransactionView.php

src/applications/differential/controller/DifferentialRevisionViewController.php

src/applications/differential/editor/DifferentialRevisionEditor.php

src/applications/differential/storage/DifferentialRevision.php

src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php

src/applications/differential/view/DifferentialChangesetListView.php

src/applications/diffusion/controller/DiffusionBrowseFileController.php

src/applications/diffusion/controller/DiffusionCommitController.php

src/applications/directory/controller/PhabricatorDirectoryController.php

src/applications/files/storage/PhabricatorFile.php

src/applications/macro/storage/PhabricatorFileImageMacro.php

src/applications/maniphest/controller/ManiphestTaskListController.php

src/applications/phame/controller/blog/PhameBlogEditController.php

src/applications/phame/controller/post/PhamePostEditController.php

src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php

src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php

src/applications/settings/panel/PhabricatorSettingsPanelProfile.php

src/applications/settings/storage/PhabricatorUserPreferences.php

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

src/view/form/control/AphrontFormImageControl.php

src/view/form/control/PhabricatorRemarkupControl.php

src/view/layout/AphrontSideNavFilterView.php

webroot/rsrc/css/aphront/form-view.css

webroot/rsrc/css/application/conpherence/widget-pane.css

webroot/rsrc/css/sprite-conph.css

webroot/rsrc/js/application/conpherence/behavior-widget-pane.js

webroot/rsrc/js/application/core/behavior-file-tree.js

webroot/rsrc/js/application/core/behavior-home-reveal-tiles.js

webroot/rsrc/js/application/core/behavior-phabricator-nav.js

webroot/rsrc/js/application/differential/behavior-keyboard-nav.js

Merge branch 'master' into phutil_tag
8f1311bbc182
Actions