Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-15 07:05:37 +01:00
Code Issues Projects Releases Wiki Activity
35,992 Commits 50 Branches 748 Tags 792 MiB
189e5449a3
Commit Graph

16168 Commits

Author SHA1 Message Date
Aaron Campbell
189e5449a3 Add nonce for widget accessibility mode. 
Props vortfu.

See #23328.

Merges [39760] to 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@39761


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-11 01:40:34 +00:00
Dion Hulse
6cdd4b1250 Customize: Prevent removal of underline upon hover/focus for nav menu deletion links. 
Props monikarao.
Amends [38503].
See #37527.
Merges [39677] to the 4.7 branch.
Fixes #39444.

Built from https://develop.svn.wordpress.org/branches/4.7@39696


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-05 08:17:37 +00:00
Dion Hulse
8cc3c97b85 Updates: Properly define $filesystemForm to handle error in modals. 
Amends [39657].
Merges [39689] to the 4.7 branch.
See #39057.

Built from https://develop.svn.wordpress.org/branches/4.7@39690


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-01-05 07:28:36 +00:00
Dion Hulse
e87ab24ef8 Updates: Show the Authentication key settings after selecting the SSH transport in both the modal, and also on the plugin/theme updates screen. 
Props afercia.
Merges [39657] to the 4.7 branch.
Fixes #39057.

Built from https://develop.svn.wordpress.org/branches/4.7@39658


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-30 07:46:35 +00:00
Dion Hulse
fb52c9599d Customize: Fix visible edit shortcuts for wp_nav_menu() instances using the menu arg (such as in the Custom Menu widget) instead of the theme_location arg. 
Also fix logic for `focus-control-for-setting` handler to focus on the first control (lowest `priority` value) associated with a given setting instead of the last control encountered when iterating over all controls, as this ensures the first control in a `nav_menu` section is focused rather than the last one.

Props westonruter, sirbrillig.
See #27403.
Merges [39622] to the 4.7 branch.
Fixes #39101.

Built from https://develop.svn.wordpress.org/branches/4.7@39653


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-30 06:13:34 +00:00
Dion Hulse
8f7e4969bc Taxonomy: Redirect to current taxonomy when adding a term without AJAX. 
Fixes a regression in which adding terms via a full page refresh, ie without AJAX, would always redirect to the tags taxonomy.

Props szaqal21, peterwilsoncc.
Merges [39649] to the 4.7 branch.
Fixes #39328 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39652


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-30 05:55:32 +00:00
Ella Iseulde Van Dorpe
559e81937b Editor: Let the Add New link disappear in DFW mode. 
The link was moved outside the heading in [38983].

Merges [39619] to the 4.7 branch.
Fixes #39313.


Built from https://develop.svn.wordpress.org/branches/4.7@39634


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-21 14:56:34 +00:00
Gary Pendergast
8a2525a88d Media: Allow PDF fallbacks filter to process custom sizes. 
This fixes an oversight in [39246], which added a hook for filtering the array of sizes used for PDF thumbnails, but failed to provide a way for sizes added through `add_image_size()` to be processed.

Merge of [39617] to the 4.7 branch.

Props gitlost.
Fixes #39231. See #38594.


Built from https://develop.svn.wordpress.org/branches/4.7@39633


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-21 05:53:33 +00:00
Gary Pendergast
bba21b983c REST API: Add support for filename search in media endpoint. 
In [38625], the functionality to search for attachments by filename was added via the `posts_clauses` filter and the `_filter_query_attachment_filenames()` function. This moves `_filter_query_attachment_filenames()` from `wp-admin/includes/post.php` to `wp-includes/post.php` so that it can be applied in the same manner in the REST API media endpoint.

Merge of [39598] to the 4.7 branch.

Props jblz, tyxla.
Fixes #39092.


Built from https://develop.svn.wordpress.org/branches/4.7@39629


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-21 05:19:34 +00:00
Konstantin Obenland
3db97bd725 Themes: Add missing square bracket in jQuery selector. 
Fixes a bug in Safari where the UI wasn't updated after deleting a theme due to
the incomplete selector.

Props Hristo Sg.
Merges [39586] to the 4.7 branch.
Fixes #39246.

Built from https://develop.svn.wordpress.org/branches/4.7@39587


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-12 09:34:33 +00:00
Dion Hulse
edcebaa160 Customize: Fix inability to delete nav menus by preventing preview filters from being added during customize_save admin ajax request. 
Also prevent setting `nav_menu_locations[...]` values to `NaN` which gets sent as `null`.

Props westonruter.
See #30937, [38810].
Merges [39558] to the 4.7 branch.
Fixes #39103.


