Merge branch 'master' into redesign-2015
Audited7d7e13d79b86
Actions

Description

Merge branch 'master' into redesign-2015

Details

Group Auditors

Provenance

epriestley	Authored on
epriestley	Pushed on Jun 19 2015, 3:33 PM

Parents

rP40851e5b2529: Adds Remarkup Rendering to Calendar Events' Descriptions.
rP67950cddb0df: [Redesign] Misc batch of UI buggypoos

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley committed rP7d7e13d79b86: Merge branch 'master' into redesign-2015 (authored by epriestley).Jun 19 2015, 3:33 PM

Herald added auditors: Fakhra.Aftab, Cowboy Commits. · View Herald TranscriptJun 19 2015, 3:33 PM

btrahan accepted this commit.Jun 19 2015, 9:40 PM

Merged Changes

40851e5b2529 Adds Remarkup Rendering to Calendar Events' Descriptions.
Author
SalmonKiller
Revisions
D13355: Adds Remarkup Rendering to Calendar Events' Descriptions.
Browse Repository
No Builds
No Audits
69d12f64baf9 Add repositories to Diviner
Author
joshuaspence
Revisions
D13070: Add repositories to Diviner
Browse Repository
No Builds
No Audits
70a82017b3b9 Drop Windows-specific escaping in preallocated host
Author
hach-que
Revisions
D13341: Drop Windows-specific escaping in preallocated host
Browse Repository
No Builds
No Audits
827aa05a676e Drop Windows-specific SSH code
Author
hach-que
Revisions
D13340: Drop Windows-specific SSH code
Browse Repository
No Builds
No Audits
68bb60e52f92 Use PhutilConsoleTable in `./bin/storage probe`
Author
joshuaspence
Revisions
D13339: Use PhutilConsoleTable in `./bin/storage probe`
Browse Repository
No Builds
No Audits
1851ca2d71aa Make owners typeahead mostly reasonable
Author
epriestley
Revisions
D13349: Make owners typeahead mostly reasonable
Browse Repository
No Builds
No Audits
b12f13efd8d0 Force date/time preferences to valid values
Author
epriestley
Revisions
D13346: Force date/time preferences to valid values
Browse Repository
No Builds
No Audits
e96cd29efff7 Reduce badness in viewing large files in the Diffusion web UI
Author
epriestley
Revisions
D13348: Reduce badness in viewing large files in the Diffusion web UI
Browse Repository
No Builds
No Audits
90078fe06ea5 Clarify that 'order' is an optional parameter in Conduit API methods
Author
epriestley
Revisions
D13342: Clarify that 'order' is an optional parameter in Conduit API methods
Browse Repository
No Builds
No Audits
2eb73619d1c4 Truncate large strings in DarkConsole
Author
epriestley
Revisions
D13347: Truncate large strings in DarkConsole
Browse Repository
No Builds
No Audits
e291b906419a Format Calendar list objects
Author
lpriestley
Revisions
D13318: Format Calendar list objects
Browse Repository
No Builds
No Audits
9109cf62e464 More correct fix - set default value array() for `getParameter` call.
Author
lpriestley
Revisions
D13330: More correct fix - set default value array() for `getParameter` call.
Browse Repository
No Builds
Audited
7f6508af5a3d Add missing execution on archived task query
Author
joshuaspence
Revisions
D13335: Add missing execution on archived task query
Browse Repository
No Builds
No Audits
dad29171fffb Add more languages to syntax highlighting options
Author
joshuaspence
Revisions
D13337: Add more languages to syntax highlighting options
Browse Repository
No Builds
No Audits
46a225c7b1cb Quoted text remarkup should be smart enough to know when to add a '>' and when…
Author
lpriestley
Revisions
D13334: Quoted text remarkup should be smart enough to know when to add a '>' and when to add '> '
Browse Repository
No Builds
No Audits
e270157fcbd5 Fix a broken class name
Author
joshuaspence
Browse Repository
No Builds
Audited
4761cb8d7390 Use PhutilInvalidStateException
Author
joshuaspence
Revisions
D13327: Use PhutilInvalidStateException
Browse Repository
No Builds
No Audits

