Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-14 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity
35,390 Commits 50 Branches 748 Tags 792 MiB
d93636bd11
Commit Graph

2170 Commits

Author SHA1 Message Date
David A. Kennedy
5452a6a21d Twenty Seventeen: Fix smooth scrolling skip link 
The link was scrolling too far. The main problem was that the `menuTop` variable lost it's initial definition of `0`, so all future subtractions were failing.

Props tywayne.

Fixes #38448.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-24 17:59:47 +00:00
Tammie Lister
bb91701a02 Twenty Seventeen: Fixes incorrect use of _x() 
There is an incorrect use in twentyseventeen_posted_on(). This fixes that.

Props ocean90, dineshc, mbelchev, davidakennedy
Fixes #38383


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


git-svn-id: http://core.svn.wordpress.org/trunk@38828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-24 17:27:51 +00:00
Tammie Lister
dc35c19f60 Twenty Seventeen: Renaming of directory structure 
This changes components directory to be called template-parts. Changes reflected in all files that call those sections.

Props bronsonquick, dd32

Fixes #38375

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


git-svn-id: http://core.svn.wordpress.org/trunk@38818 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-23 12:29:30 +00:00
Tammie Lister
05e4d10851 Revert [38873]: Commit does not keep file history due to deleted directory 
The last commit to change directory structure for Twenty Seventee, didn't keep the file history so reverting in favour of doing that.

Props Ocean90

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


git-svn-id: http://core.svn.wordpress.org/trunk@38817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-23 12:23:41 +00:00
Tammie Lister
552b119431 Twenty Seventeen: Renaming of directory structure 
This changes components directory to be called template-parts. Changes reflected in all files that call those sections.

Props bronsonquick, dd32

Fixes #38375

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


git-svn-id: http://core.svn.wordpress.org/trunk@38816 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-23 12:07:32 +00:00
Tammie Lister
85d3ca7940 Twenty Seventeen: Remove whitelisting comments for PHP_Codesniffer 
Some comments to whitelist PHP_CodeSniffer errors were left in the theme as on GitHub it intergrated with Travis testing. Those are now removed in this patch.

props davidakennedy

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


git-svn-id: http://core.svn.wordpress.org/trunk@38815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-23 11:06:31 +00:00
Peter Wilson
8db6c6c4ef Bundled theme: Add preconnect to fonts.gstatic.com in 2012-15 themes. 
Add preconnect hinting for `https://fonts.gstatic.com` in the bundled themes using Google fonts. WordPress versions 4.7+ include a crossorigin attribute, earlier versions will not.

Props leobaiano, swissspidy, peterwilsoncc.
Fixes #37171.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-23 01:56:32 +00:00
David A. Kennedy
e58856bbd0 Twenty Seventeen: Display featured image on static front page 
This improves UX, since an image added will be displayed on front end as opposed to not at all. This fix added the front page's featured image above the front page content, similar to how it's handled in the other panels. Also it removed code that was setting the front page's featured image as a fallback to the custom header, and updated the conditions that add the `has-header-image` to remove reference to the front page's featured image.

Props laurelfulford.

Fixes #38402.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-21 22:15:50 +00:00
David A. Kennedy
0794b2489b Twenty Seventeen: Add theme support for customize selective refresh widgets 
Props celloexpressions.

Fixes #38400.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-21 21:48:48 +00:00
David A. Kennedy
222240c4da Twenty Seventeen: Fix spacing issue on pages with comments 
This effected the two column layout on pages. The entry content and comment areas needed to be floated and cleared properly.

Props laurelfulford.

Fixes #38388.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-21 20:51:53 +00:00
David A. Kennedy
36f6079b15 Twenty Seventeen: Add post author comment styles 
Currently, it's hard to output an SVG in the comment function without a lot of extra effort. So this adds a simple border to the author avatar and removes previous code related to SVGs and/or Genericons.

Props laurelfulford.

Fixes #38403.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-21 20:37:34 +00:00
Gary Pendergast
802736514b Tests: Prevent Twenty Seventeen from interfering with Customizer tests. 
This was previously fixed in [38837], but it wasn't really the correct answer, to fix it in the theme. So, [38837] is reverted in this commit, and the Twenty Seventeen actions causing problems are unhooked before tests are run.

See #38372.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-21 05:28:31 +00:00
David A. Kennedy
8cfe2973d3 Twenty Seventeen: Replace inline control structure to improve code readability 
Props vrundakansara, aaroncampbell.

