Diffusion Phabricator f9030885c414

Merge branch 'master' into phutil_tag
Auditedf9030885c414
Actions

Description

Merge branch 'master' into phutil_tag

(Just synchronizing master into the tag branch.)

Details

Group Auditors

Cowboy Commits

Provenance

epriestley

Authored on

Parents

rPba3b7854fccc: Documentation fix
rPa1ff679f41f8: Fix AphrontCrumbView (phutil_tag)

Branches

Unknown

Tags

Unknown

Event Timeline

vrana accepted this commit.Jan 29 2013, 12:58 AM

Merged Changes

ba3b7854fccc Documentation fix
Author
ljalonen
Browse Repository
No Builds
No Audits
24b274ded334 Conpherence - make attaching files work better
Author
btrahan
Browse Repository
No Builds
No Audits
c046aa64c16c realized should probably wrap this in idx... and i haven't cowboy committed in…
Author
btrahan
Browse Repository
No Builds
Audited
ad29c986109e Remarkup - add as much image dimension hinting as possible
Author
btrahan
Browse Repository
No Builds
No Audits
22ce74c5a88d Conpherence - fix unread counts
Author
btrahan
Browse Repository
No Builds
No Audits
9437bc019d79 Conpherence - make updating title + picture a dialogue that uses drag and drop…
Author
btrahan
Browse Repository
No Builds
No Audits
64543a9476b4 attempt 3 at fixing conpherence mail handler
Author
btrahan
Browse Repository
No Builds
No Audits
dca2048bab28 Notifcation icons for Conpherence
Author
chad
Browse Repository
No Builds
No Audits
251a7b060224 Reasonable pht pass at auth.
Author
chad
Browse Repository
No Builds
No Audits
5cb8787d9183 Removed psth column from herald transcript
Author
ljalonen
Browse Repository
No Builds
No Audits
1670f5841ddc Set messageIDHash from SendGrid and Test controllers
Author
epriestley
Browse Repository
No Builds
No Audits
3f91559b8a01 fix mail handler for conpherence try 2
Author
btrahan
Browse Repository
No Builds
No Audits
ab80d522902a Shorten text area in conpherence.
Author
chad
Browse Repository
No Builds
No Audits
3a4e0045be4d make conpherence reply handler work
Author
btrahan
Browse Repository
No Builds
No Audits
323cd8251897 Entries, not entry.
Author
codeblock
Browse Repository
No Builds
Audited
f6622f43e6d1 Replace all array_combine(x, x) with array_fuse(x) in Phabricator
Author
epriestley
Browse Repository
No Builds
No Audits
4d22c9104f16 Conpherence - reply handler integration
Author
btrahan
Browse Repository
No Builds
No Audits
e344f57df116 Conpherence CSS tweaks.
Author
chad
Browse Repository
No Builds
Audited
d980adfe3f57 Don't do string concatenation in queryfx_all()
Author
nh
Browse Repository
No Builds
No Audits
48c53561118e Tweak spacing a little more on ObjectList
Author
chad
Browse Repository
No Builds
No Audits
4ae548f9ba70 Reduce vertical height on object list.
Author
chad
Browse Repository
No Builds
No Audits
564d92665027 Conpherence Icons
Author
chad
Browse Repository
No Builds
No Audits
3838e14ad895 Enhanced PholioMockQuery
Author
ljalonen
Browse Repository
No Builds
No Audits
9d23a49c919d random cleanup from long ago
Author
btrahan
Browse Repository
No Builds
No Audits
b7f7b8aff0fe Conpherence - hide file transactions
Author
btrahan
Browse Repository
No Builds
No Audits
cf346d3c8152 T2385: Add "Delete Document" action to Phriction pages
Author
vedharaju
Browse Repository
No Builds
No Audits
cf7534f9719b Minor, fix formatting in configuration doc.
Author
epriestley
Browse Repository
No Builds
Audited
bf3d972e7296 Add setStackable to ObjectItemList and use in Config
Author
chad
Browse Repository
No Builds
No Audits

Changes (108)

Path

Size

resources/

sprite/

apps_blue_2x/

conpherence.png

apps_blue_4x/

conpherence.png

apps_dark_1x/

	conpherence.png
	setup.png

apps_dark_2x/

apps_dark_4x/

apps_glow_2x/

apps_glow_4x/

apps_lb_2x/

apps_lb_4x/

manifest/

menu_1x/

	conf-hover.png
	seen_read_all.png

	conf-off.png
	seen_read_all.png

	conf-unseen.png
	seen_read_all.png

	menu_2x/
	icons_grey_2x/

	conf-hover.png
	none.png

	conf-off.png
	none.png

	conf-unseen.png
	none.png

sql/