Changes (50)

Path

Size

resources/

celerity/

map.php

sql/

autopatches/

20150616.divinerrepository.sql

src/

__phutil_library_map__.php

aphront/

AphrontController.php

applications/

auth/

engine/

PhabricatorAuthInviteEngine.php

calendar/

controller/

PhabricatorCalendarEventEditController.php

PhabricatorCalendarEventViewController.php

query/

PhabricatorCalendarEventSearchEngine.php

storage/

PhabricatorCalendarEvent.php

conduit/

method/

ConduitAPIMethod.php

config/

option/

PhabricatorSyntaxHighlightingConfigOptions.php

conpherence/

view/

ConpherenceTransactionView.php

console/

core/

DarkConsoleCore.php

dashboard/

engine/

PhabricatorDashboardPanelRenderingEngine.php

diffusion/

conduit/

DiffusionFileContentQueryConduitAPIMethod.php

controller/

DiffusionBrowseFileController.php

query/

filecontent/

DiffusionFileContentQuery.php

diviner/

controller/

DivinerAtomController.php

DivinerBookController.php

DivinerBookEditController.php

publisher/

DivinerLivePublisher.php

DivinerPublisher.php

query/

DivinerAtomQuery.php

DivinerAtomSearchEngine.php

DivinerBookQuery.php

search/

DivinerAtomSearchIndexer.php

DivinerBookSearchIndexer.php

storage/

DivinerLiveBook.php

DivinerLiveSymbol.php

workflow/

DivinerGenerateWorkflow.php

drydock/

blueprint/

DrydockPreallocatedHostBlueprintImplementation.php

interface/

command/

DrydockSSHCommandInterface.php

owners/

query/

PhabricatorOwnersPackageQuery.php

PhabricatorOwnersPackageSearchEngine.php

typeahead/

PhabricatorOwnersPackageDatasource.php

people/

storage/

PhabricatorUser.php

repository/

storage/

PhabricatorRepository.php

infrastructure/

daemon/

workers/

PhabricatorWorker.php

markup/

PhabricatorMarkupEngine.php

storage/

management/

workflow/

PhabricatorStorageManagementProbeWorkflow.php

view/

form/

control/

AphrontFormDateControl.php

AphrontFormDateControlValue.php

AphrontFormPolicyControl.php

AphrontFormTokenizerControl.php

layout/

AphrontSideNavFilterView.php

PhabricatorActionListView.php

phui/

PHUITagView.php

calendar/

PHUICalendarListView.php

viewutils.php

webroot/

rsrc/

js/

core/

behavior-phabricator-remarkup-assist.js

rP7d7e13d79b86

View Options

resources/celerity/map.php

View Options

resources/sql/autopatches/20150616.divinerrepository.sql

View Options

src/__phutil_library_map__.php

View Options

src/aphront/AphrontController.php

View Options

src/applications/auth/engine/PhabricatorAuthInviteEngine.php

View Options

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

View Options

src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

View Options

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

View Options

src/applications/calendar/storage/PhabricatorCalendarEvent.php

View Options

src/applications/conduit/method/ConduitAPIMethod.php

View Options

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

View Options

src/applications/conpherence/view/ConpherenceTransactionView.php

View Options

src/applications/console/core/DarkConsoleCore.php

View Options

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

View Options

src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php

View Options

src/applications/diffusion/controller/DiffusionBrowseFileController.php

View Options

src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php

View Options

src/applications/diviner/controller/DivinerAtomController.php

View Options

src/applications/diviner/controller/DivinerBookController.php

View Options

src/applications/diviner/controller/DivinerBookEditController.php

View Options

src/applications/diviner/publisher/DivinerLivePublisher.php

View Options

src/applications/diviner/publisher/DivinerPublisher.php

View Options

src/applications/diviner/query/DivinerAtomQuery.php

View Options

src/applications/diviner/query/DivinerAtomSearchEngine.php

