Skip to content

Upcoming Events file sync with WPCOM.#6059

Merged
dereksmart merged 7 commits intomasterfrom
wpcom/upcoming-events-updates
Jan 10, 2017
Merged

Upcoming Events file sync with WPCOM.#6059
dereksmart merged 7 commits intomasterfrom
wpcom/upcoming-events-updates

Conversation

@georgestephanis
Copy link
Copy Markdown
Contributor

Changes proposed in this Pull Request:

Syncs up files regarding the Upcoming Events widget and shortcode from WPCOM including some changes by @sirbrillig regarding timezones.

As this is only now finally shipping, shouldn't need a changelog entry.

sirbrillig and others added 4 commits January 9, 2017 19:50
props @taggon

The widget doesn't show the dates in the blog's timezone.
But the `icalendar_render_events` function, which is used for generating output, doesn't provide option for blog's timezone. So I make the widget handle blog's timezone, apply it to the dates and render the output.

See: https://github.com/Automattic/customization/issues/111
See: https://[private link]

Merges r139672-wpcom.
Conflicts:
	modules/widgets/upcoming-events.php
We had never actually shipped the file, so it went unnoticed for a while.
Copy link
Copy Markdown
Contributor

@dereksmart dereksmart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The shorcode is throwing notices when adding events that don't have descriptions or locations:

Notice: Undefined index: LOCATION in /home/dereksma/public_html/wp-content/plugins/jetpack/_inc/lib/icalendar-reader.php on line 749
Notice: Undefined index: DESCRIPTION in /home/dereksma/public_html/wp-content/plugins/jetpack/_inc/lib/icalendar-reader.php on line 752

}
}

add_action( 'plugins_loaded', array( 'Upcoming_Events_Shortcode', 'init' ), 100 );
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to bump this to priority 101 to get it to register.

@dereksmart
Copy link
Copy Markdown
Contributor

Widget changes look good 👍

@georgestephanis
Copy link
Copy Markdown
Contributor Author

@dereksmart I think I've got what you need, can you give it a skim and confirm?

@dereksmart
Copy link
Copy Markdown
Contributor

@georgestephanis changes look great, thanks! This is good to ship

@dereksmart dereksmart added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels Jan 10, 2017
@dereksmart dereksmart merged commit 453dabc into master Jan 10, 2017
dereksmart added a commit that referenced this pull request Jan 10, 2017
@dereksmart
Copy link
Copy Markdown
Contributor

Merged to 4.5 78ee704

@dereksmart dereksmart deleted the wpcom/upcoming-events-updates branch January 10, 2017 22:43
@jordwest
Copy link
Copy Markdown

jordwest commented Jan 12, 2017

We've been seeing some issues on WPCOM with the Upcoming Events widget around daylight savings boundaries. I'm not sure if those issues were pre-existing, but it's possible the issue will come up in Jetpack with this sync. It's a subtle bug that only happens as we approach a daylight savings boundary, when events are scheduled after that boundary.

Details: p2UL9c-2Zq-p2

dereksmart pushed a commit that referenced this pull request Jan 17, 2017
CHangelog: add #5457

Changelog: add #5487

Changelog: add #5708

Changelog: add #5879

Changelog: add #5932

Changelog: add #5963

Changelog: add #5968

Changelog: add #5996

Changelog: add #5998

Changelog: add #5999

Changelog: add #6012

Changelog: add #6013

Changelog: add #6014

Changelog: add #6015

Changelog: add #6023

Changelog: add #6024

Changelog: add #6030

Changelog: add #5465

CHangelog: add #6063

Changelog: add #6025

Changelog: add #5974

Changelog: add #6059

Changelog: add #6046

Changelog: add #5418

Changelog: move things around and add missing information.

Changelog: add #5565

Changelog: add #6087

Changelog: add #6095
dereksmart pushed a commit that referenced this pull request Jan 17, 2017
Changelog: add #5867

Changelog: add #5874

Changelog: add #5905

Changelog: add #5906

Changelog: add #5931

Changelog: add #5933

Changelog: add #5934

Bring over 4.4.2 changelog from branch-4.4

@see 18012a3

Changelog: add #5976, #5978, #5983

Changelog: add #5917

Changelog: add #5832

Changelog: add 4.4.2 release post link.

CHangelog: add #5457

Changelog: add #5487

Changelog: add #5708

Changelog: add #5879

Changelog: add #5932

Changelog: add #5963

Changelog: add #5968

Changelog: add #5996

Changelog: add #5998

Changelog: add #5999

Changelog: add #6012

Changelog: add #6013

Changelog: add #6014

Changelog: add #6015

Changelog: add #6023

Changelog: add #6024

Changelog: add #6030

Changelog: add #5465

CHangelog: add #6063

Changelog: add #6025

Changelog: add #5974

Changelog: add #6059

Changelog: add #6046

Changelog: add #5418

Changelog: move things around and add missing information.

Changelog: add #5565

Changelog: add #6087

Changelog: add #6095

Readme: add @tyxla to the list of contributors.

Improved changelog for your readability and enjoyment

updated the release date

finalizing the changelog with a few more edits
@kraftbj kraftbj removed the [Status] Ready to Merge Go ahead, you can push that green button! label Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants