Merge branch 'master' into phutil_tag
7ec8e885e1a7
Actions

Description

Merge branch 'master' into phutil_tag

(Final final sync.)

Details

Provenance

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

Parents

rP51947ac332b0: Make diviner documentation generation book-oriented
rPd817dfa8fcce: Convert some phutil_escape_html() to hsprintf()

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

51947ac332b0 Make diviner documentation generation book-oriented
Author
epriestley
Browse Repository
No Builds
No Audits
6e5d8d45770e Fix documentation to require "sudo" for bin/aphlict
Author
epriestley
Browse Repository
No Builds
No Audits
51dfeb795004 pht for phriction
Author
Chad Little
Browse Repository
No Builds
No Audits
9c19e9b7d869 Preserving the Animation of Gif Images
Author
Afaque Hussain
Browse Repository
No Builds
No Audits
cc084822dabb Remove panel background in Phriction
Author
Chad Little
Browse Repository
No Builds
No Audits
bed728f23e8e Show saved inline comments
Author
Lauri-Henrik Jalonen
Browse Repository
No Builds
No Audits
7063ee638e0a Pass actor to revision unsubscriber editor
Author
vrana
Browse Repository
No Builds
No Audits
714a3cc5369c Catch exception in differential
Author
Nick Harper
Browse Repository
No Builds
No Audits
275f708f1447 Conpherence - make messages to btrahan@metamta.domain start conpherences
Author
Bob Trahan
Browse Repository
No Builds
No Audits
4cafbbc525f7 Fix IE7 and IE8 issues.
Author
Chad Little
Browse Repository
No Builds
No Audits
07f72cf4635c Fix conpherence name clearing bug
Author
Bob Trahan
Browse Repository
No Builds
No Audits
56c8387403aa rebuild celerity map - conpherence wasn't working.
Author
Bob Trahan
Browse Repository
No Builds
No Audits
5f9a06333356 Use some HTTPSFuture in CampfireBot
Author
epriestley
Browse Repository
No Builds
No Audits

Changes (36)

Path

Size

conf/

default.conf.php

src/

__celerity_resource_map__.php

__phutil_library_map__.php

applications/

config/

check/

PhabricatorSetupCheckImagemagick.php

option/

PhabricatorCoreConfigOptions.php

conpherence/

controller/

ConpherenceUpdateController.php

mail/

ConpherenceReplyHandler.php

storage/

ConpherenceTransaction.php

differential/

DifferentialReplyHandler.php

controller/

DifferentialSubscribeController.php

editor/

DifferentialRevisionEditor.php

view/

DifferentialChangesetListView.php

diviner/

workflow/

DivinerGenerateWorkflow.php

DivinerWorkflow.php

files/

PhabricatorImageTransformer.php

config/

PhabricatorFilesConfigOptions.php

meta/

view/

PhabricatorApplicationLaunchView.php

metamta/

storage/

PhabricatorMetaMTAReceivedMail.php

pholio/

application/

PhabricatorApplicationPholio.php

controller/

PholioInlineController.php

phriction/

application/

PhabricatorApplicationPhriction.php

controller/

PhrictionController.php

PhrictionDeleteController.php

PhrictionDiffController.php

PhrictionDocumentController.php

PhrictionEditController.php

PhrictionHistoryController.php

PhrictionListController.php

storage/

PhrictionContent.php

docs/

book

user.book

userguide/

notifications.diviner

infrastructure/

daemon/

bot/

adapter/

PhabricatorCampfireProtocolAdapter.php

view/

form/

control/

AphrontFormSubmitControl.php

webroot/

rsrc/

css/

core/

core.css

js/

application/

pholio/

behavior-pholio-mock-view.js

rP7ec8e885e1a7

View Options

conf/default.conf.php

View Options

src/__celerity_resource_map__.php

View Options

src/__phutil_library_map__.php

View Options

src/applications/config/check/PhabricatorSetupCheckImagemagick.php

View Options

src/applications/config/option/PhabricatorCoreConfigOptions.php

