Commit Graph

118 Commits

Author SHA1 Message Date
Scott Taylor
608177d39b In media.model.PostMedia, for these 2 scenarios:
* `src` is set, and 'Add a Source' results in the same file (or a file with the same extension) being added
* `src` is set, and 'Replace Audio|Video' is used, which will add a model property named by the attachment's extension

... call `model.unset( 'src' )`.

See #27389.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-14 13:00:14 +00:00
Scott Taylor
b4569b69dc Revert [27528] until Flash in Firefox behaves :(
See #27389.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 23:39:16 +00:00
Scott Taylor
ba84f57083 Add MCE Views for audio and video. Please clear your browser cache so that you get the latest TinyMCE stylesheet.
* Move TinyMCE shortcode handling from `wpgallery` plugin to `mce-view.js`
* Force `preload="none"` when rendering media in the editor to ensure fast loading (I realize this sounds illogical)
* Move audio and video tag builder logic in `media-template.php` into PHP funcs that can be reused by any code passing `data.model` to an Underscore template
* Pause all players when moving between editor tabs and when moving from the editor to editing in the media modal.
* Rename `wp.media.audio|video.shortcode()` to the more appropriate `wp.media.audio|video.update()` that now returns a `wp.shortcode` object instead of a string.
* Add necessary MediaElement css files to `$mce_css`
* In `wp.mce.View.render()`, support multiple instances of the same shortcode
* When rendering `wp.mce.View`s, fire a ready event that passes the current MCE View root element as context 

See #27389.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-13 23:10:14 +00:00
Scott Taylor
f7af18e1d6 Audio/Video shortcodes in the media modal:
* Make a generic model, `wp.media.model.PostMedia`, which replaces `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Make a generic library, `wp.media.controller.MediaLibrary`, which replaces `wp.media.controller.ReplaceVideo` and `wp.media.controller.ReplaceAudio`
* `wp.media.controller.MediaLibrary` is used to create new states that want to load a library filtered by type, making it incredibly simple to add states to frames. See `wp.media.view.MediaFrame.VideoDetails` and `wp.media.view.MediaFrame.AudioDetails`.

UX changes:

* Add the ability to manage HTML5 fallbacks - add additional `<source>`s or remove specific `<source>`s
* In the Video Details state, add the ability to select a poster image

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 05:25:15 +00:00
Scott Taylor
f0863476f5 In wp.media.model.PostAudio and wp.media.model.PostVideo, use Underscore's unset method when clearing out properties when the attachment changes.
See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-09 01:06:14 +00:00
Helen Hou-Sandí
4bb7e03548 At long last, a first pass at bringing the image editor into the media modal. props gcorne, DH-Shredder, tomauger. see #21811.
Built from https://develop.svn.wordpress.org/trunk@27445


git-svn-id: http://core.svn.wordpress.org/trunk@27292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 22:55:14 +00:00
Scott Taylor
bc9838f86f We shall pledge to run jshint before committing.
Props nacin for the nudge.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 16:06:14 +00:00
Scott Taylor
ff8844deae Add TinyMCE placeholders for audio and video shortcodes.
* Add `wp.media.mixin`.
* Add `wp.media.audio` and `wp.media.video`.
* Add `wp.media.model.PostAudio` and `wp.media.model.PostVideo`
* Add `wp.media.controller.AudioDetails` and `wp.media.controller.VideoDetails`.
* Add `wp.media.controller.ReplaceAudio` and `wp.media.controller.ReplaceVideo`.
* Add `wp.media.view.MediaFrame.AudioDetails` and `wp.media.view.MediaFrame.VideoDetails`.
* Add `wp.media.view.AudioDetails` and `wp.media.view.VideoDetails`.
* Update the `wpgallery` TinyMCE plugin.
* Display audio and video players in the media modal when shortcode is clicked.
* Provide a UI to edit shortcode attributes in the media modal.
* Provide a UI to replace the `src` media file in an `audio` or `video` shortcode.

See #27016.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 15:06:14 +00:00
Scott Taylor
0347a8944e Update the versions of several devDependencies in package.json. grunt-cssjanus has been updated to 0.2.2, we no longer need the fork. Run npm install to receive updates for node_modules in the project root.
Props yoavf, TobiasBg.
Fixes #26073.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-29 04:43:30 +00:00
Scott Taylor
e1759d668a For starters, [27050] is rad. This just cleans up some extra new lines that were littered about, updates *some* of the inline docs (needs more), moves wp.media.controller.ImageDetails closer to its parent class, and de-dupes some code in media-template.php.
See #24409.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 23:21:13 +00:00
Andrew Ozz
33eedc570b Introduce Edit Image (single mode) in the media modal and use it to edit images inserted in the editor. Adds new feature: replace an image in the editor. Props gcorne, see #24409.
Built from https://develop.svn.wordpress.org/trunk@27050


git-svn-id: http://core.svn.wordpress.org/trunk@26924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-28 21:17:12 +00:00
Andrew Nacin
d8564963b8 Temporarily remove CSS preprocessing until we can get our Ruby dependency sorted out.
see #25858, #22862.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 21:45:11 +00:00
Helen Hou-Sandí
437caa9972 Turns out it helps if you add those pesky Sass files if you're going to use a preprocessor. see #25858.
Built from https://develop.svn.wordpress.org/trunk@26139


git-svn-id: http://core.svn.wordpress.org/trunk@26050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 19:54:14 +00:00
Andrew Nacin
de7977d66c Move upgrader_process_complete for core to its proper place in Core_Upgrader.
This means it will be firing as a JS redirect is taking place if the update is from pre-3.4. Acceptable.

props dd32.
fixes #25659.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:58:23 +00:00
Drew Jaynes
4d1482cd0d Inline documentation for the WP_Date_Query class in wp-includes/date.php.
- Adds a complete hash notation for the `WP_Date_Query` arguments array.
- Adds missing documentation for the `date_query_valid_columns` and `get_date_sql` filter hooks.

Props aeg0125 for the incremental patches.
Fixes #25552.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:58:12 +00:00
Sergey Biryukov
6509e4e686 Declare args as a local variable. props greuben. fixes #25078.
Built from https://develop.svn.wordpress.org/trunk@25080


git-svn-id: http://core.svn.wordpress.org/trunk@25065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-22 02:11:08 +00:00
Bot (Assets)
6e798324e9 New develop.svn.wordpress.org repository based on the old core.svn repository.
* All WordPress files move to a src/ directory.
 * New task runner (Grunt), configured to copy a built WordPress to build/.
 * svn:ignore and .gitignore for Gruntfile.js, wp-config.php, and node.js.
 * Remove Akismet external from develop.svn. Still exists in core.svn.
 * Drop minified files from src/. The build process will now generate these.

props koop.
see #24976.

and see http://wp.me/p2AvED-1AI.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-07 05:49:02 +00:00
Bot (Assets)
4cd737c99d Compress scripts/styles: 3.6-RC2-24801.
git-svn-id: http://core.svn.wordpress.org/trunk@24801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-27 08:58:53 +00:00
Bot (Assets)
80158fee6c Compress scripts/styles: 3.6-RC1-24773.
git-svn-id: http://core.svn.wordpress.org/trunk@24773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-22 22:58:51 +00:00
Bot (Assets)
323c50372d Compress scripts/styles: 3.6-beta4-24653.
git-svn-id: http://core.svn.wordpress.org/trunk@24653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-11 00:22:41 +00:00
Bot (Assets)
86dd4f184c Compress scripts/styles: 3.6-beta3-24372.
git-svn-id: http://core.svn.wordpress.org/trunk@24372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-26 08:58:56 +00:00
Bot (Assets)
e1617a41e8 Compress scripts/styles: 3.6-beta3-24369.
git-svn-id: http://core.svn.wordpress.org/trunk@24370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-26 06:58:58 +00:00
Bot (Assets)
5e6ce84da3 Compress scripts/styles: 3.6-beta1-24138.
git-svn-id: http://core.svn.wordpress.org/trunk@24138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-29 17:46:49 +00:00
Bot (Assets)
0d19695389 Compress scripts/styles: 3.6-alpha-23894.
git-svn-id: http://core.svn.wordpress.org/trunk@23894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-03 18:58:47 +00:00
Bot (Assets)
5c6f23dcef Compress scripts/styles: 3.6-alpha-23596.
git-svn-id: http://core.svn.wordpress.org/trunk@23596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-03 22:58:36 +00:00
Bot (Assets)
dd4f8b9273 Compress scripts/styles: 3.5-RC3-23093.
git-svn-id: http://core.svn.wordpress.org/trunk@23093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 05:26:39 +00:00
Bot (Assets)
1077e9ce03 Compress scripts/styles: 3.5-RC3-23059.
git-svn-id: http://core.svn.wordpress.org/trunk@23059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-05 02:58:34 +00:00
Bot (Assets)
d3b24a0e15 Compress scripts/styles: 3.5-RC3-23047. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@23047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 22:44:27 +00:00
Bot (Assets)
392ade0221 Compress scripts/styles: 3.5-RC3-23035.
git-svn-id: http://core.svn.wordpress.org/trunk@23035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-04 18:58:30 +00:00
Bot (Assets)
293cfac069 Compress scripts/styles: 3.5-RC2-22995.
git-svn-id: http://core.svn.wordpress.org/trunk@22995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 08:09:10 +00:00
Bot (Assets)
b8a9b78359 Compress scripts/styles: 3.5-RC2-22988.
git-svn-id: http://core.svn.wordpress.org/trunk@22988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-03 05:42:30 +00:00
Bot (Assets)
cc0a122a7a Compress scripts/styles: 3.5-RC2-22971.
git-svn-id: http://core.svn.wordpress.org/trunk@22971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-02 16:50:10 +00:00
Bot (Assets)
f80e842fe6 Compress scripts/styles: 3.5-RC2-22958.
git-svn-id: http://core.svn.wordpress.org/trunk@22958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 17:41:19 +00:00
Bot (Assets)
41db8c91ff Compress scripts/styles: 3.5-RC2-22953. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-30 15:20:51 +00:00
Bot (Assets)
b538c8bd45 Compress scripts/styles: 3.5-RC1-22885. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-28 00:58:44 +00:00
Bot (Assets)
735c64c965 Compress scripts/styles: 3.5-RC1-22873.
git-svn-id: http://core.svn.wordpress.org/trunk@22873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 16:58:37 +00:00
Bot (Assets)
34ce6db507 Compress scripts/styles: 3.5-RC1-22844.
git-svn-id: http://core.svn.wordpress.org/trunk@22844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 16:58:36 +00:00
Bot (Assets)
2430f0f974 Compress scripts/styles: 3.5-beta3-22819.
git-svn-id: http://core.svn.wordpress.org/trunk@22820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 10:58:36 +00:00
Bot (Assets)
2f47959b2d Compress scripts/styles: 3.5-beta3-22810.
git-svn-id: http://core.svn.wordpress.org/trunk@22810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-22 06:58:42 +00:00
Bot (Assets)
f328a74f77 Compress scripts/styles: 3.5-beta3-22793.
git-svn-id: http://core.svn.wordpress.org/trunk@22793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 21:03:21 +00:00
Bot (Assets)
68e4e2c4a6 Compress scripts/styles: 3.5-beta3-22754.
git-svn-id: http://core.svn.wordpress.org/trunk@22754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 12:58:33 +00:00
Bot (Assets)
55a3b3a7f0 Compress scripts/styles: 3.5-beta3-22744.
git-svn-id: http://core.svn.wordpress.org/trunk@22744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 10:58:28 +00:00
Bot (Assets)
76d4e0c954 Compress scripts/styles: 3.5-beta3-22740.
git-svn-id: http://core.svn.wordpress.org/trunk@22740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-21 08:58:30 +00:00
Bot (Assets)
7f377032aa Compress scripts/styles: 3.5-beta3-22711.
git-svn-id: http://core.svn.wordpress.org/trunk@22711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 12:58:29 +00:00
Bot (Assets)
38b7b820aa Compress scripts/styles: 3.5-beta3-22701.
git-svn-id: http://core.svn.wordpress.org/trunk@22701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:58:28 +00:00
Bot (Assets)
f8b7c4ee59 Compress scripts/styles: 3.5-beta3-22668.
git-svn-id: http://core.svn.wordpress.org/trunk@22668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:58:29 +00:00
Bot (Assets)
29a9b52ca9 Compress scripts/styles: 3.5-beta3-22657. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:58:28 +00:00
Bot (Assets)
1889d7de3b Compress scripts/styles: 3.5-beta3-22598.
git-svn-id: http://core.svn.wordpress.org/trunk@22598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 04:58:34 +00:00
Bot (Assets)
29abff2525 Compress scripts/styles: 3.5-beta3-22584.
git-svn-id: http://core.svn.wordpress.org/trunk@22585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:58:34 +00:00
Bot (Assets)
e84d1f724d Compress scripts/styles: 3.5-beta2-22546.
git-svn-id: http://core.svn.wordpress.org/trunk@22546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 22:58:32 +00:00
Bot (Assets)
bbb099b2dd Compress scripts/styles: 3.5-beta2-22540.
git-svn-id: http://core.svn.wordpress.org/trunk@22540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 22:58:34 +00:00
Bot (Assets)
c57076aab7 Compress scripts/styles: 3.5-beta2-22515.
git-svn-id: http://core.svn.wordpress.org/trunk@22515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 22:58:35 +00:00
Bot (Assets)
0f3d286dd3 Compress scripts/styles: 3.5-beta2-22475.
git-svn-id: http://core.svn.wordpress.org/trunk@22475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-08 22:58:34 +00:00
Bot (Assets)
a94a72e010 Compress scripts/styles: 3.5-beta2-22438. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 20:29:58 +00:00
Bot (Assets)
3e51d043ab Compress scripts/styles: 3.5-beta2-22352.
git-svn-id: http://core.svn.wordpress.org/trunk@22352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-31 22:58:32 +00:00
Bot (Assets)
2e1aaeb2c5 Compress scripts/styles: 3.5-beta2-22326.
git-svn-id: http://core.svn.wordpress.org/trunk@22326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-29 22:58:31 +00:00
Bot (Assets)
3012719800 Compress scripts/styles: 3.5-beta1-22223. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-12 22:58:48 +00:00
Bot (Assets)
28cddba189 Compress scripts/styles: 3.5-beta1-22204.
git-svn-id: http://core.svn.wordpress.org/trunk@22204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-11 22:58:47 +00:00
Bot (Assets)
4efe0b5efa Compress scripts/styles: 3.5-beta1-22150.
git-svn-id: http://core.svn.wordpress.org/trunk@22150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-09 22:58:33 +00:00
Bot (Assets)
06d16327f5 Compress scripts/styles: 3.5-beta1-22128.
git-svn-id: http://core.svn.wordpress.org/trunk@22128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-07 02:27:48 +00:00
Bot (Assets)
baaf5c4cf8 Compress scripts/styles: 3.5-alpha-22024.
git-svn-id: http://core.svn.wordpress.org/trunk@22024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-26 22:58:46 +00:00
Bot (Assets)
fabcc374fd Compress scripts/styles: 3.5-alpha-21920.
git-svn-id: http://core.svn.wordpress.org/trunk@21920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-19 18:59:36 +00:00
Bot (Assets)
9481b4ae89 Compress scripts/styles: 3.5-alpha-21899.
git-svn-id: http://core.svn.wordpress.org/trunk@21899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-18 21:59:34 +00:00
Bot (Assets)
4a8bb5e3f8 Compress scripts/styles: 3.5-alpha-21879. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@21879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-17 00:59:40 +00:00
Bot (Assets)
a2d6299fb7 Compress scripts/styles: 3.5-alpha-21694.
git-svn-id: http://core.svn.wordpress.org/trunk@21694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 21:59:26 +00:00
Bot (Assets)
9bd2e882ee Compress scripts/styles: 3.5-alpha-21690.
git-svn-id: http://core.svn.wordpress.org/trunk@21690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 18:59:24 +00:00
Bot (Assets)
064a570aa7 Compress scripts/styles: 3.5-alpha-21684.
git-svn-id: http://core.svn.wordpress.org/trunk@21684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 06:59:25 +00:00
Daryl Koopersmith
c217397faa Add new media workflow scripts, styles, and templates.
Please note that this commit does not integrate media into the existing UI. If you would like to see the new UI, navigate to the post editor and run the following in your browser's Javascript console:

	new wp.media.controller.Workflow().render().modal.open();


The Javascript is broken up into two files, with the slugs media-models and media-views.

* media-models: The models are UI agnostic, and can be used independent of the views. If you'd like to create custom UIs, this is the script for you.

* media-views: This is the Media Experience. The views (and controllers) depend on the models (which are listed as a dependency and will automatically be included thanks to wp_enqueue_script). The views also require the media templates, media-view styles, and the plupload bridge settings. Perhaps we should create a function to include the whole shebang, but in the meantime...

To include media-views in the admin, run the following PHP in or after 'admin_enqueue_scripts':

	wp_enqueue_script( 'media-views' );
	wp_enqueue_style( 'media-views' );
	wp_plupload_default_settings();
	add_action( 'admin_footer', 'wp_print_media_templates' );

see #21390.



git-svn-id: http://core.svn.wordpress.org/trunk@21683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-31 04:54:23 +00:00