Diffusion Phabricator 1ccdb941b951

Merge branch 'master' into redesign-2015
1ccdb941b951
Actions

Authored by epriestley <git@epriestley.com> on Jun 23 2015, 00:52.

Description

Merge branch 'master' into redesign-2015

Details

Committed

epriestley <git@epriestley.com>

Jun 23 2015, 00:52

Pushed

aubort

Jan 31 2017, 17:16

Parents

rPH4be568d34611: MetaMTA - save actorPHID as its own column
rPHdbdeca58fc6e: [Redesign] Fix People Log Query

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley <git@epriestley.com> committed rPH1ccdb941b951: Merge branch 'master' into redesign-2015 (authored by epriestley <git@epriestley.com>).Jun 23 2015, 00:52

Merged Changes

Commit	Author	Details	Committed
4be568d34611	Bob Trahan	MetaMTA - save actorPHID as its own column	Jun 22 2015
ea5462fb600b	Bob Trahan	MetaMTA - lay some ground work for having an application	Jun 22 2015
c3efa261f9c1	lkassianik	Refactor Calendar Search, and implement Projects on events	Jun 22 2015
1bb2978a895a	Bob Trahan	Desktop Notification support	Jun 22 2015

Changes (34)

		Path
M		resources/celerity/map.php
P		resources/sql/autopatches/20150622.metamta.1.phid-col.sql Copied from resources/sql/autopatches/20140130.mail.1.retry.sql
A		resources/sql/autopatches/20150622.metamta.2.phid-mig.php
P		resources/sql/autopatches/20150622.metamta.3.phid-key.sql Copied from resources/sql/autopatches/20140130.mail.1.retry.sql
P		resources/sql/autopatches/20150622.metamta.4.actor-phid-col.sql Copied from resources/sql/autopatches/20140130.mail.1.retry.sql
A		resources/sql/autopatches/20150622.metamta.5.actor-phid-mig.php
P		resources/sql/autopatches/20150622.metamta.6.actor-phid-key.sql Copied from resources/sql/autopatches/20140130.mail.1.retry.sql
M		src/__phutil_library_map__.php
M		src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
M		src/applications/calendar/query/PhabricatorCalendarEventQuery.php
M		src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
M		src/applications/calendar/storage/PhabricatorCalendarEvent.php
A	(dir)	src/applications/metamta/phid/
P		src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php Copied from src/applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php
P		src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php Copied from src/applications/almanac/query/AlmanacNetworkQuery.php
M		src/applications/metamta/storage/PhabricatorMetaMTAMail.php
M		src/applications/notification/builder/PhabricatorNotificationBuilder.php
M		src/applications/notification/controller/PhabricatorNotificationIndividualController.php
M		src/applications/notification/controller/PhabricatorNotificationTestController.php
V		src/applications/notification/feed/{PhabricatorNotificationAdHocFeedStory.php → PhabricatorNotificationTestFeedStory.php}
V		src/applications/notification/feed/{PhabricatorNotificationTestFeedStory.php ← PhabricatorNotificationAdHocFeedStory.php}
M		src/applications/search/engine/PhabricatorApplicationSearchEngine.php
A		src/applications/search/field/PhabricatorSearchDateControlField.php
A		src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
M		src/applications/settings/storage/PhabricatorUserPreferences.php
M		src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
M		src/view/AphrontView.php
M		src/view/form/PHUIInfoView.php
M		src/view/phui/PHUIFeedStoryView.php
M		src/view/phui/calendar/PHUICalendarDayView.php
M		src/view/phui/calendar/PHUICalendarMonthView.php
M		webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
A		webroot/rsrc/js/application/aphlict/behavior-desktop-notifications-control.js
M		webroot/rsrc/js/core/Notification.js