patches/

20130127.altheraldtranscript.sql

src/

__celerity_resource_map__.php

__phutil_library_map__.php

applications/

auth/

controller/

PhabricatorAuthController.php

PhabricatorDisabledUserController.php

PhabricatorEmailLoginController.php

PhabricatorEmailTokenController.php

PhabricatorLDAPLoginController.php

PhabricatorLDAPRegistrationController.php

PhabricatorLDAPUnlinkController.php

PhabricatorLoginController.php

PhabricatorLoginValidateController.php

PhabricatorLogoutController.php

PhabricatorMustVerifyEmailController.php

PhabricatorOAuthLoginController.php

PhabricatorOAuthUnlinkController.php

oauthregistration/

PhabricatorOAuthDefaultRegistrationController.php

view/

PhabricatorOAuthFailureView.php

config/

controller/

PhabricatorConfigAllController.php

PhabricatorConfigGroupController.php

PhabricatorConfigIssueListController.php

PhabricatorConfigListController.php

option/

PhabricatorMetaMTAConfigOptions.php

conpherence/

config

ConpherenceConfigOptions.php

controller/

ConpherenceController.php

ConpherenceListController.php

ConpherenceNewController.php

ConpherenceUpdateController.php

ConpherenceViewController.php

editor/

ConpherenceEditor.php

mail

ConpherenceReplyHandler.php

storage/

ConpherenceParticipant.php

ConpherenceThread.php

ConpherenceTransaction.php

differential/

editor/

DifferentialCommentEditor.php

macro/

controller/

PhabricatorMacroListController.php

metamta/

controller/

PhabricatorMetaMTAReceiveController.php

PhabricatorMetaMTASendGridReceiveController.php

replyhandler/

PhabricatorMailReplyHandler.php

storage/

PhabricatorMetaMTAMail.php

PhabricatorMetaMTAReceivedMail.php

phid/

handle/

PhabricatorObjectHandleData.php

pholio/

controller/

PholioMockListController.php

PholioMockViewController.php

query/

PholioMockQuery.php

storage/

PholioImage.php

PholioMock.php

view/

PholioMockImagesView.php

phortune/

control/

PhortuneMonthYearExpiryControl.php

phriction/

controller/

PhrictionDocumentController.php

PhrictionEditController.php

settings/

panel/

PhabricatorSettingsPanelAccount.php

transactions/

editor/

PhabricatorApplicationTransactionEditor.php

docs/

developer/

database.diviner

userguide/

advanced_configuration.diviner

infrastructure/

celerity/

CeleritySpriteGenerator.php

daemon/

workers/

PhabricatorWorker.php

markup/

rule/

PhabricatorRemarkupRuleEmbedFile.php

PhabricatorRemarkupRuleImageMacro.php

storage/

patch/

PhabricatorBuiltinPatchList.php

view/

form/

AphrontErrorView.php

control/

AphrontFormDateControl.php

layout/

PhabricatorObjectItemListView.php

PhabricatorObjectItemView.php

page/

menu/

PhabricatorMainMenuView.php

webroot/

rsrc/

css/

aphront/

error-view.css

application/

base/

config/

conpherence/

layout/

phabricator-object-item-list-view.css

phabricator-source-code-view.css

sprite-apps-large.css

image/

sprite-apps-large-X2.png

sprite-apps-large.png

sprite-apps.png

sprite-menu-X2.png

sprite-menu.png

js/

application/

core/

behavior-drag-and-drop.js

rPf9030885c414

View Options

resources/sprite/apps_blue_2x/conpherence.png

View Options

resources/sprite/apps_blue_4x/conpherence.png

View Options

resources/sprite/apps_dark_1x/conpherence.png

View Options

resources/sprite/apps_dark_2x/conpherence.png

View Options

resources/sprite/apps_dark_4x/conpherence.png

View Options

resources/sprite/apps_glow_2x/conpherence.png

View Options

resources/sprite/apps_glow_4x/conpherence.png

View Options

resources/sprite/apps_lb_2x/conpherence.png

View Options

resources/sprite/apps_lb_4x/conpherence.png

View Options

resources/sprite/manifest/apps-large.json

View Options

resources/sprite/manifest/apps.json

View Options

resources/sprite/manifest/gradient.json

View Options

resources/sprite/manifest/icon.json

View Options

resources/sprite/manifest/menu.json

View Options

resources/sprite/menu_1x/conf-hover.png

View Options

resources/sprite/menu_1x/conf-off.png

View Options

resources/sprite/menu_1x/conf-unseen.png

View Options

resources/sprite/menu_2x/conf-hover.png

View Options

resources/sprite/menu_2x/conf-off.png

View Options

resources/sprite/menu_2x/conf-unseen.png