Fixes #38384.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-20 22:18:29 +00:00
David A. Kennedy
89b20fcf8f Twenty Fifteen, Twenty Seventeen: Add documentation to filters in themes. 
Documents a missing one Twenty Fifteen and all four missing ones in Twenty Seventeen.

Props brainstormforce.

Fixes #38382.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-20 20:34:31 +00:00
Gary Pendergast
bf5d081fe4 Twenty Seventeen: Remove some whitespace accidentally introduced in [38837]. 
See #38372.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-20 09:27:32 +00:00
Gary Pendergast
35186cff65 Twenty Seventeen: Fix a PHP warning on fresh installs. 
When setting the `transport` parameter on Customizer settings, we need to ensure the setting exists, particularly on new sites.

See #38372.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-20 09:04:31 +00:00
David A. Kennedy
7fbb094586 Importing Twenty Seventeen, our new default theme for 2017, set for 4.7. 
With a focus on business sites, it will let you get down to business in style. Initial development occurred on GitHub. See: https://github.com/WordPress/twentyseventeen

Props melchoyce, laurelfulford, davidakennedy, grapplerulrich, manishsongirkar36, joefusco, smyoon315, b-07, rabmalin, mrahmadawais, hardeepasrani, implenton, acmethemes, claudiosanches, valeriutihai, pressionate, sgr33n, doughamlin, zodiac1978, tsl143, nikschavan, joshcummingsdesign, enodekciw, jordesign, patilvikasj, ryelle, mahesh901122, williampatton, juanfra, imnok, littlebigthing, mor10, samikeijonen, celloexpressions, akshayvinchurkar, davidmosterd, hiddenpearls, netweb, pratikchaskar, taggon, nukaga, ranh, yoavf, karmatosed, sandesh055, adammacias, noplanman, yogasukma, binarymoon, swapnilld, swissspidy, joyously, allancole, rianrietveld, sixhours, alex27, themeshaper, mapk, leobaiano.

See #38372.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-10-20 04:12:31 +00:00
Dominik Schilling
f6e5d8db6c Bundled Themes: Bump versions and update theme tags. 
* Twenty Ten 2.2
* Twenty Eleven 2.5
* Twenty Twelve 2.1
* Twenty Thirteen 2.0
* Twenty Fourteen 1.8
* Twenty Fifteen 1.6

Props davidakennedy.
Fixes #37426.
Built from https://develop.svn.wordpress.org/trunk@38171


git-svn-id: http://core.svn.wordpress.org/trunk@38112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-07-31 16:37:32 +00:00
Tammie Lister
ee20f7606b Remove .pot files from Default Themes 
Fixes #34884
Props davidakennedy

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


git-svn-id: http://core.svn.wordpress.org/trunk@38034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-07-18 14:33:31 +00:00
Weston Ruter
36e46af382 Twenty Thirteen: Fix selective refresh of Masonry-laid out widgets by deferring initialization until DOM ready. 
This ensures that the `wp.customize.selectiveRefresh` object will be available when in the Customizer preview.

Fixes #37390.
Props westonruter, celloexpressions.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-07-17 21:14:29 +00:00
Tammie Lister
5bcc4e7b35 PHP 7 compatibility issues fixed in Twenty Thirteen and Twenty Fourteen 
Props xknown
Fixes #37227
--This Line, and those below, will be ignored--

M    themes/twentyfourteen/functions.php
M    themes/twentythirteen/functions.php

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


git-svn-id: http://core.svn.wordpress.org/trunk@37967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-07-09 15:11:33 +00:00
Konstantin Obenland
2678153cd4 Twenty Ten: Revert pot changes after update test. 
Introduced in [37714].


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


git-svn-id: http://core.svn.wordpress.org/trunk@37681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-15 16:46:29 +00:00
Konstantin Obenland
8c82515ab6 Update/Install: Shiny Updates v2. 
Gone are the days of isolation and feelings of "meh", brought on by The Bleak Screen of Sadness. For a shiny knight has arrived to usher our plugins and themes along their arduous journey of installation, updates, and the inevitable fate of ultimate deletion.

