WPCOM Widgets Merge -- 22march2017#6721
Merged
samhotchkiss merged 41 commits intomasterfrom Mar 28, 2017
Merged
Conversation
…or unknown locale See: r117058 See: https://[private link] Merges r120105-wpcom.
…eas wider than 340px. We recently removed the width option from this widget in order to allow it to be responsive. However, it defaults to 340px at largest, which is a problem for wider widget areas. This is a partial revert of r119494-wpcom. https://[private link] ed2c2a9 https://[private link]#comment-33575 Merges r121114-wpcom.
…Box" to read "Page Plugin" instead, since the code now loads the Facebook page plugin code instead. Merges r123111-wpcom.
…get_view`, see #7805. Merges r144861-wpcom.
See #6421. Merges r148069-wpcom.
… values. Fixes https://github.com/Automattic/customization/issues/53 Merges r148071-wpcom.
See r148071. Merges r148072-wpcom.
Conflicts: modules/widgets/facebook-likebox.php
Merges r144867-wpcom.
…idget. See #7805 Merges r145017-wpcom.
Conflicts: modules/widgets/gallery.php
…get_view`, see #7805. Merges r144861-wpcom.
See #5488 Merges r144995-wpcom.
Conflicts: modules/widgets/gravatar-profile.php
Merges r144867-wpcom.
Ref: #5488 Merges r144925-wpcom.
See #5488 Merges r144995-wpcom.
…idget. See #7805 Merges r145017-wpcom.
…ns widget. See #5156 Merges r148065-wpcom.
Conflicts: modules/widgets/social-media-icons.php
Merges r144867-wpcom.
See #5488 Merges r144995-wpcom.
…ar fallback image size of 200 pixels square. FIxes #6664. Merges r148090-wpcom.
Conflicts: modules/widgets/top-posts.php
This is just a stopgap until we can fully integrate with the new publish.twitter.com setup. See https://github.com/Automattic/io/issues/601 for more info. Merges r137075-wpcom.
https://[private link] Merges r137600-wpcom.
Same for height, and a couple of other cleanups. See: #3283 Merges r137659-wpcom.
From review at #4198 Merges r137943-wpcom.
…get_view`, see #7805. Merges r144861-wpcom.
Ref: #5488 Merges r144925-wpcom.
Contributor
Author
|
The wpcom end of this changeset is in phabricator as D4852-code |
emdashcodes
approved these changes
Mar 22, 2017
emdashcodes
left a comment
There was a problem hiding this comment.
It's been awhile since I've done anything on .com or with the .com widgets, but the changes LGTM.
Contributor
Author
|
Yarp, some of these were way out of date -- aa1330b was originally from 2015. |
aduth
reviewed
Mar 23, 2017
Member
aduth
left a comment
There was a problem hiding this comment.
My only included commit isn't included in changes, so guessing it was merged separately. Noted one potential issue from rest of changes though.
|
|
||
| return $offsetted_events; | ||
| $ical = new iCalendarReader(); | ||
| return $ical->apply_timezone_offset( $events ); |
Member
There was a problem hiding this comment.
I don't see this method defined in iCalendarReader ?
Contributor
Author
There was a problem hiding this comment.
Found the commits and merged them over. Thanks!
This patch adds changes to the calendar shortcode so that it applies a users timezone to all of the rendered events See https://[private link] Differential Revision: https://[private link] Merges r151822-wpcom.
This revision aims at fixing an issue in the `iCalendarReader` class The function that applies timezone offsets calculates the time difference for timezones using the current date instead of the date thats actually associated with the event. This leads to Daylight Savings Time confusions if today is standard time and the event occurs in daylight savings time. Today (3-8-2017) an event for 3-15-2017 6:30pm will show up as 3-15-2017 5:30pm For effected users see: - https://[private link] - https://[private link] - https://[private link] Merges r152463-wpcom.
Must have been a merge gone bad.
Contributor
|
LGTM 🐑 |
eliorivero
approved these changes
Mar 27, 2017
Contributor
|
Looks like travis got his act together finally! |
samhotchkiss
pushed a commit
that referenced
this pull request
Mar 29, 2017
* Readme: remove old release and add skeleton for 4.8. * Changelog: add #6572 * Changelog: add #6567 * Changelog: add #6542 * Changelog: add #6527 * Changelog: add #6508 * Changelog: add #6478 * Changelog: add #6477 * Changelog: add #6249 * Update stable version and remove old version from readme. * Changelog: add 4.7.1 to changelog. * Readme: add new contributor. * Sync: update docblock @SInCE version. Related: #6053 * Changelog: add release post. * changelog: add #6053 * Changelog: add #6413 * Changelog: add #6482 * Changelog: add #6584 * Changelog add #6603 * Changelog: add #6606 * Changelog: add #6611 * Changelog: add #6635 * Changelog: add #6639 * Changelog: add #6684 * Changelog: add #6710 * Changelog: add #6711 * Changelog: add #5461 * Testing list: update Settings UI feedback prompt. Props @MichaelArestad * Changelog: add #6789 * Changelog: add #6778 * Changelog: add #6777 * Changelog: add #6775 * Changelog: add #6755 * Changelog: add #6731 * Changelog: add #6721 * Changelog: add #6705 * Changelog: add #6702 * Changelog: add #6671 * Changelog: add #6637 * Changelog: add #6582 * Changelog: add #6566 * Changelog: add #6555 * Changelog: add #6529 * Changelog: add #6344 * Changelog: add #5763 * Changelog: add #5503 * Changelog: update #6637 changelog. @see 40e115c#commitcomment-21523982 * Changelog: add #6699 * Changelog: add #6632 * Changelog: add #6769 * Changelog: add #6707 * Changelog: add #6590
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This handles the sync of wpcom changes to Jetpack, but explicitly omits the
wordpress-post-widgetbecause of the huge overhaul merged in #3207