Paths

Table of Contentst

-
conf/
-
default.conf.php
-
resources/
-
ircbot/
-
example_config.json
-
sql/patches/
-
patches/
-
20130131.conpherencepics.sql
-
src/
-
__celerity_resource_map__.php
-
__phutil_library_map__.php
-
applications/
-
audit/
-
application/
-
PhabricatorApplicationAudit.php
-
events/
-
AuditPeopleMenuEventListener.php
-
config/check/
-
check/
-
PhabricatorSetupCheckDatabase.php
-
PhabricatorSetupCheckMySQL.php
-
conpherence/
-
application/
-
PhabricatorApplicationConpherence.php
-
constants/
-
ConpherenceImageData.php
-
ConpherenceTransactionType.php
-
controller/
-
ConpherenceController.php
-
ConpherenceUpdateController.php
-
ConpherenceViewController.php
-
editor/
-
ConpherenceEditor.php
-
events/
-
ConpherencePeopleMenuEventListener.php
-
query/
-
ConpherenceThreadQuery.php
-
storage/
-
ConpherenceThread.php
-
ConpherenceTransaction.php
-
view/
-
ConpherenceFormDragAndDropUploadControl.php
-
ConpherenceTransactionView.php
-
differential/
-
application/
-
PhabricatorApplicationDifferential.php
-
conduit/
-
ConduitAPI_differential_getdiff_Method.php
-
config/
-
PhabricatorDifferentialConfigOptions.php
-
events/
-
DifferentialPeopleMenuEventListener.php
-
storage/
-
DifferentialDiff.php
-
diffusion/
-
application/
-
PhabricatorApplicationDiffusion.php
-
events/
-
DiffusionPeopleMenuEventListener.php
-
files/
-
PhabricatorImageTransformer.php
-
engine/
-
PhabricatorTestStorageEngine.php
-
storage/
-
PhabricatorFile.php
-
__tests__/
-
PhabricatorFileTestCase.php
-
maniphest/
-
application/
-
PhabricatorApplicationManiphest.php
-
event/
-
ManiphestPeopleMenuEventListener.php
-
oauthserver/controller/
-
controller/
-
PhabricatorOAuthServerAuthController.php
-
people/controller/
-
controller/
-
PhabricatorPeopleProfileController.php
-
phid/handle/
-
handle/
-
PhabricatorObjectHandleData.php
-
pholio/
-
application/
-
PhabricatorApplicationPholio.php
-
constants/
-
PholioTransactionType.php
-
controller/
-
PholioInlineSaveController.php
-
PholioMockCommentController.php
-
editor/
-
PholioMockEditor.php
-
view/
-
PholioMockImagesView.php
-
transactions/editor/
-
editor/
-
PhabricatorApplicationTransactionCommentEditor.php
-
infrastructure/
-
daemon/
-
bot/
-
PhabricatorBot.php
-
PhabricatorBotMessage.php
-
PhabricatorIRCBot.php
-
adapter/
-
PhabricatorBaseProtocolAdapter.php
-
PhabricatorCampfireProtocolAdapter.php
-
PhabricatorIRCProtocolAdapter.php
-
handler/
-
PhabricatorBotDebugLogHandler.php
-
PhabricatorBotDifferentialNotificationHandler.php
-
PhabricatorBotFeedNotificationHandler.php
-
PhabricatorBotHandler.php
-
PhabricatorBotLogHandler.php
-
PhabricatorBotMacroHandler.php
-
PhabricatorBotObjectNameHandler.php
-
PhabricatorBotSymbolHandler.php
-
PhabricatorBotWhatsNewHandler.php
-
PhabricatorIRCProtocolHandler.php
-
irc/
-
PhabricatorIRCBot.php
-
PhabricatorIRCMessage.php
-
handler/
-
PhabricatorIRCDifferentialNotificationHandler.php
-
PhabricatorIRCFeedNotificationHandler.php
-
PhabricatorIRCHandler.php
-
PhabricatorIRCLogHandler.php
-
PhabricatorIRCMacroHandler.php
-
PhabricatorIRCObjectNameHandler.php
-
PhabricatorIRCProtocolHandler.php
-
PhabricatorIRCSymbolHandler.php
-
PhabricatorIRCWhatsNewHandler.php
-
events/constant/
-
constant/
-
PhabricatorEventType.php
-
markup/rule/
-
rule/
-
PhabricatorRemarkupRuleEmbedFile.php
-
storage/patch/
-
patch/
-
PhabricatorBuiltinPatchList.php
-
view/
-
form/control/
-
control/
-
AphrontFormCropControl.php
-
layout/
-
PhabricatorMenuView.php
-
webroot/rsrc/
-
rsrc/
-
css/
-
aphront/
-
form-view.css
-
application/
-
conpherence/
-
header-pane.css
-
update.css
-
pholio/
-
pholio.css
-
js/application/
-
application/
-
conpherence/
-
behavior-drag-and-drop-photo.js
-
behavior-menu.js
-
core/
-
behavior-crop.js
-
pholio/
-
behavior-pholio-mock-view.js