Props swissspidy, adamsilverstein, mapk, afragen, ocean90, ryelle, j-falk, michael-arestad, melchoyce, DrewAPicture, AdamSoucie, ethitter, pento, dd32, kraftbj, Ipstenu, jorbin, afercia, stephdau, paulwilde, jipmoors, khag7, svovaf, jipmoors, obenland.
Fixes #22029, #25828, #31002, #31529, #31530, #31773, #33637, #35032.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-15 16:37:29 +00:00
Tammie Lister
c0302df02f Twenty Elevent Ephemera widget fix for caching in Customizer preview. 
Fixes #36429. Props anneschmidt, westonruter.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-29 16:06:30 +00:00
Helen Hou-Sandí
5d8b9805eb Default theme bumps for 4.5. 
* Twenty Eleven 2.4
* Twenty Twelve 2.0
* Twenty Thirteen 1.9
* Twenty Fourteen 1.7
* Twenty Fifteen 1.5

props davidakennedy, ocean90.
fixes #36354.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-04-08 21:22:28 +00:00
Konstantin Obenland
cbbf361c03 Customize: Bring custom-logo args closer to custom-header. 
Allows themes to specify the desired width and height of logos, and whether
that is flexible or not. Has the benefit of not having to generate a logo-sized
file for every image uploaded.

Props westonruter, celloexpressions.
Fixes #36255.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-24 02:02:27 +00:00
Weston Ruter
f3f84d2f21 Customize: Require opt-in for selective refresh of widgets. 
* Introduces `customize-selective-refresh-widgets` theme support feature and adds to themes.
* Introduces `customize_selective_refresh` arg for `WP_Widget::$widget_options` and adds to all core widgets.
* Remove `selective_refresh` from being a component that can be removed via `customize_loaded_components` filter.
* Add `WP_Customize_Widgets::get_selective_refreshable_widgets()` and `WP_Customize_Widgets::is_widget_selective_refreshable()`.
* Fix default `selector` for `Partial` instances.
* Implement and improve Masronry sidebar refresh logic in Twenty Thirteen and Twenty Fourteen, including preservation of initial widget position after refresh.
* Re-initialize ME.js when refreshing `Twenty_Fourteen_Ephemera_Widget`.

See #27355.
Fixes #35855.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-21 21:59:29 +00:00
Tammie Lister
3be543d7af Twenty Thirteen, Twenty Fourteen, Twenty Fifteen: Update screenshots to 1200 x 900 
Fixes #34806
Props: iamtakashi

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


git-svn-id: http://core.svn.wordpress.org/trunk@37000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-18 17:01:29 +00:00
Tammie Lister
12c6679165 Twenty Thirteen, Twenty Fourteen and Twenty Fifteen: Fixes insufficient check for existence of DOM elements in jQuery object 
Fixes #34033
Props: tywayne 

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


git-svn-id: http://core.svn.wordpress.org/trunk@36966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-15 21:33:28 +00:00
Tammie Lister
74e13b1149 Twenty Elevent: Captioned image fix for editor 
Fixes #33153
Props: @iseulde

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


git-svn-id: http://core.svn.wordpress.org/trunk@36925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-10 21:13:26 +00:00
Tammie Lister
d8636e70d7 Twenty Thirteen: Removes title attribute from footer 
Fixes #35843
Props: @davidakennedy

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


git-svn-id: http://core.svn.wordpress.org/trunk@36924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-10 21:07:26 +00:00
Konstantin Obenland
91460e2af1 Twenty Fifteen: Simplify twentyfifteen_the_custom_logo(). 
See b72e3d8059
See #35944.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-10 18:21:27 +00:00
Aaron Jorbin
1972aa2a2a Add grunt prerelease task 
An unintended consequence of improving the precommit task is that when it's time to run a release, more tasks need to get run to verify things. This adds a prerelease task to help fix that situation. grunt prerelease should include tasks that verify the code base is ready to be released to the wild and find all the tears on the mausoleum floor and help Blood stain the Colosseum doors.

See #35557

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


git-svn-id: http://core.svn.wordpress.org/trunk@36898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-10 05:37:27 +00:00
Konstantin Obenland
c13130918a Bundled Themes: Prevent elements within fieldsets from overflowing in Webkit. 
Fixes #35421.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36842 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-07 19:15:30 +00:00
Weston Ruter
f78775a6db Customize: Use selective refresh to preview changes to site title and tagline in core themes. 
Fixes issue where `wptexturize` and other filters fail to apply when previewing changes via `postMessage` transport.

See #27355.
Fixes #33738.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-03-01 22:18:26 +00:00
Dominik Schilling
e5ea82d81a Spelling: Standardize on "front end"/"back end" (noun) and "front-end"/"back-end" (adjective). 
Props obrienlabs, thewanderingbrit.
Fixes #34887.
Built from https://develop.svn.wordpress.org/trunk@36709