Built from https://develop.svn.wordpress.org/branches/4.7@39570


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-12 01:57:33 +00:00
Dion Hulse
01aaece3ea Customize: Prevent scrolling custom_css textarea to top when pressing tab. 
Props tyxla, sstoqnov for testing, celloexpressions for testing.
See #38667.
Merges [39557] to the 4.7 branch.
Fixes #39134.

Built from https://develop.svn.wordpress.org/branches/4.7@39569


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-12 01:56:33 +00:00
Helen Hou-Sandí
563dc76e7b About page: Update video and REST API reference URLs. 
props ocean90, kadamwhite, coffee2code.
see #38616 for the 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@39523


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-06 18:25:14 +00:00
Helen Hou-Sandí
537f4728bd Remove 4.7 cruft from $_old_files. 
fixes #39113.

Built from https://develop.svn.wordpress.org/branches/4.7@39521


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-06 17:18:34 +00:00
Helen Hou-Sandí
4135f92f3d About page: Bump image versions because CDN caching. 
props pento.
see #38616 for the 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@39518


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-06 07:14:13 +00:00
Joe McGill
f594693fcd About page: Resposive images and CDN media URLs. 
This adds `srcset` and `sizes` to the about page images, including
art direction, via `<picture>` for the lead Twenty Seventeen image.

This also replaces URLs for all images and feature videos to their
CDN locations on s.w.org.

Props helen, pento, joemcgill.
Fixes #38616 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39515


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-06 06:58:34 +00:00
Helen Hou-Sandí
8ab4a55cbe About page: Imagery and beautification. 
Still to come: responsive images, optimized videos, and CDN URLs.

merges [39512] to the 4.7 branch.
props melchoyce, helen, ramiabraham.
see #38616.

Built from https://develop.svn.wordpress.org/branches/4.7@39513


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-06 04:02:33 +00:00
Weston Ruter
0e7cc25529 Customize: Ensure changeset_uuid query param is removed from the customize.php window's location once a changeset has been published (committed) with starter content. 
Props westonruter, dlh for testing.
Merges [39504] onto 4.7 branch.
Fixes #39081 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39505


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-05 16:57:35 +00:00
Weston Ruter
c34a4c0ba3 Customize: Prevent posts/pages imported via starter content from being dropped when adding post/page stubs via nav menus and the dropdown-pages control. 
Props westonruter, dlh for testing.
Merges [39502] onto 4.7 branch.
Fixes #39071 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39503


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-05 16:49:35 +00:00
Gary Pendergast
b41001d4a1 Load: Re-add class-wp-upgrader-skins.php, class-feed.php, locale.php, and session.php. 
Several files were removed during 4.7 that can be loaded externally, so we need to keep them, though their use is now deprecated.

Merges [39449], [39450], [39453], [39455], and [39456] to the 4.7 branch.
Fixes #39027.


Built from https://develop.svn.wordpress.org/branches/4.7@39459


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-03 04:30:34 +00:00
Helen Hou-Sandí
0dd3e5e34d About page: Add strings for 4.7 and make available for translation. 
It doesn't look very pretty; design changes still to come.

merges [39420], [39432], [39433], [39442], [39443] to the 4.7 branch.

props helen, michaelarestad, samuelsidler, jbpaul17, jorbin, nacin, melchoyce, ocean90, ramiy.
see #38616.

Built from https://develop.svn.wordpress.org/branches/4.7@39445


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-12-02 22:45:15 +00:00
Dominik Schilling
29e03dd26c Docs: Document the usage of the global $wpdb in _filter_query_attachment_filenames(). 
Merge of [39390] to the 4.7 branch.

Props mt8.biz.
See #38973.
Built from https://develop.svn.wordpress.org/branches/4.7@39391


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-30 23:21:32 +00:00
Weston Ruter
b9cd04e8ad Customize: Fix regression in ability to hide fields for advanced menu properties in nav menu item controls. 
Props westonruter, celloexpressions.
See #34391.
Fixes #38952 for 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@39379


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-30 18:03:38 +00:00
Weston Ruter
ea8b01eac6 Customize: Fix regression in ability to create submenus for nav menus via drag and drop. 
See #34391.
Fixes #38948 for 4.7 branch.
Props delawski, adamsilverstein.

Built from https://develop.svn.wordpress.org/branches/4.7@39377


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-30 17:45:34 +00:00
Dominik Schilling
acd9d9fad3 Build/Test Tools: Add npm-shrinkwrap.json to 4.7. 
By shrinkwraping our dependencies, the same versions of everything will be installed no matter what rules the dependency package.json has specified.

Fixes #38657.
Built from https://develop.svn.wordpress.org/branches/4.7@39358


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-29 04:11:52 +00:00
Weston Ruter
6b5d960453 Customize: Clean up docs and code style for customize changes in 4.7. 
* Adds missing `resolve`/`fail` for promise returned by `loadThemePreview`.
* Adds missing jsdoc blocks and tags.
* Adds missing phpdoc and makes corrections.