Diffusion Phorge 11bb8db9705d

Merge branch 'master' into phutil_tag
11bb8db9705d
Actions

Description

Merge branch 'master' into phutil_tag

(Sync.)

Details

Provenance

epriestley	Authored on Feb 7 2013, 8:08 AM
themackabu	Pushed on Mar 25 2025, 8:07 PM

Parents

rP3ce3f5d36803: Drafts are saved as inline comments for images when user comments mock
rPf864d9e61132: Fix double escaping in phutil_tag

Branches

Tags

Event Timeline

Merged Changes

3ce3f5d36803 Drafts are saved as inline comments for images when user comments mock
Author
Lauri-Henrik Jalonen
Browse Repository
No Builds
No Audits
431e2bee6e7c First (rough) pass at campfire protocol adapter for bot.
Author
indiefan
Browse Repository
No Builds
No Audits
4004621d76be Make Pholio selection reticle prettier
Author
epriestley
Browse Repository
No Builds
No Audits
5b39bbe71b20 Batch Conpherence access to markup cache
Author
epriestley
Browse Repository
No Builds
No Audits
68814d4ecab0 add conpherence schema patch to the list so it runs
Author
Bob Trahan
Browse Repository
No Builds
No Audits
6a23cc1677f5 fix derp from rP84efcb86698a00f863dbdb4cbd4c149c96e498dc i missed
Author
Bob Trahan
Browse Repository
No Builds
No Audits
1cde41b9946c Conpherence - add crop
Author
Bob Trahan
Browse Repository
No Builds
No Audits
fb7d5d17a2be Don't do image stuff with unviewable images
Author
Edward Speyer
Browse Repository
No Builds
No Audits
361ce491f201 Make file storage more testable
Author
epriestley
Browse Repository
No Builds
No Audits
e518135dfb54 Improve STRICT_ALL_TABLES warning
Author
epriestley
Browse Repository
No Builds
No Audits
84efcb86698a Minor, fix an issue with PhabricatorMenuView and default null keys.
Author
epriestley
Browse Repository
No Builds
No Audits
57c001f52244 Select portions from mock
Author
Lauri-Henrik Jalonen
Browse Repository
No Builds
No Audits
1188876ea92f Fix exception in OAuthServerAuthController
Author
Toby Hughes
Browse Repository
No Builds
No Audits
f912fa1ab799 Minor, fix celerity map.
Author
epriestley
Browse Repository
No Builds
No Audits
24ced7e7bd79 Expose commit information via conduit instead of user information
Author
epriestley
Browse Repository
No Builds
No Audits
574bc3ba31cc First pass at decoupling Phabricator bot behavior from the protocol it's…
Author
indiefan
Browse Repository
No Builds
No Audits
cb38ab27ce8a fix find / replace error from addressing feedback in D4708. now links to tasks…
Author
Bob Trahan
Browse Repository
No Builds
No Audits
1d0058abcf24 Update PeopleMenu to only show integration with applications if they are…
Author
Bob Trahan
Browse Repository
No Builds
No Audits
34b6c32d2eb5 fix conpherence menu selection
Author
Bob Trahan
Browse Repository
No Builds
No Audits

Changes (95)

Path

Size

conf/

default.conf.php

resources/

ircbot/

example_config.json

sql/