git-svn-id: http://core.svn.wordpress.org/trunk@36676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-02-25 12:53:27 +00:00
Weston Ruter
6b775d4afe Customize: Add selective refresh framework with implementation for widgets and re-implementation for nav menus. 
See https://make.wordpress.org/core/2016/02/16/selective-refresh-in-the-customizer/.

Props westonruter, valendesigns, DrewAPicture, ocean90.
Fixes #27355.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-02-19 18:41:28 +00:00
Dominik Schilling
7d378fce01 Bundled Themes: Bump version number of Twenty Thirteen. 
Props davidakennedy.
Fixes #35319.
Built from https://develop.svn.wordpress.org/trunk@36179


git-svn-id: http://core.svn.wordpress.org/trunk@36146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-01-05 22:20:26 +00:00
Pascal Birchler
d15b5318b5 Twenty Thirteen: Add missing loop in the image attachment template. 
Props vtieu.
Fixes #35110.
Built from https://develop.svn.wordpress.org/trunk@36136


git-svn-id: http://core.svn.wordpress.org/trunk@36102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-31 11:39:26 +00:00
Sergey Biryukov
421604cb67 Twenty Fifteen: Add left margin for lists inside blockquotes in editor-style.css. 
Props diddledan.
Fixes #33380.
Built from https://develop.svn.wordpress.org/trunk@36075


git-svn-id: http://core.svn.wordpress.org/trunk@36040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-23 13:10:28 +00:00
Pascal Birchler
54b8c3e53b Docs: Fix some minor DocBlock alignment issues. 
See #32246.
Built from https://develop.svn.wordpress.org/trunk@35885


git-svn-id: http://core.svn.wordpress.org/trunk@35849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-12 15:37:28 +00:00
Dominik Schilling
1b41572d4c Bundled Themes: Update POT files. 
See #34804.
Built from https://develop.svn.wordpress.org/trunk@35829


git-svn-id: http://core.svn.wordpress.org/trunk@35793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-08 15:18:28 +00:00
Mel Choyce
bba9132925 Twenty Eleven/Docs: Remove duplicate "can" from footer template. 
See #34885.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-06 22:12:25 +00:00
Mike Schroder
8d220df08b Bundled Themes: Bump version numbers in default themes. 
Props davidakennedy.
Fixes #34804.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-12-06 22:01:27 +00:00
Sergey Biryukov
1137b70ef3 Twenty Fifteen: Document the 'twentyfifteen_color_schemes' filter. 
Props DrewAPicture.
Fixes #34119.
Built from https://develop.svn.wordpress.org/trunk@34791


git-svn-id: http://core.svn.wordpress.org/trunk@34756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-03 01:10:26 +00:00
Sergey Biryukov
cf3203e016 Twenty Fifteen: Add missing commas in rtl.css. 
Props netweb.
Fixes #33985.
Built from https://develop.svn.wordpress.org/trunk@34586


git-svn-id: http://core.svn.wordpress.org/trunk@34550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-26 10:49:26 +00:00
Dominik Schilling
38b561e8df Twenty Fifteen: Add a missing comma in rtl.css. 
Props Toro_Unit.
Fixes #33985.
Built from https://develop.svn.wordpress.org/trunk@34501


git-svn-id: http://core.svn.wordpress.org/trunk@34465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-24 16:03:24 +00:00
Dominik Schilling
620abd39a1 Bundled Themes: Update Tested up to. 
Props mercime.
Fixes #33794.
Built from https://develop.svn.wordpress.org/trunk@34079


git-svn-id: http://core.svn.wordpress.org/trunk@34047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-12 12:47:25 +00:00
Sergey Biryukov
0764191402 Twenty Fifteen: Correct license information in readme.txt. 
props Otto42.
see #33590, #31814.
Built from https://develop.svn.wordpress.org/trunk@33800


git-svn-id: http://core.svn.wordpress.org/trunk@33768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-28 16:55:00 +00:00
Sergey Biryukov
a17a93dfc9 Twenty Fourteen: Correct license information in readme.txt. 
props Otto42.
see #33590, #31814.
Built from https://develop.svn.wordpress.org/trunk@33799


git-svn-id: http://core.svn.wordpress.org/trunk@33767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-08-28 16:54:41 +00:00