View Options

src/applications/diviner/query/DivinerBookQuery.php

View Options

src/applications/diviner/search/DivinerAtomSearchIndexer.php

View Options

src/applications/diviner/search/DivinerBookSearchIndexer.php

View Options

src/applications/diviner/storage/DivinerLiveBook.php

View Options

src/applications/diviner/storage/DivinerLiveSymbol.php

View Options

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

View Options

src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php

View Options

src/applications/drydock/interface/command/DrydockSSHCommandInterface.php

View Options

src/applications/owners/query/PhabricatorOwnersPackageQuery.php

View Options

src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php

View Options

src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php

View Options

src/applications/people/storage/PhabricatorUser.php

View Options

src/applications/repository/storage/PhabricatorRepository.php

View Options

src/infrastructure/daemon/workers/PhabricatorWorker.php

View Options

src/infrastructure/markup/PhabricatorMarkupEngine.php

View Options

src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php

View Options

src/view/form/control/AphrontFormDateControl.php

View Options

src/view/form/control/AphrontFormDateControlValue.php

View Options

src/view/form/control/AphrontFormPolicyControl.php

View Options

src/view/form/control/AphrontFormTokenizerControl.php

View Options

src/view/layout/AphrontSideNavFilterView.php

View Options

src/view/layout/PhabricatorActionListView.php

View Options

src/view/phui/PHUITagView.php

View Options

src/view/phui/calendar/PHUICalendarListView.php

View Options

src/view/viewutils.php

View Options

webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js

Merge branch 'master' into redesign-2015Audited7d7e13d79b86Actions

Description

Details

Event Timeline

Merged Changes

Changes (50)

rP7d7e13d79b86

resources/celerity/map.php

resources/sql/autopatches/20150616.divinerrepository.sql

src/__phutil_library_map__.php

src/aphront/AphrontController.php

src/applications/auth/engine/PhabricatorAuthInviteEngine.php

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

src/applications/calendar/storage/PhabricatorCalendarEvent.php

src/applications/conduit/method/ConduitAPIMethod.php

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

src/applications/conpherence/view/ConpherenceTransactionView.php

src/applications/console/core/DarkConsoleCore.php

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php

src/applications/diffusion/controller/DiffusionBrowseFileController.php

src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php

src/applications/diviner/controller/DivinerAtomController.php

src/applications/diviner/controller/DivinerBookController.php

src/applications/diviner/controller/DivinerBookEditController.php

src/applications/diviner/publisher/DivinerLivePublisher.php

src/applications/diviner/publisher/DivinerPublisher.php

src/applications/diviner/query/DivinerAtomQuery.php

src/applications/diviner/query/DivinerAtomSearchEngine.php

src/applications/diviner/query/DivinerBookQuery.php

src/applications/diviner/search/DivinerAtomSearchIndexer.php

src/applications/diviner/search/DivinerBookSearchIndexer.php

src/applications/diviner/storage/DivinerLiveBook.php

src/applications/diviner/storage/DivinerLiveSymbol.php

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php

src/applications/drydock/interface/command/DrydockSSHCommandInterface.php

src/applications/owners/query/PhabricatorOwnersPackageQuery.php

src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php

src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php

src/applications/people/storage/PhabricatorUser.php

src/applications/repository/storage/PhabricatorRepository.php

src/infrastructure/daemon/workers/PhabricatorWorker.php

src/infrastructure/markup/PhabricatorMarkupEngine.php

src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php

src/view/form/control/AphrontFormDateControl.php

src/view/form/control/AphrontFormDateControlValue.php

src/view/form/control/AphrontFormPolicyControl.php

src/view/form/control/AphrontFormTokenizerControl.php

src/view/layout/AphrontSideNavFilterView.php

src/view/layout/PhabricatorActionListView.php

src/view/phui/PHUITagView.php

src/view/phui/calendar/PHUICalendarListView.php

src/view/viewutils.php

webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js

Merge branch 'master' into redesign-2015
Audited7d7e13d79b86
Actions