jenkins-bot
0e4ed61772
Merge "Use TemplateData's suggested
status for parameters"
2014-04-28 19:15:53 +00:00
Alex Monk
a72da562a7
Add dynamically generated list of namespaces to visualeditor-enable preference
...
Bug: 51411
Change-Id: I9ce50f73159f832afcbd5c64e24554b69eb14bf7
2014-04-28 19:11:38 +00:00
James D. Forrester
3569efba3b
Use TemplateData's suggested
status for parameters
...
Change-Id: I8c8522d1fcc7e7b26984d72a8f8aaaedbddb9cb4
2014-04-28 12:10:31 -07:00
jenkins-bot
27d3286362
Merge "Don't change section edit links on foreign file description pages"
2014-04-28 18:53:06 +00:00
Krenair
e815d586cc
Don't change section edit links on foreign file description pages
...
We have no proper way to check whether VE is enabled on the remote wiki.
Bug: 54259
Change-Id: I4b0edc00ee9736b282820d4a504f1702ab0590fc
2014-04-28 11:49:14 -07:00
Krenair
032d9d53ec
Fix tab selection on monobook
...
Don't unselect article tab when loading VE, do unselect when restoring normal view mode.
Bug: 49407
Change-Id: I4b6e5c898a8af2b404151bba46359dc4bfbd739e
2014-04-28 16:42:01 +01:00
Translation updater bot
d85317a710
Localisation updates from https://translatewiki.net .
...
Change-Id: I89c75a8a6694089f6bf9ac71ab3b0508d39f3c47
2014-04-27 20:33:55 +00:00
Translation updater bot
319f0063f9
Localisation updates from https://translatewiki.net .
...
Change-Id: I936b4f5d654a7326ecb152dbc6152eb2cc547370
2014-04-26 19:26:35 +00:00
jenkins-bot
a8ab44772b
Merge "Delete extensions nodes which have been made empty"
2014-04-26 00:16:42 +00:00
Ed Sanders
9beb92a102
Delete extensions nodes which have been made empty
...
If they have allowedEmpty=false.
Also remove unnecessary instanceof check.
Change-Id: I388202c9da5673534486b1d9d345296feeec53c3
2014-04-25 16:13:31 -07:00
Krenair
7645b9805b
Call clearAllMessages in setup instead of swapPanel on the save dialog
...
Was clearing things like captchas when swapping panels. It still makes
sense to clear these when opening up the dialog though.
Bug: 62766
Change-Id: I37ceeebc672e2866b805631b189108d8363bdc9f
2014-04-25 22:44:39 +01:00
Translation updater bot
2b99b8a198
Localisation updates from https://translatewiki.net .
...
Change-Id: I46ed3b081088823c0ef2aab05ddd32d2ff8ef245
2014-04-25 19:45:31 +00:00
Krenair
94b5c8dfa5
Support QuestyCaptcha and (kind of) MathCaptcha
...
MathCaptcha just extends SimpleCaptcha, so its output is fine to show as
text. Doing that because I'm not sure how to render TeX and this is a
reasonable fallback
Also tidy up the order of some message entries in my last commit.
Bug: 64328
Change-Id: I98312f61471667e7c4dcf715295f85642c31a688
2014-04-24 21:45:20 +01:00
Translation updater bot
df31603932
Localisation updates from https://translatewiki.net .
...
Change-Id: I86a9f684a976e456d02844f21b4d5f1641ff9328
2014-04-24 19:37:54 +00:00
Ed Sanders
2bc50e2e83
Image frame icons
...
Change-Id: Icc2d4f44db2860ce11b8022035ba670d7d5bf064
2014-04-24 10:50:00 -07:00
Ed Sanders
be36dfca25
Use core language search dialog
...
Depends on I21a9d7e in core.
Change-Id: I12cacf775b490d7c676011a5a154deeefe5527c5
2014-04-23 18:43:03 -07:00
jenkins-bot
3050b22ea2
Merge "Fix docs in ve.ui.MWParameterSearchWidget.js"
2014-04-24 01:17:15 +00:00
Ed Sanders
69ef943e46
Fix docs in ve.ui.MWParameterSearchWidget.js
...
Also re-use hasQuery variable.
Change-Id: I6166e45c6397723c6949f22f02af8b160e45ad4e
2014-04-23 18:14:42 -07:00
jenkins-bot
1739638577
Merge "Make citation dialog display like transclusion dialog in single mode"
2014-04-24 01:09:54 +00:00
jenkins-bot
2a675d0ce8
Merge "Add support for SimpleCaptcha"
2014-04-24 01:09:29 +00:00
jenkins-bot
931952cb95
Merge "Enable the language tool as a Beta Feature"
2014-04-24 00:55:15 +00:00
James D. Forrester
11dfcd269c
Enable the language tool as a Beta Feature
...
Change-Id: I14560b758c664081110c76a709a7279c9840cc11
2014-04-23 17:46:27 -07:00
Trevor Parscal
30d9d99ae4
Make citation dialog display like transclusion dialog in single mode
...
This is a hack, should be cleaned up soon.
Bug: 64199
Change-Id: I01effbfd0fc6da41596c73e375d237443ebb9d70
2014-04-23 17:36:49 -07:00
jenkins-bot
d2e5874ece
Merge "Hide some tools when VE is open"
2014-04-23 23:06:52 +00:00
Krenair
62e07f8008
Add support for SimpleCaptcha
...
Bug: 64328
Change-Id: I04dd82e72184dcef6a660c0886b16a1086ed0b26
2014-04-23 23:30:52 +01:00
jenkins-bot
351ff28247
Merge "[Browser tests] Do not display link to Sauce Labs when using local browser"
2014-04-23 20:35:30 +00:00
jenkins-bot
ad7b59cb36
Merge "[Browser tests] Fix typo in file name"
2014-04-23 20:29:24 +00:00
jenkins-bot
e7efee143f
Merge "Unbreak badtoken recovery on mobile"
2014-04-23 19:59:23 +00:00
Translation updater bot
181cf02085
Localisation updates from https://translatewiki.net .
...
Change-Id: If1c787db33cb364f912a554ff13a9117bd33c79b
2014-04-23 19:57:08 +00:00
Roan Kattouw
54d06b2a3d
Unbreak badtoken recovery on mobile
...
When recovering from a badtoken error, mw.Target called saveDocument(),
but that method only exists in ViewPageTarget. Instead, call .save()
again.
Also pass the HTMLDocument and the save options around to the success
and error handlers, because we need them in order to be able to
call .save().
Bug: 64267
Change-Id: I4743f855dc77f4a9ac427d67d15fb96b7ad770f2
2014-04-23 12:30:48 -07:00
jenkins-bot
f89254509a
Merge "[Browser tests] Move "I can click the X on the save box" to shared_steps.rb"
2014-04-23 18:31:09 +00:00
Krenair
df38c8b55e
Hide some tools when VE is open
...
Bug: 57940
Change-Id: I2f586e8c73affe1b7f14c40ba892774e784f09c8
2014-04-22 23:47:54 +01:00
Translation updater bot
93884808bc
Localisation updates from https://translatewiki.net .
...
Change-Id: Ie7a66b16de331d365e489065e87cb2e9749113d7
2014-04-22 19:21:57 +00:00
Željko Filipin
78c22e7432
[Browser tests] Do not display link to Sauce Labs when using local browser
...
Provided by mediawiki_selenium 0.2.21.
Bug: 58040
Change-Id: Ia49a752212c4c4029c1a23f7648529cb2259adae
2014-04-22 15:50:25 +00:00
Roan Kattouw
e634be5428
[Browser tests] Fix typo in file name
...
Change-Id: Ie5a3a0c5213c354bea5a891c3a7d1514f4720b0b
2014-04-21 18:09:40 -07:00
Roan Kattouw
9eb121134f
[Browser tests] Move "I can click the X on the save box" to shared_steps.rb
...
Doesn't belong in headings_steps.rb because it's used in other
*.feature files like bullets.feature
Change-Id: I23d3772653140e6e4639785c3622fc9a2b446801
2014-04-21 18:08:23 -07:00
jenkins-bot
fe04b902fb
Merge "Add checkboxes to set some metadata on page metadata panel"
2014-04-21 23:34:27 +00:00
Krenair
021152586b
Add checkboxes to set some metadata on page metadata panel
...
Also fixes some errors in I752705f6
And while we're there, clean up some mostly duplicate functions
Bug: 57169
Bug: 57170
Bug: 57171
Bug: 57172
Change-Id: I1e3dca3868a267e91bccb0ae277012c26ca82174
2014-04-21 16:29:31 -07:00
jenkins-bot
5429c78eac
Merge "Hide ULS button"
2014-04-21 22:54:17 +00:00
Roan Kattouw
ba455643fc
[BREAKING CHANGE] Update VE core to master (cb2e61b)
...
Update dialogs and inspectors for breaking change in VE core
New changes:
a553012 [BREAKING CHANGE] Merge dialog and inspector actions into window actions
f9a0419 Localisation updates from https://translatewiki.net .
cbe81a0 Fix path to spinner in ve.ui.SpecialCharacterInspector.css
Change-Id: Icf90ace6442364283b66b234e3c78fc65212f070
2014-04-21 15:32:59 -07:00
Ed Sanders
b74aa4160b
Hide ULS button
...
Currently it steals focus it doesn't use an iFrame, so we can't use
it in this way.
Change-Id: I4df95f3b60bc63b0ce296a06da648e96d94bf20f
2014-04-21 14:24:49 -07:00
Translation updater bot
361c1d3928
Localisation updates from https://translatewiki.net .
...
Change-Id: Ica3582d2e80473251cc2890fea2e137883637962
2014-04-21 20:26:59 +00:00
jenkins-bot
aba8d09f35
Merge "[Browser tests] Disable svwikt production test as it's NS_USER-only"
2014-04-21 19:31:23 +00:00
jenkins-bot
f8b7b0d849
Merge "Add GENDER support to visualeditor-editconflict"
2014-04-21 19:29:59 +00:00
James D. Forrester
dd81908a50
[Browser tests] Disable svwikt production test as it's NS_USER-only
...
Unlike all other wikis with VisualEditor enabled, svwiktionary is set to
only allow VisualEditor in the User: namespace, so causing the production
test (which blindly tries to make a dummy edit in the main namespace) to
fail. For now, will just remove this one from the test.
Change-Id: I6f1eb8bd6bd384e1c9ca77c0036e3914f0dbe070
2014-04-21 19:29:29 +00:00
jenkins-bot
d2563c7e6f
Merge "Use wgPageName instead of wgTitle when fetching language links"
2014-04-21 19:22:46 +00:00
jenkins-bot
a1c4df7980
Merge "Update wgRevisionId when we change wgCurRevisionId"
2014-04-21 19:06:44 +00:00
Roan Kattouw
1313e70618
Use wgPageName instead of wgTitle when fetching language links
...
Bug: 49226
Change-Id: I4085457ba8601ee8a1f09bd1008a2bbf15209a25
2014-04-21 19:04:05 +00:00
Amir E. Aharoni
595524f7a6
Add GENDER support to visualeditor-editconflict
...
Change-Id: I3257d56107772c26a41e0b2bfcc71509cd1c9284
2014-04-21 16:47:23 +03:00
Translation updater bot
431d2bd400
Localisation updates from https://translatewiki.net .
...
Change-Id: I2f17e57914232c35269de6071016d04aea27f6f7
2014-04-20 20:11:59 +00:00
jenkins-bot
df6915299f
Merge "Clarify the message visualeditor-dialog-meta-categories-sortkey-label"
2014-04-19 19:55:09 +00:00
Amir E. Aharoni
a04582dba3
Clarify the message visualeditor-dialog-meta-categories-sortkey-label
...
Explaining that the sorting is about the name of the page
should make this feature clearer for new editors.
Change-Id: I9f152e0d3dc5e9bf937d9222d95b7c3c15db87f9
2014-04-19 12:52:12 -07:00
Krenair
167a2f341e
Update wgRevisionId when we change wgCurRevisionId
...
Bug: 56532
Change-Id: Ibb5a92d66a7a60ef516d3ef385b4473919a6ac63
2014-04-19 17:59:28 +01:00
Amir E. Aharoni
440fd82f3b
Clarify the text of visualeditor-dialog-media-position-checkbox
...
Change "Wrap content with this item" to
"Wrap text around this item".
The content is usually text, so using "text" should be
clearer and easier.
And saying "wrap content with this item" may be understood
as if the text is wrapped inside the content, which
is not the case.
Change-Id: I6b9e8767d38eb39ae4d671f452660db6b89fe3d9
2014-04-19 11:57:36 +03:00
James D. Forrester
6e02932c3a
[Browser tests] Updated list of production wikis to check
...
Now with no wikis deliberately skipped – all passing:
Newly-working wikis:
* bpy.wikipedia.org
* cv.wikipedia.org
* mzn.wikipedia.org
* new.wikipedia.org
Previously-working wikis that weren't added here yet:
* bat-smg.wikipedia.org
* be-x-old.wikipedia.org
* cbk-zam.wikipedia.org
* fiu-vro.wikipedia.org
* map-bms.wikipedia.org
* my.wikipedia.org
* nds-nl.wikipedia.org
* roa-rup.wikipedia.org
* roa-tara.wikipedia.org
* zh-classical.wikipedia.org
* zh-min-nan.wikipedia.org
* zh-yue.wikipedia.org
Newly-added wikis that weren't added here yet:
* meta.wikimedia.org
* incubator.wikimedia.org
* fr.wiktionary.org
* sv.wiktionary.org
* fr.wikibooks.org
* fr.wikiversity.org
* fr.wikinews.org
The file has been sorted into the same order as visualeditor.dblist for
the convenience of future changes – broadly:
* Test and meta wikis (inc. MediaWiki.org and Wikimedia Incubator)
* Wikipedias
* Wiktionaries
* Wikiquotes (none done yet)
* Wikibooks
* Wikisource (none done yet)
* Commons (not done yet)
* Wikispecies (not done yet)
* Wikiversities
* Wikinewses
* Wikimanaias (none done yet)
* Wikivoyages (none done yet)
* Wikidata (not done yet)
* Wikimedia (chapter wikis)
* Private wikis (not tested here)
Bug: 60842
Change-Id: I2678a3c716487bfd8dadff68d003d0039d730f36
2014-04-18 21:56:58 +00:00
jenkins-bot
fd0b1d34b9
Merge "Use new OOUI pending feature rather than loading bar thing on save dialog"
2014-04-18 21:20:51 +00:00
Amir E. Aharoni
e21b4db424
Add GENDER to visualeditor-dialog-transclusion-no-template-description
...
Change-Id: I0ba67a8a705cd652a75bbf72892056813705e7d6
2014-04-19 00:04:39 +03:00
Krenair
b6f1793bf8
Use new OOUI pending feature rather than loading bar thing on save dialog
...
See I5c45cc6 for the oojs-ui change and I2fa71a1d for a similar commit
Change-Id: I77e3274a196bc13ae19a9520197f4a8b624fd528
2014-04-18 21:57:14 +01:00
Roan Kattouw
654d641c5f
Update VE core submodule to master (33ca43b)
...
Reorganize stylesheets in VE-MW to match JS directory structures,
and update VisualEditor.php for similar reorganization in VE core.
New changes:
c6ed962 Reorganize stylesheets
Change-Id: I4f1070643744fb2ee6726cb03e012e31a9a05c64
2014-04-18 13:28:31 -07:00
jenkins-bot
f002889376
Merge "Make transclusion dialog "pending" while loading"
2014-04-18 20:12:05 +00:00
Translation updater bot
1099f1117f
Localisation updates from https://translatewiki.net .
...
Change-Id: Icf474ecf74335c6448f099df8176b67757593233
2014-04-18 19:37:56 +00:00
jenkins-bot
987b10da94
Merge "Check useeditwarning preference before showing warning when browsing away from editor"
2014-04-18 19:24:23 +00:00
jenkins-bot
3ca0b1f677
Merge "Disable transclusion dialog mode button while loading"
2014-04-18 19:13:10 +00:00
jenkins-bot
643237063c
Merge "Make Hiero node live update"
2014-04-18 18:23:58 +00:00
jenkins-bot
93dfec1b7e
Merge "Create MWLiveExtensionInspector base class"
2014-04-18 18:23:50 +00:00
jenkins-bot
da475dd4b1
Merge "[browser test] increase wait for save to complete"
2014-04-18 16:41:02 +00:00
cmcmahon
c4707a05fb
[browser test] increase wait for save to complete
...
sleep() is evil, but let this stay at least for now
Change-Id: If3c98b2a05ea37dee0365afd5f17cf8b282ab29a
2014-04-18 09:38:27 -07:00
Željko Filipin
1236387abd
[browser test] Run all Selenium tests in Firefox
...
Paired with: Chris McMahon
Bug: 58040
Change-Id: I83d4c391fc101bda8c18a6d0c533ca75795569ff
2014-04-18 17:33:12 +02:00
jenkins-bot
caecb84b9b
Merge "Remove Function.prototype.bind from compatibility check"
2014-04-18 04:16:49 +00:00
Ed Sanders
28bd951c90
Make Hiero node live update
...
Just change inheritence.
Change-Id: Id63f545d16a478e336ddeb6cc8f1a31c88ee1aaa
2014-04-17 17:59:00 -07:00
James D. Forrester
e09e6c9f28
Create MWLiveExtensionInspector base class
...
Most of the code stolen from MWMathInspector and genericised.
Also fix issues with fragment not wrapping the new node correctly.
Bug: 58286
Bug: 58045
Change-Id: I708c4cb012becf8c493d5b65a051c0b13f7a11ac
2014-04-17 17:58:56 -07:00
Ed Sanders
29476afe83
Use forced directionality for HieroInspector
...
Change-Id: I2f4b15fb7bc1b3d028106e09fb5039ee5cb2987a
2014-04-17 17:03:51 -07:00
Trevor Parscal
062b2ed681
Make transclusion dialog "pending" while loading
...
Also, only allow animation of anything after things are ready
Depends on I5c45cc6 in oojs-ui
Change-Id: I2fa71a1d9a43db960aac4c1fad87eae96c898fad
2014-04-17 15:06:11 -07:00
Trevor Parscal
89f040626e
Disable transclusion dialog mode button while loading
...
Change-Id: Iec8ea9d490b43504d25ecf05bd4a43701d503c35
2014-04-17 15:03:43 -07:00
Ed Sanders
8070f48d27
Extension inspector directionality
...
Use a dir string instead of isLtr boolean like we do everywhere
else. Also use this.constructor.static, not this.static inside
methods.
Fixes Ie0525628.
Bug: 64072
Change-Id: I5321b71a446802d89ca86d55a0bff855b69825eb
2014-04-17 22:00:36 +00:00
Translation updater bot
25d1ca0659
Localisation updates from https://translatewiki.net .
...
Change-Id: Id4f98d4bd9e6cbfb0ff845eedf7a3e68c2eaedb9
2014-04-17 19:02:52 +00:00
Alex Monk
ca547a7f7c
Check useeditwarning preference before showing warning when browsing away from editor
...
Bug: 51057
Change-Id: Ic4b02372e6e08d3a0d36457457a2e2bbfbaa797d
2014-04-17 15:57:10 +01:00
James D. Forrester
df31082085
Remove Function.prototype.bind from compatibility check
...
We aren't using it anyway, and it blocks some browsers unnecessarily
(PhantomJS in particular).
Change-Id: I90b1124704bfaf571212fdf9e187a450104176dc
2014-04-17 03:49:03 +00:00
jenkins-bot
a1fd95e522
Merge "Don't change tabs on Education Program pages"
2014-04-17 03:38:50 +00:00
Krenair
e3be4a6588
Don't change tabs on Education Program pages
...
Unfortunately the best way I've come up with to do this so far is
checking the namespace.
Bug: 53477
Change-Id: Ib2dbe91aff516f2d2408e07ff3f73ea861bfcbe2
2014-04-16 20:33:24 -07:00
jenkins-bot
564e77bc43
Merge "Allow MWExtensionInspector to be set to forced LTR status"
2014-04-17 03:21:17 +00:00
jenkins-bot
07a7708da1
Merge "Follow redirects in the category widgets"
2014-04-17 02:44:41 +00:00
Trevor Parscal
926700fbca
Re-split the transclusion dialog
...
We used to have two dialogs; a complex one, and a subclass that dumbed it
down - this was rubbish.
Then we merged them together - this was a'ight.
Now we have two dialogs again; a simple one, and a subclass that fancies
it up a bit - this is wicked keen broham.
Change-Id: I4b2ba31bed5c4f80940623702d635cacd19e0a66
2014-04-17 01:39:18 +00:00
James D. Forrester
0e4676e6a9
Allow MWExtensionInspector to be set to forced LTR status
...
This is used in e.g. the formula editor and it's potentially useful.
Change-Id: Ie05256285e517c2d0d464822befbf81f2d9209e3
2014-04-16 18:34:26 -07:00
jenkins-bot
537fbc95f9
Merge "Use the correct classname in MobileViewTarget"
2014-04-17 00:45:08 +00:00
Roan Kattouw
5b0d4b5286
Use the correct classname in MobileViewTarget
...
Change-Id: I7e0a5aa56116dd7f44cbac29e0b6bc5d760e157e
2014-04-16 17:41:18 -07:00
Roan Kattouw
4fc08d24c5
Make the Add template button not wrap to the next line
...
By default, MWTitleInputWidgets are now 30em wide, but this doesn't
work in the transclusion dialog where we want to put the "Add template"
button after an MWTitleInputWidget and have it not wrap to the next line.
So make the MWTitleInputWidget on the add template page 20em wide instead
(this is what they all were before the default was changed to 30em).
Change-Id: I2f33a87427657f4e27939c401436c4ce6441208c
2014-04-16 16:24:45 -07:00
Roan Kattouw
2262073c9c
Update VE core submodule to master (4366f20)
...
Use new dm.Surface method for checking undo history state
(hasPastState -> hasBeenModified).
New changes:
38776df [BREAKING CHANGE] Refactor history state methods to better suit uses
3412b41 Localisation updates from https://translatewiki.net .
0c5238c Add system to dm.Surface for staging changes
8f0077c Only hide popups on selection change
4575f82 Fix initial selection when focusing in Firefox
debfd4e Document focus/blur cleanup
Change-Id: Ic66c96a4f64ad82a01a84535ca8cd19332065b37
2014-04-16 15:57:28 -07:00
Roan Kattouw
9d1b7432fd
Also focus surface in media edit dialog
...
16ec8ffdcf
did this for the reference dialog, but the media edit
dialog needs it too. Additionally, we need to focus it when the
user switches to a different page then comes back.
Bug: 63909
Change-Id: If1b9587f4d10dbe6374e987b35c781954bcc566d
2014-04-16 15:12:39 -07:00
jenkins-bot
4d6a59b16b
Merge "Focus the surface in the reference dialog after it opens"
2014-04-16 19:00:51 +00:00
jenkins-bot
266bc709f6
Merge "Always replace state with VE tag when loading"
2014-04-16 18:50:09 +00:00
Roan Kattouw
d335e59330
Fix another surfaceModel.getFragment() in MWCitationDialog
...
Change-Id: Ic12652bf3d53396f84d558595ce1e4a2d0a22796
2014-04-16 11:42:15 -07:00
Roan Kattouw
16ec8ffdcf
Make inserting reference lists work again
...
surfaceModel.getFragment() is a null fragment, use this.getFragment()
Bug: 64012
Change-Id: I995929ff0dda60220e17e579994b51ffb406f149
2014-04-16 11:40:26 -07:00
jenkins-bot
e708595f14
Merge "Make fieldsets render properly"
2014-04-16 18:27:16 +00:00
jenkins-bot
fb366c47f1
Merge "Hide inspectors using new method when saving"
2014-04-16 18:27:05 +00:00
Translation updater bot
c83a165b3c
Merge "Localisation updates from https://translatewiki.net ."
2014-04-16 18:16:16 +00:00
Translation updater bot
7eeeccc841
Localisation updates from https://translatewiki.net .
...
Change-Id: I7b42029a5301cd0a3a3a4d2a095261aa036935b7
2014-04-16 18:15:39 +00:00
Moriel Schottlender
fa72f5fdc2
Border checkbox disabling/enabling fix
...
Due to a lack of clarity in the wikitext documentation the border
checkbox wasn't set up right. This is the proper behavior: border is
allowed for all unframed images (frameless and basic) while the
framed images (frame and thumb) have it anyways. Wikitext
documentation was also clarified for prosperity.
Change-Id: I4dd4775da473d669781553796be99646240c13fe
2014-04-16 13:14:58 -04:00
Krenair
e9153fdccf
Always replace state with VE tag when loading
...
Instead of just when venotify is used. To stop the back button breaking.
Bug: 63739
Change-Id: I637818f34a9015076c85c6daccb337503ad2499d
2014-04-16 18:02:10 +01:00
cmcmahon
d62a9e939a
[browser test] Save page is slow.
...
Change-Id: I550c462795f3e51555a21e0877985052610ad8cc
2014-04-16 08:52:21 -07:00