View Options

resources/sql/patches/20130127.altheraldtranscript.sql

View Options

src/__celerity_resource_map__.php

View Options

src/__phutil_library_map__.php

View Options

src/applications/auth/controller/PhabricatorAuthController.php

View Options

src/applications/auth/controller/PhabricatorDisabledUserController.php

View Options

src/applications/auth/controller/PhabricatorEmailLoginController.php

View Options

src/applications/auth/controller/PhabricatorEmailTokenController.php

View Options

src/applications/auth/controller/PhabricatorLDAPLoginController.php

View Options

src/applications/auth/controller/PhabricatorLDAPRegistrationController.php

View Options

src/applications/auth/controller/PhabricatorLDAPUnlinkController.php

View Options

src/applications/auth/controller/PhabricatorLoginController.php

View Options

src/applications/auth/controller/PhabricatorLoginValidateController.php

View Options

src/applications/auth/controller/PhabricatorLogoutController.php

View Options

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

View Options

src/applications/auth/controller/PhabricatorOAuthLoginController.php

View Options

src/applications/auth/controller/PhabricatorOAuthUnlinkController.php

View Options

src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php

View Options

src/applications/auth/view/PhabricatorOAuthFailureView.php

View Options

src/applications/config/controller/PhabricatorConfigAllController.php

View Options

src/applications/config/controller/PhabricatorConfigGroupController.php

View Options

src/applications/config/controller/PhabricatorConfigIssueListController.php

View Options

src/applications/config/controller/PhabricatorConfigListController.php

View Options

src/applications/config/option/PhabricatorMetaMTAConfigOptions.php

View Options

src/applications/conpherence/config/ConpherenceConfigOptions.php

View Options

src/applications/conpherence/controller/ConpherenceController.php

View Options

src/applications/conpherence/controller/ConpherenceListController.php

View Options

src/applications/conpherence/controller/ConpherenceNewController.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/mail/ConpherenceReplyHandler.php

View Options

src/applications/conpherence/storage/ConpherenceParticipant.php

View Options

src/applications/conpherence/storage/ConpherenceThread.php

View Options

src/applications/conpherence/storage/ConpherenceTransaction.php

View Options

src/applications/differential/editor/DifferentialCommentEditor.php

View Options

src/applications/macro/controller/PhabricatorMacroListController.php

View Options

src/applications/metamta/controller/PhabricatorMetaMTAReceiveController.php

View Options

src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php

View Options

src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php

View Options

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

View Options

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

View Options

src/applications/phid/handle/PhabricatorObjectHandleData.php

View Options

src/applications/pholio/controller/PholioMockListController.php

View Options

src/applications/pholio/controller/PholioMockViewController.php

View Options

src/applications/pholio/query/PholioMockQuery.php

View Options

src/applications/pholio/storage/PholioImage.php

View Options

src/applications/pholio/storage/PholioMock.php

View Options

src/applications/pholio/view/PholioMockImagesView.php

View Options

src/applications/phortune/control/PhortuneMonthYearExpiryControl.php

View Options

src/applications/phriction/controller/PhrictionDocumentController.php

View Options

src/applications/phriction/controller/PhrictionEditController.php

View Options

src/applications/settings/panel/PhabricatorSettingsPanelAccount.php

View Options

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

View Options

src/docs/developer/database.diviner

View Options

src/docs/userguide/advanced_configuration.diviner

View Options

src/infrastructure/celerity/CeleritySpriteGenerator.php

View Options

src/infrastructure/daemon/workers/PhabricatorWorker.php

View Options

src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php

View Options

src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php

View Options

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

View Options

src/view/form/AphrontErrorView.php

View Options

src/view/form/control/AphrontFormDateControl.php

View Options

src/view/layout/PhabricatorObjectItemListView.php

View Options

src/view/layout/PhabricatorObjectItemView.php

View Options

src/view/page/menu/PhabricatorMainMenuView.php

View Options

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

View Options

webroot/rsrc/css/application/base/main-menu-view.css

View Options

webroot/rsrc/css/application/config/config-options.css

View Options

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

View Options

webroot/rsrc/css/application/conpherence/menu.css

View Options

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

View Options

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

View Options

webroot/rsrc/css/layout/phabricator-object-item-list-view.css

View Options

webroot/rsrc/css/layout/phabricator-source-code-view.css

View Options

webroot/rsrc/css/sprite-apps-large.css

View Options

webroot/rsrc/css/sprite-apps.css

View Options

webroot/rsrc/css/sprite-menu.css

View Options

webroot/rsrc/image/actions/edit.png

View Options

webroot/rsrc/image/sprite-apps-X2.png

View Options

webroot/rsrc/image/sprite-apps-large-X2.png