See #37770.
Fixes #38908.

Built from https://develop.svn.wordpress.org/trunk@39345


git-svn-id: http://core.svn.wordpress.org/trunk@39285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-23 06:05:32 +00:00
Helen Hou-Sandí
2406fe498c Plugin install: De-duplicate a conditional, introduced in [38172]. 
props ChrisWiegman.
fixes #38190.

Built from https://develop.svn.wordpress.org/trunk@39336


git-svn-id: http://core.svn.wordpress.org/trunk@39276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 21:33:30 +00:00
Dominik Schilling
2328e7b17a I18N: In wp_dropdown_languages() rename the new show_site_locale_default argument to show_option_site_default. 
This makes it consistent with arguments of other `wp_dropdown_*()` functions.

Props SergeyBiryukov.
See #38632.
Fixes #38871.
Built from https://develop.svn.wordpress.org/trunk@39331


git-svn-id: http://core.svn.wordpress.org/trunk@39271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 16:14:30 +00:00
John Blackbourn
c2d709e9d6 I18n: Introduce more translator comments for strings that contain placeholders but don't have an accompanying translator comment. 
See #38882

Built from https://develop.svn.wordpress.org/trunk@39326


git-svn-id: http://core.svn.wordpress.org/trunk@39266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 02:46:30 +00:00
Sergey Biryukov
1b2ed70f39 I18N: Move the support forums URL in update-related HTTP API error messages to a separate translatable string that is already used elsewhere. 
Props ramiy, SergeyBiryukov.
Fixes #38880.
Built from https://develop.svn.wordpress.org/trunk@39325


git-svn-id: http://core.svn.wordpress.org/trunk@39265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 01:52:32 +00:00
John Blackbourn
40af377f57 Remove an erroneous @TODO introduced in [39323]. 
See #38882

Built from https://develop.svn.wordpress.org/trunk@39324


git-svn-id: http://core.svn.wordpress.org/trunk@39264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 01:26:30 +00:00
John Blackbourn
4cf5550d8d I18n: Begin introducing translator comments for strings which include placeholders but no accompanying translator comment. 
Adds context to one string used in two different contexts for the new user and new site signup email notification.

More to come.

See #38882

Built from https://develop.svn.wordpress.org/trunk@39323


git-svn-id: http://core.svn.wordpress.org/trunk@39263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-21 01:22:32 +00:00
Sergey Biryukov
285a774cad I18N: Remove unnecessary __() calls in _rotate_image_resource() and _flip_image_resource(). 
Use `_deprecated_function()`'s native strings.

Props ramiy.
Fixes #38862.
Built from https://develop.svn.wordpress.org/trunk@39314


git-svn-id: http://core.svn.wordpress.org/trunk@39254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-19 02:30:31 +00:00
Sergey Biryukov
dca7d8d0ea Text Changes: Merge strings referring to list_users capability. 
See #38857.
Built from https://develop.svn.wordpress.org/trunk@39312


git-svn-id: http://core.svn.wordpress.org/trunk@39252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-19 02:16:30 +00:00
Sergey Biryukov
b1ed607578 Text Changes: Merge and clarify some permission error strings in the admin. 
See #38857.
Built from https://develop.svn.wordpress.org/trunk@39308


git-svn-id: http://core.svn.wordpress.org/trunk@39248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-19 01:38:31 +00:00
Sergey Biryukov
529e242a39 I18N: Merge two 'ERROR:' strings. 
Props ramiy.
Fixes #38860.
Built from https://develop.svn.wordpress.org/trunk@39307


git-svn-id: http://core.svn.wordpress.org/trunk@39247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-19 01:09:30 +00:00
Helen Hou-Sandí
234ae480ee Autoprefixer for [39249]. 
Fixes one errant value and re-aligns some existing prefixed property values so they don't get doubled when precommit/postcss is run again in the future.

props davidakennedy.
see #29158.

Built from https://develop.svn.wordpress.org/trunk@39301


git-svn-id: http://core.svn.wordpress.org/trunk@39241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-18 21:06:30 +00:00
Sergey Biryukov
2fadd7a895 Docs: Use 3-digit, x.x.x style semantic versioning for @since 4.7.0 entries. 
See #37770.
Built from https://develop.svn.wordpress.org/trunk@39281


git-svn-id: http://core.svn.wordpress.org/trunk@39221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-17 18:28:30 +00:00
Sergey Biryukov
acc30b09d7 Text Changes: Merge some duplicate strings with the same meaning in error messages, adjust some other strings for consistency and accuracy. 
Props ramiy, SergeyBiryukov.
Fixes #38808.
Built from https://develop.svn.wordpress.org/trunk@39278