View Options

src/applications/conpherence/controller/ConpherenceUpdateController.php

View Options

src/applications/conpherence/mail/ConpherenceReplyHandler.php

View Options

src/applications/conpherence/storage/ConpherenceTransaction.php

View Options

src/applications/differential/DifferentialReplyHandler.php

View Options

src/applications/differential/controller/DifferentialSubscribeController.php

View Options

src/applications/differential/editor/DifferentialRevisionEditor.php

View Options

src/applications/differential/view/DifferentialChangesetListView.php

View Options

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

View Options

src/applications/diviner/workflow/DivinerWorkflow.php

View Options

src/applications/files/PhabricatorImageTransformer.php

View Options

src/applications/files/config/PhabricatorFilesConfigOptions.php

View Options

src/applications/meta/view/PhabricatorApplicationLaunchView.php

View Options

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

View Options

src/applications/pholio/application/PhabricatorApplicationPholio.php

View Options

src/applications/pholio/controller/PholioInlineController.php

View Options

src/applications/phriction/application/PhabricatorApplicationPhriction.php

View Options

src/applications/phriction/controller/PhrictionController.php

View Options

src/applications/phriction/controller/PhrictionDeleteController.php

View Options

src/applications/phriction/controller/PhrictionDiffController.php

View Options

src/applications/phriction/controller/PhrictionDocumentController.php

View Options

src/applications/phriction/controller/PhrictionEditController.php

View Options

src/applications/phriction/controller/PhrictionHistoryController.php

View Options

src/applications/phriction/controller/PhrictionListController.php

View Options

src/applications/phriction/storage/PhrictionContent.php

View Options

src/docs/book/user.book

View Options

src/docs/userguide/notifications.diviner

View Options

src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php

View Options

src/view/form/control/AphrontFormSubmitControl.php

View Options

webroot/rsrc/css/core/core.css

View Options

webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js

Merge branch 'master' into phutil_tag7ec8e885e1a7Actions

Description

Details

Event Timeline

Merged Changes

Changes (36)

rP7ec8e885e1a7

conf/default.conf.php

src/__celerity_resource_map__.php

src/__phutil_library_map__.php

src/applications/config/check/PhabricatorSetupCheckImagemagick.php

src/applications/config/option/PhabricatorCoreConfigOptions.php

src/applications/conpherence/controller/ConpherenceUpdateController.php

src/applications/conpherence/mail/ConpherenceReplyHandler.php

src/applications/conpherence/storage/ConpherenceTransaction.php

src/applications/differential/DifferentialReplyHandler.php

src/applications/differential/controller/DifferentialSubscribeController.php

src/applications/differential/editor/DifferentialRevisionEditor.php

src/applications/differential/view/DifferentialChangesetListView.php

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

src/applications/diviner/workflow/DivinerWorkflow.php

src/applications/files/PhabricatorImageTransformer.php

src/applications/files/config/PhabricatorFilesConfigOptions.php

src/applications/meta/view/PhabricatorApplicationLaunchView.php

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

src/applications/pholio/application/PhabricatorApplicationPholio.php

src/applications/pholio/controller/PholioInlineController.php

src/applications/phriction/application/PhabricatorApplicationPhriction.php

src/applications/phriction/controller/PhrictionController.php

src/applications/phriction/controller/PhrictionDeleteController.php

src/applications/phriction/controller/PhrictionDiffController.php

src/applications/phriction/controller/PhrictionDocumentController.php

src/applications/phriction/controller/PhrictionEditController.php

src/applications/phriction/controller/PhrictionHistoryController.php

src/applications/phriction/controller/PhrictionListController.php

src/applications/phriction/storage/PhrictionContent.php

src/docs/book/user.book

src/docs/userguide/notifications.diviner

src/infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php

src/view/form/control/AphrontFormSubmitControl.php

webroot/rsrc/css/core/core.css

webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js

Merge branch 'master' into phutil_tag
7ec8e885e1a7
Actions