View Options

webroot/rsrc/image/sprite-apps-large.png

View Options

webroot/rsrc/image/sprite-apps.png

View Options

webroot/rsrc/image/sprite-menu-X2.png

View Options

webroot/rsrc/image/sprite-menu.png

View Options

webroot/rsrc/js/application/core/behavior-drag-and-drop.js

Merge branch 'master' into phutil_tagAuditedf9030885c414Actions

Description

Details

Event Timeline

Merged Changes

Changes (108)

rPf9030885c414

resources/sprite/apps_blue_2x/conpherence.png

resources/sprite/apps_blue_4x/conpherence.png

resources/sprite/apps_dark_1x/conpherence.png

resources/sprite/apps_dark_2x/conpherence.png

resources/sprite/apps_dark_4x/conpherence.png

resources/sprite/apps_glow_2x/conpherence.png

resources/sprite/apps_glow_4x/conpherence.png

resources/sprite/apps_lb_2x/conpherence.png

resources/sprite/apps_lb_4x/conpherence.png

resources/sprite/manifest/apps-large.json

resources/sprite/manifest/apps.json

resources/sprite/manifest/gradient.json

resources/sprite/manifest/icon.json

resources/sprite/manifest/menu.json

resources/sprite/menu_1x/conf-hover.png

resources/sprite/menu_1x/conf-off.png

resources/sprite/menu_1x/conf-unseen.png

resources/sprite/menu_2x/conf-hover.png

resources/sprite/menu_2x/conf-off.png

resources/sprite/menu_2x/conf-unseen.png

resources/sql/patches/20130127.altheraldtranscript.sql

src/__celerity_resource_map__.php

src/__phutil_library_map__.php

src/applications/auth/controller/PhabricatorAuthController.php

src/applications/auth/controller/PhabricatorDisabledUserController.php

src/applications/auth/controller/PhabricatorEmailLoginController.php

src/applications/auth/controller/PhabricatorEmailTokenController.php

src/applications/auth/controller/PhabricatorLDAPLoginController.php

src/applications/auth/controller/PhabricatorLDAPRegistrationController.php

src/applications/auth/controller/PhabricatorLDAPUnlinkController.php

src/applications/auth/controller/PhabricatorLoginController.php

src/applications/auth/controller/PhabricatorLoginValidateController.php

src/applications/auth/controller/PhabricatorLogoutController.php

src/applications/auth/controller/PhabricatorMustVerifyEmailController.php

src/applications/auth/controller/PhabricatorOAuthLoginController.php

src/applications/auth/controller/PhabricatorOAuthUnlinkController.php

src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php

src/applications/auth/view/PhabricatorOAuthFailureView.php

src/applications/config/controller/PhabricatorConfigAllController.php

src/applications/config/controller/PhabricatorConfigGroupController.php

src/applications/config/controller/PhabricatorConfigIssueListController.php

src/applications/config/controller/PhabricatorConfigListController.php

src/applications/config/option/PhabricatorMetaMTAConfigOptions.php

src/applications/conpherence/config/ConpherenceConfigOptions.php

src/applications/conpherence/controller/ConpherenceController.php

src/applications/conpherence/controller/ConpherenceListController.php

src/applications/conpherence/controller/ConpherenceNewController.php

src/applications/conpherence/controller/ConpherenceUpdateController.php

src/applications/conpherence/controller/ConpherenceViewController.php

src/applications/conpherence/editor/ConpherenceEditor.php

src/applications/conpherence/mail/ConpherenceReplyHandler.php

src/applications/conpherence/storage/ConpherenceParticipant.php

src/applications/conpherence/storage/ConpherenceThread.php

src/applications/conpherence/storage/ConpherenceTransaction.php

src/applications/differential/editor/DifferentialCommentEditor.php

src/applications/macro/controller/PhabricatorMacroListController.php

src/applications/metamta/controller/PhabricatorMetaMTAReceiveController.php

src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php

src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

src/applications/phid/handle/PhabricatorObjectHandleData.php

src/applications/pholio/controller/PholioMockListController.php

src/applications/pholio/controller/PholioMockViewController.php

src/applications/pholio/query/PholioMockQuery.php

src/applications/pholio/storage/PholioImage.php

src/applications/pholio/storage/PholioMock.php

src/applications/pholio/view/PholioMockImagesView.php

src/applications/phortune/control/PhortuneMonthYearExpiryControl.php

src/applications/phriction/controller/PhrictionDocumentController.php

src/applications/phriction/controller/PhrictionEditController.php

src/applications/settings/panel/PhabricatorSettingsPanelAccount.php

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

Merge branch 'master' into phutil_tag
Auditedf9030885c414
Actions