git-svn-id: http://core.svn.wordpress.org/trunk@39218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-17 15:53:33 +00:00
Weston Ruter
c2bc6df69a Customize: Ensure Close button actually closes customizer (instead of going back) after switching to a different theme inside a customize-loader iframe. 
Fixes #38833.

Built from https://develop.svn.wordpress.org/trunk@39271


git-svn-id: http://core.svn.wordpress.org/trunk@39211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-16 22:17:29 +00:00
Dominik Schilling
e4a83d2e6f Users: In edit_user() fall back to site's locale instead of en_US for invalid user locales. 
See #38632, #29783.
Fixes #38798.
Built from https://develop.svn.wordpress.org/trunk@39269


git-svn-id: http://core.svn.wordpress.org/trunk@39209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-16 20:12:31 +00:00
Sergey Biryukov
a7af7c89a4 Text Changes: Unify permission error messages in wp-admin/users.php. 
Props ramiy.
Fixes #38804.
Built from https://develop.svn.wordpress.org/trunk@39258


git-svn-id: http://core.svn.wordpress.org/trunk@39198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-15 22:25:30 +00:00
Helen Hou-Sandí
19bb9c2fe0 Customize: More visible focus and hover states for close and back buttons. 
props celloexpressions, folletto.
fixes #29158.

Built from https://develop.svn.wordpress.org/trunk@39249


git-svn-id: http://core.svn.wordpress.org/trunk@39189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-15 18:11:31 +00:00
Andrea Fercia
dff34d5988 Accessibility: Improve the Post Attributes meta box fields labels. 
With [38951] the support for custom page templates has been extended to all post
types. By making the visible meta box titles real labels, accessibility improves
for all users and form fields have meaningful labels.

Fixes #38790.

Built from https://develop.svn.wordpress.org/trunk@39247


git-svn-id: http://core.svn.wordpress.org/trunk@39187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-15 16:01:30 +00:00
Joe McGill
36ac7287b0 Media: Make PDF preview sizes filterable. 
This adds a new filter, `fallback_intermediate_image_sizes`, which
can be used to modify the array of image sizes created for previewing
PDFs in the media library and checks for the existence of sizes before
processing any image representations of a PDF.

Fixes #38594.
Built from https://develop.svn.wordpress.org/trunk@39246


git-svn-id: http://core.svn.wordpress.org/trunk@39186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-15 13:26:30 +00:00
Weston Ruter
de0835dead Customize: Only show video header controls if previewing front page; show explanatory notice when controls are hidden. 
Also include todo for the `header_video` control's `button_labels`. See #38796.

Props westonruter, joemcgill, celloexpressions.
Fixes #38778.

Built from https://develop.svn.wordpress.org/trunk@39237


git-svn-id: http://core.svn.wordpress.org/trunk@39177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-15 03:47:30 +00:00
Weston Ruter
9daebf050a Customize: Maximize height of Custom CSS textarea without causing doubled scrollbars. 
Textarea will fill vertical height of Custom CSS section for browsers that support `calc()` and when plugins don't add other controls to the section. Also run CSS autoprefixer.

Props michaelarestad, westonruter.
See #35395.
Fixes #38755.

Built from https://develop.svn.wordpress.org/trunk@39229


git-svn-id: http://core.svn.wordpress.org/trunk@39169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-14 19:12:30 +00:00
Weston Ruter
c3f31ce550 Customize: Remove root panel description text which notes that edit shortcuts can be toggled by clicking anywhere in the preview. 
Amends [39131], in which this method of toggling edit shortcuts was removed.
Props presskopp.
See #27403.

Built from https://develop.svn.wordpress.org/trunk@39218


git-svn-id: http://core.svn.wordpress.org/trunk@39158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-14 04:33:32 +00:00
Weston Ruter
fd166077ad Customize: Prevent the "Hide Controls" button label from overrunning the device preview buttons. 
Adds translation context for "Hide Controls" strings so translators can supply shorter strings where space is constrained. Adds styles to fade-out long the "Hide Controls" label where it would run into the device preview buttons.

Props westonruter, ocean90.
Fixes #38762.

Built from https://develop.svn.wordpress.org/trunk@39214


git-svn-id: http://core.svn.wordpress.org/trunk@39154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-13 19:00:35 +00:00
Helen Hou-Sandí
81f9cc26a1 Media: Clearly indicate that PDF thumbnails are just document previews. 
This helps affirm that your upload is fine, and has not been reduced down to the first page or changed into an image. This applies to the attachment details modal in the media library, where media is also now centered in the preview area.

props folletto, helen.
fixes #38717.

Built from https://develop.svn.wordpress.org/trunk@39213


git-svn-id: http://core.svn.wordpress.org/trunk@39153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-13 16:39:31 +00:00