Merge branch 'master' into redesign-2015
6af1c02f0625
Actions

Description

Merge branch 'master' into redesign-2015

Details

Provenance

epriestley	Authored on Jun 15 2015, 2:06 PM
themackabu	Pushed on Mar 25 2025, 8:07 PM

Parents

rPc2a2933848b6: Add missing property on PhabricatorBot
rP53ef057b1b51: Merge branch 'master' into redesign-2015

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c2a2933848b6 Add missing property on PhabricatorBot
Author
epriestley
Browse Repository
No Builds
No Audits
600a3e3b7c2d Only index documentable atoms for search
Author
Joshua Spence
Browse Repository
No Builds
No Audits
a1561a4d3a07 Fix a fatal in Diviner when atoms extend ghosts
Author
epriestley
Browse Repository
No Builds
No Audits
9f1235d87512 Fix a fatal in Calendar widget in Conpherence
Author
epriestley
Browse Repository
No Builds
No Audits
6aa494bd2523 Fix missing property on HarbormasterBuildStepImplementation
Author
epriestley
Browse Repository
No Builds
No Audits
30e6203d8c45 Creating a recurring event should save it as a recurring event.
Author
lkassianik
Browse Repository
No Builds
No Audits
86a908d3b9ed Date controls should respect user time preferences
Author
lkassianik
Browse Repository
No Builds
No Audits
e6b6c42f76f8 Make event lists respect the user preference for time format.
Author
lkassianik
Browse Repository
No Builds
No Audits
d3b7071e70f7 Add date format preference and respect it in date selection controls
Author
lkassianik
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

resources/

celerity/

map.php

src/

applications/

calendar/

controller/

PhabricatorCalendarEventEditController.php

conpherence/

controller/

ConpherenceWidgetController.php

diviner/

query/

DivinerAtomQuery.php

search/

DivinerAtomSearchIndexer.php

harbormaster/

step/

HarbormasterBuildStepImplementation.php

settings/

panel/

PhabricatorDateTimeSettingsPanel.php

storage/

PhabricatorUserPreferences.php

infrastructure/

daemon/

bot/

PhabricatorBot.php

view/

form/

control/

AphrontFormDateControl.php

AphrontFormDateControlValue.php

phui/

calendar/

PHUICalendarListView.php

webroot/

rsrc/

js/

core/

behavior-fancy-datepicker.js

behavior-time-typeahead.js

rP6af1c02f0625

View Options

resources/celerity/map.php

View Options

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

View Options

src/applications/conpherence/controller/ConpherenceWidgetController.php

View Options

src/applications/diviner/query/DivinerAtomQuery.php

View Options

src/applications/diviner/search/DivinerAtomSearchIndexer.php

View Options

src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php

View Options

src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php

View Options

src/applications/settings/storage/PhabricatorUserPreferences.php

View Options

src/infrastructure/daemon/bot/PhabricatorBot.php

View Options

src/view/form/control/AphrontFormDateControl.php

View Options

src/view/form/control/AphrontFormDateControlValue.php

View Options

src/view/phui/calendar/PHUICalendarListView.php

View Options

webroot/rsrc/js/core/behavior-fancy-datepicker.js

View Options

webroot/rsrc/js/core/behavior-time-typeahead.js

Merge branch 'master' into redesign-20156af1c02f0625Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rP6af1c02f0625

resources/celerity/map.php

src/applications/calendar/controller/PhabricatorCalendarEventEditController.php

src/applications/conpherence/controller/ConpherenceWidgetController.php

src/applications/diviner/query/DivinerAtomQuery.php

src/applications/diviner/search/DivinerAtomSearchIndexer.php

src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php

src/applications/settings/panel/PhabricatorDateTimeSettingsPanel.php

src/applications/settings/storage/PhabricatorUserPreferences.php

src/infrastructure/daemon/bot/PhabricatorBot.php

src/view/form/control/AphrontFormDateControl.php

src/view/form/control/AphrontFormDateControlValue.php

src/view/phui/calendar/PHUICalendarListView.php

webroot/rsrc/js/core/behavior-fancy-datepicker.js

webroot/rsrc/js/core/behavior-time-typeahead.js

Merge branch 'master' into redesign-2015
6af1c02f0625
Actions