patches/

20130131.conpherencepics.sql

src/

__celerity_resource_map__.php

__phutil_library_map__.php

applications/

audit/

application/

PhabricatorApplicationAudit.php

events

AuditPeopleMenuEventListener.php

config/

check/

PhabricatorSetupCheckDatabase.php

PhabricatorSetupCheckMySQL.php

conpherence/

application/

PhabricatorApplicationConpherence.php

constants/

ConpherenceImageData.php

ConpherenceTransactionType.php

controller/

ConpherenceController.php

ConpherenceUpdateController.php

ConpherenceViewController.php

editor/

ConpherenceEditor.php

events

ConpherencePeopleMenuEventListener.php

query/

ConpherenceThreadQuery.php

storage/

ConpherenceThread.php

ConpherenceTransaction.php

view/

ConpherenceFormDragAndDropUploadControl.php

ConpherenceTransactionView.php

differential/

application/

PhabricatorApplicationDifferential.php

conduit/

ConduitAPI_differential_getdiff_Method.php

config/

PhabricatorDifferentialConfigOptions.php

events

DifferentialPeopleMenuEventListener.php

storage/

DifferentialDiff.php

diffusion/

application/

PhabricatorApplicationDiffusion.php

events

DiffusionPeopleMenuEventListener.php

files/

PhabricatorImageTransformer.php

engine/

PhabricatorTestStorageEngine.php

storage/

PhabricatorFile.php

__tests__

PhabricatorFileTestCase.php

maniphest/

application/

PhabricatorApplicationManiphest.php

event/

ManiphestPeopleMenuEventListener.php

oauthserver/

controller/

PhabricatorOAuthServerAuthController.php

people/

controller/

PhabricatorPeopleProfileController.php

phid/

handle/

PhabricatorObjectHandleData.php

pholio/

application/

PhabricatorApplicationPholio.php

constants/

PholioTransactionType.php

controller/

PholioInlineSaveController.php

PholioMockCommentController.php

editor/

PholioMockEditor.php

view/

PholioMockImagesView.php

transactions/

editor/

PhabricatorApplicationTransactionCommentEditor.php

infrastructure/

daemon/

bot

PhabricatorBot.php

PhabricatorBotMessage.php

PhabricatorIRCBot.php

adapter

PhabricatorBaseProtocolAdapter.php

PhabricatorCampfireProtocolAdapter.php

PhabricatorIRCProtocolAdapter.php

handler

PhabricatorBotDebugLogHandler.php

PhabricatorBotHandler.php

PhabricatorBotObjectNameHandler.php

PhabricatorBotSymbolHandler.php

PhabricatorIRCProtocolHandler.php

	bot/	handler/
	irc/	handler/

	PhabricatorBotDifferentialNotificationHandler.php
	PhabricatorIRCDifferentialNotificationHandler.php

	PhabricatorBotFeedNotificationHandler.php
	PhabricatorIRCFeedNotificationHandler.php

	PhabricatorBotLogHandler.php
	PhabricatorIRCLogHandler.php

	PhabricatorBotMacroHandler.php
	PhabricatorIRCMacroHandler.php

	PhabricatorBotWhatsNewHandler.php
	PhabricatorIRCWhatsNewHandler.php

irc

PhabricatorIRCBot.php

PhabricatorIRCMessage.php

handler

PhabricatorIRCDifferentialNotificationHandler.php

PhabricatorIRCFeedNotificationHandler.php

PhabricatorIRCHandler.php

PhabricatorIRCLogHandler.php

PhabricatorIRCMacroHandler.php

PhabricatorIRCObjectNameHandler.php

PhabricatorIRCProtocolHandler.php

PhabricatorIRCSymbolHandler.php

PhabricatorIRCWhatsNewHandler.php

events/

constant/

PhabricatorEventType.php

markup/

rule/

PhabricatorRemarkupRuleEmbedFile.php

storage/

patch/

PhabricatorBuiltinPatchList.php

view/

form/

control/

AphrontFormCropControl.php

layout/

PhabricatorMenuView.php

webroot/

rsrc/

css/

aphront/

form-view.css

application/

conpherence/

header-pane.css

update.css

pholio/

pholio.css

