HomePhabricator

Merge remote-tracking branch 'upstream/stable' into wmf/stable
933877f568a7Unpublished

Authored by mmodell on Nov 10 2016, 1:29 AM.

Unpublished Commit · Learn More

Publishing Disabled: All publishing is disabled for this repository.

Description

Merge remote-tracking branch 'upstream/stable' into wmf/stable

Details

Committed
mmodellNov 10 2016, 4:06 PM
Parents
rPHAB111c63955155: (stable) Promote 2016 Week 45
rPHAB902ade9eba61: Filter search input that innodb doesn't like
Branches
Unknown
Tags
Unknown
ChangeId
None

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
111c63955155epriestley
(stable) Promote 2016 Week 45 
Nov 5 2016
bd3233d3ab0cepriestley
Use a more conventional placement of parentheses 
Nov 4 2016
90fb8a15162fepriestley
Fix an issue with editing application default policies in Calendar 
Nov 4 2016
e337029769ceepriestley
Allow users to mark themselves as "Available", "Busy" or "Away" while attending… 
Nov 4 2016
ac8b156e4bb2epriestley
Raise ICS warnings in Phabricator on ICS import 
Nov 4 2016
c2565d5e2437epriestley
Fix a bug with creating Phortune merchant accounts without applying an email… 
Nov 4 2016
0f1785c0aa8cepriestley
Allow EditEngine to build NUX buttons that point at the right place 
Nov 4 2016
e4c6ae534518epriestley
Smooth out various transaction/editing behaviors for Calendar 
Nov 3 2016
e9b861ff1583epriestley
Write a basic Calendar user guide 
Nov 2 2016
29313372e715epriestley
Improve some commenting/editing behaviors for recurring events 
Nov 2 2016
64cf9204c1d9epriestley
In Calendar, only include the event description in the original event mail 
Nov 2 2016
c9510cc1184eepriestley
Make it more clear that red dots next to usernames mean Calendar availability 
Nov 2 2016
bf0004744b3cepriestley
Move "Calendar" above "Badges" on user profiles 
Nov 2 2016
713f8fb373e4epriestley
Fix a bug which could cause imported events to set themselves as their own… 
Nov 2 2016
3f2f81a1c8abepriestley
Remove obsolete Calendar event date storage fields 
Nov 2 2016
6982bded7124epriestley
Remove ancient "Holiday" storage 
Nov 1 2016
191b9398a5f6epriestley
Fix some minor Calendar issues, including a paging issue on imports 
Nov 1 2016
3e15e0b9806bepriestley
Store more datetime information on Calendar transactions and improve rendering… 
Nov 1 2016
6b16f930c47cepriestley
Automatically send (not-so-great) email notifications for upcoming events 
Nov 1 2016
6e6ae36dcf93epriestley
Add a skeleton for Calendar notifications 
Nov 1 2016
a0ea31f47f26epriestley
When users edit recurring events, prompt to "Edit This Event" or "Edit All… 
Oct 31 2016
208f8ed526a1epriestley
Support "Edit just this event" on the parent event in a series 
Oct 31 2016
b084efb36290epriestley
Record a "series parent PHID" on Calendar events that retains relationships… 
Oct 31 2016
f44a9a4e4896epriestley
Remove "isCancelledEvent()" wrapper on Calendar Events 
Oct 31 2016
91089acbe56bepriestley
Begin navigating the mess that is edits to recurring events 
Oct 31 2016
8e5437226fe9epriestley
Make calendar intepret all-day dates in a more consistent way 
Oct 31 2016
f7b0c09ac47fepriestley
Make the "All Day Event" control use a checkbox instead of a dropdown 
Oct 31 2016
182611ef7e57epriestley
Schedule monthly events on the 29th, 30th or 31st relative to the end of the… 
Oct 31 2016
850fcf020758epriestley
Move event recurrence controls to a separate page on the workflow 
Oct 31 2016
ee834c5958d0William Light/epriestley
oauthserver: get client ID/secret from HTTP auth 
Oct 31 2016
5e784c998baeepriestley
Fix some extra "changed the start time of this event" transactions 
Oct 30 2016
e1a9b7694517epriestley
Give organizers in ICS exports a dummy email address to placate Gmail 
Oct 30 2016
d9c91f857cefepriestley
Apply a TYPE_CREATE transaction when importing events to improve strings in… 
Oct 30 2016
96b064b7e9b2epriestley
Properly import all-day events in Calendar 
Oct 30 2016
5fd79479ecb4Chad Little
Add a basic invoice view for printing to Phortune 
Oct 30 2016
199300565142epriestley
Fix a variant translation issue 
Oct 30 2016
1e488e92771aepriestley
When importing events, delete events which have been removed on the other end 
Oct 29 2016
1014a2771795epriestley
Document Calendar imports 
Oct 29 2016
2bbddb8c0f29epriestley
Improve some setInitialValue() behavior for PhortuneMerchants 
Oct 28 2016
a792faf78d82epriestley
Use "book" instead of "life ring" icon for global help menu 
Oct 28 2016
0c9ecf835166Chad Little
Update Phortune Merchant to EditEngine 
Oct 28 2016
c3809b0d593dChad Little
Add a Merchant logo to Phortune 
Oct 28 2016
bd256e9f3fdbepriestley
(stable) Promote 2016 Week 44 
Oct 28 2016
09775279a949epriestley
Support arbitary event invitees when importing events 
Oct 27 2016
8e9c20c9ae63epriestley
Make event invitees behave a little better for stub/ghost events 
Oct 27 2016
12d29d820672epriestley
Fix a Phortune bug where an invalid viewer could sometimes be selected for… 
Oct 26 2016
0f800a3cd862epriestley
In Phabricator, drop PhutilClassMap caches after loading additional libraries 
Oct 26 2016
4c3f09a6a660epriestley
Suggest better start/end datetimes for Calendar events 
Oct 26 2016
7cb44bcee6bfepriestley
Don't allow "Start Time" / "End Time" in Calendar event forms to be locked or… 
Oct 26 2016
2d7f574b9d6depriestley
Allow Calendar imports to be configured with hourly or daily auto-updates 
Oct 26 2016