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

Description

Merge branch 'master' into redesign-2015

Details

Provenance

epriestley	Authored on Jun 22 2015, 3:52 PM
themackabu	Pushed on Mar 25 2025, 8:07 PM

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

4be568d34611 MetaMTA - save actorPHID as its own column
Author
Bob Trahan
Browse Repository
No Builds
No Audits
ea5462fb600b MetaMTA - lay some ground work for having an application
Author
Bob Trahan
Browse Repository
No Builds
No Audits
c3efa261f9c1 Refactor Calendar Search, and implement Projects on events
Author
lkassianik
Browse Repository
No Builds
No Audits
1bb2978a895a Desktop Notification support
Author
Bob Trahan
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

resources/

celerity/

map.php

sql/

autopatches/

	20150622.metamta.1.phid-col.sql
	20140130.mail.1.retry.sql

20150622.metamta.2.phid-mig.php

	20150622.metamta.3.phid-key.sql
	20140130.mail.1.retry.sql

	20150622.metamta.4.actor-phid-col.sql
	20140130.mail.1.retry.sql

20150622.metamta.5.actor-phid-mig.php

	20150622.metamta.6.actor-phid-key.sql
	20140130.mail.1.retry.sql

src/

__phutil_library_map__.php

applications/

calendar/

controller/

PhabricatorCalendarEventEditController.php

query/

PhabricatorCalendarEventQuery.php

PhabricatorCalendarEventSearchEngine.php

storage/

PhabricatorCalendarEvent.php

metamta/

phid

storage/

PhabricatorMetaMTAMail.php

	metamta/	phid/
		phid/

	PhabricatorMetaMTAMailPHIDType.php
	PhabricatorMetaMTAApplicationEmailPHIDType.php

	metamta/	query/
	almanac/	query/

	PhabricatorMetaMTAMailQuery.php
	AlmanacNetworkQuery.php

notification/

builder/

PhabricatorNotificationBuilder.php

controller/

PhabricatorNotificationIndividualController.php

PhabricatorNotificationTestController.php

feed/

PhabricatorNotificationAdHocFeedStory.php

	PhabricatorNotificationTestFeedStory.php
	PhabricatorNotificationAdHocFeedStory.php

search/

engine/

PhabricatorApplicationSearchEngine.php

field/

PhabricatorSearchDateControlField.php

settings/

panel/

PhabricatorDesktopNotificationsSettingsPanel.php

storage/

PhabricatorUserPreferences.php

transactions/

feed/

PhabricatorApplicationTransactionFeedStory.php

view/

AphrontView.php

form/

PHUIInfoView.php

phui/

PHUIFeedStoryView.php

calendar/

PHUICalendarDayView.php

PHUICalendarMonthView.php

webroot/

rsrc/

js/

application/

aphlict/

behavior-aphlict-listen.js

behavior-desktop-notifications-control.js

core/

Notification.js

rP1ccdb941b951

View Options

resources/celerity/map.php

View Options

resources/sql/autopatches/20150622.metamta.1.phid-col.sql

View Options

resources/sql/autopatches/20150622.metamta.2.phid-mig.php

View Options

resources/sql/autopatches/20150622.metamta.3.phid-key.sql

View Options

resources/sql/autopatches/20150622.metamta.4.actor-phid-col.sql

View Options

resources/sql/autopatches/20150622.metamta.5.actor-phid-mig.php

View Options

resources/sql/autopatches/20150622.metamta.6.actor-phid-key.sql

View Options

src/__phutil_library_map__.php

View Options

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

View Options

src/applications/calendar/query/PhabricatorCalendarEventQuery.php

View Options

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

View Options

src/applications/calendar/storage/PhabricatorCalendarEvent.php

View Options

src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php

View Options

src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php

View Options

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

View Options

src/applications/notification/builder/PhabricatorNotificationBuilder.php

View Options

src/applications/notification/controller/PhabricatorNotificationIndividualController.php

View Options

src/applications/notification/controller/PhabricatorNotificationTestController.php

View Options

src/applications/notification/feed/PhabricatorNotificationAdHocFeedStory.php

View Options

src/applications/notification/feed/PhabricatorNotificationTestFeedStory.php

View Options

src/applications/search/engine/PhabricatorApplicationSearchEngine.php

View Options

src/applications/search/field/PhabricatorSearchDateControlField.php

View Options

src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php

View Options

src/applications/settings/storage/PhabricatorUserPreferences.php

View Options

src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php

View Options

src/view/AphrontView.php

View Options

src/view/form/PHUIInfoView.php

View Options

src/view/phui/PHUIFeedStoryView.php

View Options

src/view/phui/calendar/PHUICalendarDayView.php

View Options

src/view/phui/calendar/PHUICalendarMonthView.php

View Options

webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js

View Options

webroot/rsrc/js/application/aphlict/behavior-desktop-notifications-control.js

View Options

webroot/rsrc/js/core/Notification.js

Merge branch 'master' into redesign-20151ccdb941b951Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rP1ccdb941b951

resources/celerity/map.php

resources/sql/autopatches/20150622.metamta.1.phid-col.sql

resources/sql/autopatches/20150622.metamta.2.phid-mig.php

resources/sql/autopatches/20150622.metamta.3.phid-key.sql

resources/sql/autopatches/20150622.metamta.4.actor-phid-col.sql

resources/sql/autopatches/20150622.metamta.5.actor-phid-mig.php

resources/sql/autopatches/20150622.metamta.6.actor-phid-key.sql

src/__phutil_library_map__.php

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

src/applications/calendar/query/PhabricatorCalendarEventQuery.php

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

src/applications/calendar/storage/PhabricatorCalendarEvent.php

src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php

src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php

src/applications/metamta/storage/PhabricatorMetaMTAMail.php

src/applications/notification/builder/PhabricatorNotificationBuilder.php

src/applications/notification/controller/PhabricatorNotificationIndividualController.php

src/applications/notification/controller/PhabricatorNotificationTestController.php

src/applications/notification/feed/PhabricatorNotificationAdHocFeedStory.php

src/applications/notification/feed/PhabricatorNotificationTestFeedStory.php

src/applications/search/engine/PhabricatorApplicationSearchEngine.php

src/applications/search/field/PhabricatorSearchDateControlField.php

src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php

src/applications/settings/storage/PhabricatorUserPreferences.php

src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php

src/view/AphrontView.php

src/view/form/PHUIInfoView.php

src/view/phui/PHUIFeedStoryView.php

src/view/phui/calendar/PHUICalendarDayView.php

src/view/phui/calendar/PHUICalendarMonthView.php

webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js

webroot/rsrc/js/application/aphlict/behavior-desktop-notifications-control.js

webroot/rsrc/js/core/Notification.js

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