js/

application/

conpherence/

behavior-drag-and-drop-photo.js

behavior-menu.js

core/

behavior-crop.js

pholio/

behavior-pholio-mock-view.js

rP11bb8db9705d

View Options

conf/default.conf.php

View Options

resources/ircbot/example_config.json

View Options

resources/sql/patches/20130131.conpherencepics.sql

View Options

src/__celerity_resource_map__.php

View Options

src/__phutil_library_map__.php

View Options

src/applications/audit/application/PhabricatorApplicationAudit.php

View Options

src/applications/audit/events/AuditPeopleMenuEventListener.php

View Options

src/applications/config/check/PhabricatorSetupCheckDatabase.php

View Options

src/applications/config/check/PhabricatorSetupCheckMySQL.php

View Options

src/applications/conpherence/application/PhabricatorApplicationConpherence.php

View Options

src/applications/conpherence/constants/ConpherenceImageData.php

View Options

src/applications/conpherence/constants/ConpherenceTransactionType.php

View Options

src/applications/conpherence/controller/ConpherenceController.php

View Options

src/applications/conpherence/controller/ConpherenceUpdateController.php

View Options

src/applications/conpherence/controller/ConpherenceViewController.php

View Options

src/applications/conpherence/editor/ConpherenceEditor.php

View Options

src/applications/conpherence/events/ConpherencePeopleMenuEventListener.php

View Options

src/applications/conpherence/query/ConpherenceThreadQuery.php

View Options

src/applications/conpherence/storage/ConpherenceThread.php

View Options

src/applications/conpherence/storage/ConpherenceTransaction.php

View Options

src/applications/conpherence/view/ConpherenceFormDragAndDropUploadControl.php

View Options

src/applications/conpherence/view/ConpherenceTransactionView.php

View Options

src/applications/differential/application/PhabricatorApplicationDifferential.php

View Options

src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php

View Options

src/applications/differential/config/PhabricatorDifferentialConfigOptions.php

View Options

src/applications/differential/events/DifferentialPeopleMenuEventListener.php

View Options

src/applications/differential/storage/DifferentialDiff.php

View Options

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

View Options

src/applications/diffusion/events/DiffusionPeopleMenuEventListener.php

View Options

src/applications/files/PhabricatorImageTransformer.php

View Options

src/applications/files/engine/PhabricatorTestStorageEngine.php

View Options

src/applications/files/storage/PhabricatorFile.php

View Options

src/applications/files/storage/tests/PhabricatorFileTestCase.php

View Options

src/applications/maniphest/application/PhabricatorApplicationManiphest.php

View Options

src/applications/maniphest/event/ManiphestPeopleMenuEventListener.php

View Options

src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php

View Options

src/applications/people/controller/PhabricatorPeopleProfileController.php

View Options

src/applications/phid/handle/PhabricatorObjectHandleData.php

View Options

src/applications/pholio/application/PhabricatorApplicationPholio.php

View Options

src/applications/pholio/constants/PholioTransactionType.php

View Options

src/applications/pholio/controller/PholioInlineSaveController.php

View Options

src/applications/pholio/controller/PholioMockCommentController.php

View Options

src/applications/pholio/editor/PholioMockEditor.php

View Options

src/applications/pholio/view/PholioMockImagesView.php

View Options

src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php

View Options

src/infrastructure/daemon/bot/PhabricatorBot.php

View Options

src/infrastructure/daemon/bot/PhabricatorBotMessage.php

View Options

src/infrastructure/daemon/bot/PhabricatorIRCBot.php

View Options

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

View Options

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

View Options

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

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotDebugLogHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotDifferentialNotificationHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php

View Options

src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php

View Options

src/infrastructure/daemon/irc

View Options

src/infrastructure/daemon/irc/PhabricatorIRCBot.php

View Options

src/infrastructure/daemon/irc/PhabricatorIRCMessage.php

View Options

src/infrastructure/daemon/irc/handler

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCFeedNotificationHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCSymbolHandler.php

View Options

src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php

View Options

src/infrastructure/events/constant/PhabricatorEventType.php

View Options

src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php

View Options

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

View Options

src/view/form/control/AphrontFormCropControl.php

