Merge branch 'master' into redesign-2015
Audited26a007f879c2
Actions

Description

Merge branch 'master' into redesign-2015

Details

Group Auditors

Provenance

epriestley	Authored on
epriestley	Pushed on Jun 25 2015, 8:59 PM

Parents

rP6cfbf481a5f6: Provide more detailed guidance on upgrading Phabricator and the "stable" branch
rPaa22a578d01b: [Redesign] Clean up Slowvote

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley committed rP26a007f879c2: Merge branch 'master' into redesign-2015 (authored by epriestley).Jun 25 2015, 8:59 PM

Herald added auditors: Fakhra.Aftab, Cowboy Commits. · View Herald TranscriptJun 25 2015, 8:59 PM

btrahan accepted this commit.Jun 25 2015, 10:49 PM

Merged Changes

Changes (33)

Path

Size

resources/

celerity/

map.php

sql/

autopatches/

20150619.conpherencerooms.1.sql

	20150619.conpherencerooms.2.sql
	20150317.conpherence.isroom.2.sql

	20150619.conpherencerooms.3.sql
	20150317.conpherence.isroom.2.sql

src/

__phutil_library_map__.php

applications/

conpherence/

__tests__/

ConpherenceRoomTestCase.php

ConpherenceThreadTestCase.php

application/

PhabricatorConpherenceApplication.php

conduit/

ConpherenceQueryTransactionConduitAPIMethod.php

ConpherenceUpdateThreadConduitAPIMethod.php

controller/

ConpherenceController.php

ConpherenceListController.php

ConpherenceNewController.php

ConpherenceNewRoomController.php

ConpherenceNotificationPanelController.php

ConpherenceRoomListController.php

ConpherenceUpdateController.php

editor/

ConpherenceEditor.php

events/

ConpherenceHovercardEventListener.php

mail/

ConpherenceCreateThreadMailReceiver.php

phid/

PhabricatorConpherenceThreadPHIDType.php

policyrule/

ConpherenceThreadMembersPolicyRule.php

query/

ConpherenceThreadQuery.php

ConpherenceThreadSearchEngine.php

storage/

ConpherenceThread.php

ConpherenceTransaction.php

view/

ConpherenceDurableColumnView.php

ConpherenceLayoutView.php

ConpherenceThreadListView.php

people/

controller/

PhabricatorPeopleProfileController.php

docs/

user/

installation_guide.diviner

upgrading.diviner

webroot/

rsrc/

js/

application/

conpherence/

behavior-widget-pane.js

rP26a007f879c2

View Options

resources/celerity/map.php

View Options

resources/sql/autopatches/20150619.conpherencerooms.1.sql

View Options

resources/sql/autopatches/20150619.conpherencerooms.2.sql

View Options

resources/sql/autopatches/20150619.conpherencerooms.3.sql

View Options

src/__phutil_library_map__.php

View Options

src/applications/conpherence/tests/ConpherenceRoomTestCase.php

View Options

src/applications/conpherence/tests/ConpherenceThreadTestCase.php

View Options

src/applications/conpherence/application/PhabricatorConpherenceApplication.php

View Options

src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php

View Options

src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.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/ConpherenceNewRoomController.php

View Options

src/applications/conpherence/controller/ConpherenceNotificationPanelController.php

View Options

src/applications/conpherence/controller/ConpherenceRoomListController.php

View Options

src/applications/conpherence/controller/ConpherenceUpdateController.php

View Options

src/applications/conpherence/editor/ConpherenceEditor.php

View Options

src/applications/conpherence/events/ConpherenceHovercardEventListener.php

View Options

src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php

View Options

src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php

View Options

src/applications/conpherence/policyrule/ConpherenceThreadMembersPolicyRule.php

View Options

src/applications/conpherence/query/ConpherenceThreadQuery.php

View Options

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

View Options

src/applications/conpherence/storage/ConpherenceThread.php

View Options

src/applications/conpherence/storage/ConpherenceTransaction.php

View Options

src/applications/conpherence/view/ConpherenceDurableColumnView.php

View Options

src/applications/conpherence/view/ConpherenceLayoutView.php

View Options

src/applications/conpherence/view/ConpherenceThreadListView.php

View Options

src/applications/people/controller/PhabricatorPeopleProfileController.php

View Options

src/docs/user/installation_guide.diviner

View Options

src/docs/user/upgrading.diviner

View Options

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

Merge branch 'master' into redesign-2015Audited26a007f879c2Actions

Description

Details

Event Timeline

Merged Changes

Changes (33)

rP26a007f879c2

resources/celerity/map.php

resources/sql/autopatches/20150619.conpherencerooms.1.sql

resources/sql/autopatches/20150619.conpherencerooms.2.sql

resources/sql/autopatches/20150619.conpherencerooms.3.sql

src/__phutil_library_map__.php

src/applications/conpherence/__tests__/ConpherenceRoomTestCase.php

src/applications/conpherence/__tests__/ConpherenceThreadTestCase.php

src/applications/conpherence/application/PhabricatorConpherenceApplication.php

src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php

src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php

src/applications/conpherence/controller/ConpherenceController.php

src/applications/conpherence/controller/ConpherenceListController.php

src/applications/conpherence/controller/ConpherenceNewController.php

src/applications/conpherence/controller/ConpherenceNewRoomController.php

src/applications/conpherence/controller/ConpherenceNotificationPanelController.php

src/applications/conpherence/controller/ConpherenceRoomListController.php

src/applications/conpherence/controller/ConpherenceUpdateController.php

src/applications/conpherence/editor/ConpherenceEditor.php

src/applications/conpherence/events/ConpherenceHovercardEventListener.php

src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php

src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php

src/applications/conpherence/policyrule/ConpherenceThreadMembersPolicyRule.php

src/applications/conpherence/query/ConpherenceThreadQuery.php

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

src/applications/conpherence/storage/ConpherenceThread.php

src/applications/conpherence/storage/ConpherenceTransaction.php

src/applications/conpherence/view/ConpherenceDurableColumnView.php

src/applications/conpherence/view/ConpherenceLayoutView.php

src/applications/conpherence/view/ConpherenceThreadListView.php

src/applications/people/controller/PhabricatorPeopleProfileController.php

src/docs/user/installation_guide.diviner

src/docs/user/upgrading.diviner

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

Merge branch 'master' into redesign-2015
Audited26a007f879c2
Actions

src/applications/conpherence/tests/ConpherenceRoomTestCase.php

src/applications/conpherence/tests/ConpherenceThreadTestCase.php