View Options

src/view/layout/PhabricatorMenuView.php

View Options

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

View Options

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

View Options

webroot/rsrc/css/application/conpherence/update.css

View Options

webroot/rsrc/css/application/pholio/pholio.css

View Options

webroot/rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js

View Options

webroot/rsrc/js/application/conpherence/behavior-menu.js

View Options

webroot/rsrc/js/application/core/behavior-crop.js

View Options

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

Merge branch 'master' into phutil_tag11bb8db9705dActions

Description

Details

Event Timeline

Merged Changes

Changes (95)

rP11bb8db9705d

conf/default.conf.php

resources/ircbot/example_config.json

resources/sql/patches/20130131.conpherencepics.sql

src/__celerity_resource_map__.php

src/__phutil_library_map__.php

src/applications/audit/application/PhabricatorApplicationAudit.php

src/applications/audit/events/AuditPeopleMenuEventListener.php

src/applications/config/check/PhabricatorSetupCheckDatabase.php

src/applications/config/check/PhabricatorSetupCheckMySQL.php

src/applications/conpherence/application/PhabricatorApplicationConpherence.php

src/applications/conpherence/constants/ConpherenceImageData.php

src/applications/conpherence/constants/ConpherenceTransactionType.php

src/applications/conpherence/controller/ConpherenceController.php

src/applications/conpherence/controller/ConpherenceUpdateController.php

src/applications/conpherence/controller/ConpherenceViewController.php

src/applications/conpherence/editor/ConpherenceEditor.php

src/applications/conpherence/events/ConpherencePeopleMenuEventListener.php

src/applications/conpherence/query/ConpherenceThreadQuery.php

src/applications/conpherence/storage/ConpherenceThread.php

src/applications/conpherence/storage/ConpherenceTransaction.php

src/applications/conpherence/view/ConpherenceFormDragAndDropUploadControl.php

src/applications/conpherence/view/ConpherenceTransactionView.php

src/applications/differential/application/PhabricatorApplicationDifferential.php

src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php

src/applications/differential/config/PhabricatorDifferentialConfigOptions.php

src/applications/differential/events/DifferentialPeopleMenuEventListener.php

src/applications/differential/storage/DifferentialDiff.php

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

src/applications/diffusion/events/DiffusionPeopleMenuEventListener.php

src/applications/files/PhabricatorImageTransformer.php

src/applications/files/engine/PhabricatorTestStorageEngine.php

src/applications/files/storage/PhabricatorFile.php

src/applications/files/storage/__tests__/PhabricatorFileTestCase.php

src/applications/maniphest/application/PhabricatorApplicationManiphest.php

src/applications/maniphest/event/ManiphestPeopleMenuEventListener.php

src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php

src/applications/people/controller/PhabricatorPeopleProfileController.php

src/applications/phid/handle/PhabricatorObjectHandleData.php

src/applications/pholio/application/PhabricatorApplicationPholio.php

src/applications/pholio/constants/PholioTransactionType.php

src/applications/pholio/controller/PholioInlineSaveController.php

src/applications/pholio/controller/PholioMockCommentController.php

src/applications/pholio/editor/PholioMockEditor.php

src/applications/pholio/view/PholioMockImagesView.php

src/applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php

src/infrastructure/daemon/bot/PhabricatorBot.php

src/infrastructure/daemon/bot/PhabricatorBotMessage.php

src/infrastructure/daemon/bot/PhabricatorIRCBot.php

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

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

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

src/infrastructure/daemon/bot/handler/PhabricatorBotDebugLogHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotDifferentialNotificationHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php

src/infrastructure/daemon/bot/handler/PhabricatorIRCProtocolHandler.php

src/infrastructure/daemon/irc

src/infrastructure/daemon/irc/PhabricatorIRCBot.php

src/infrastructure/daemon/irc/PhabricatorIRCMessage.php

src/infrastructure/daemon/irc/handler

src/infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCFeedNotificationHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php

src/infrastructure/daemon/irc/handler/PhabricatorIRCSymbolHandler.php

Merge branch 'master' into phutil_tag
11bb8db9705d
Actions

src/applications/files/storage/tests/PhabricatorFileTestCase.php