Commit graph

5629 commits

Author SHA1 Message Date
Translation updater bot 2fb6b5662c Localisation updates from https://translatewiki.net.
Change-Id: I4b2ba5709553ad9bb5442d5fc238185ec28ea1a2
2014-04-04 20:26:09 +00:00
jenkins-bot b71e58c0f7 Merge "Give the edit tab <li> closest to the collapsed tabs menu class=collapsible" 2014-04-04 19:32:21 +00:00
jenkins-bot aeb4fabd2d Merge "Fix order of start and base timestamps when switching to the wikitext editor" 2014-04-04 19:31:58 +00:00
cmcmahon 9f57feff2f [browser test] maintenance, locator changed
Change-Id: I9d9f410afe6d4fd90489ba7816b9c0dec92460b0
2014-04-04 11:51:30 -07:00
Trevor Parscal 9556467595 Revert edit mode tool's onSelect method
Turns out surfaces don't have access to targets after all.

Bug: 63503
Change-Id: Ib14291ce4efe4b3dd5579cd270828936b6a175ae
2014-04-04 00:04:29 +00:00
Krenair 9dac9f2c04 Fix order of start and base timestamps when switching to the wikitext editor
These were backwards which was triggering edit conflict detection for all users.

Fortunately for logged in users, if Revision::userWasLastToEdit was given a bad
timestamp (e.g. when we submitted here), it would just return true, suppressing
the conflict. It always showed a conflict for anonymous users however.

Bug: 56835
Change-Id: Ib07f965238ca96e17bf59b34da8a8e789954da61
2014-04-03 23:06:41 +01:00
Translation updater bot f7067dca44 Localisation updates from https://translatewiki.net.
Change-Id: Ic032f178137196b0186ceb9682d7c3e2db12e234
2014-04-03 19:47:40 +00:00
Krenair e3b7827c44 Give the edit tab <li> closest to the collapsed tabs menu class=collapsible
Bug: 50225
Change-Id: Ib2e6237483338c8072d5f7919c6459bf7418946a
2014-04-03 02:16:13 +01:00
Ed Sanders 391e247c90 Show the debug bar in MW if ve.debug is set
Depends on Ide1487250e in core.

Change-Id: Ia31e498b565c4db79026e0e40f515a2b65bbbde2
2014-04-02 17:33:29 -07:00
Trevor Parscal 793fbb0e24 Correctly insert or update citations based on template option
When using a tool that opens a citation or citation transclusion dialog,
the dialog shouldn't use edit mode unless the template in the node and the
template the tool would insert match.

Bug: 63452
Change-Id: I34a5a2da576247f4046da45f742bccc3cec22c5a
2014-04-02 16:38:34 -07:00
Roan Kattouw 03c5822b6b Update VE core submodule to master (c5f4f78)
Also update tools for changes in VE core.

New changes:
e4de14b Make tools use commands
e029817 Make getToolsForNode place primary commands first

Change-Id: I66575ee6d49e6b2f5a5f789978da98bb55e6dc5e
2014-04-02 16:30:12 -07:00
cmcmahon 85abbf7b4e [browser test] extend timeout waiting for edit surface to appear
Bug 63447

Change-Id: I0be4142817251147400ea34ebdb04bba760f2161
2014-04-02 14:37:46 -07:00
Translation updater bot b677d97069 Localisation updates from https://translatewiki.net.
Change-Id: I0e2a93f0ee66f7ab625295179a71e43c10c6e20b
2014-04-02 19:15:31 +00:00
Translation updater bot 700850150f Localisation updates from https://translatewiki.net.
Change-Id: I51371fb8ddfe773b91f58be80dbf071fc568ec7e
2014-04-01 19:53:37 +00:00
Trevor Parscal 9e38cafc9f Remove constructive flag from return to save form button
It doesn't create anything, so it shouldn't be constructive.

Change-Id: I97d6fc3c5f992033e55ee6cde48245b1e96ddc16
2014-03-31 15:31:43 -07:00
Translation updater bot 9c7c75851e Localisation updates from https://translatewiki.net.
Change-Id: I2f51ea9f1cd6d32d5124c5e732619528f8463355
2014-03-31 20:18:09 +00:00
Translation updater bot ea6b563036 Localisation updates from https://translatewiki.net.
Change-Id: Ife10e6bf2b80daed9e9f6b71be79a7812a1e51ea
2014-03-30 20:16:19 +00:00
Translation updater bot d57207abe4 Localisation updates from https://translatewiki.net.
Change-Id: Icbaa80974a70e6456c51940a6a60aef423710820
2014-03-29 21:20:19 +00:00
James D. Forrester f1471a59f3 MWMediaSearchWidget: Bump media search result size to 20
At 15 the new, taller dialog means we never get to search for more…

Change-Id: I255d93b8230f962579e1a07840b7cc209577876b
2014-03-29 00:08:59 +00:00
jenkins-bot cd391966de Merge "Update VE core submodule to master (e972bb7)" 2014-03-28 20:13:44 +00:00
James D. Forrester e56b425120 Update VE core submodule to master (e972bb7)
New changes:
e972bb7 Split-up theme-specific styles

Local changes:
* Split-up theme-specific styles

Change-Id: I4af6c03413d49cb05031d439caf340ddef996355
2014-03-28 12:56:19 -07:00
Translation updater bot 63506cc9c9 Merge "Localisation updates from https://translatewiki.net." 2014-03-28 19:42:57 +00:00
Translation updater bot 90d7f62722 Localisation updates from https://translatewiki.net.
Change-Id: I68c366d30386faadca1de6d7442a2bb398c88a41
2014-03-28 19:41:28 +00:00
Trevor Parscal 7e80d5dfa8 Rename CSS file to relate to actual style names
Change-Id: Iece39a7cb34ea4a51e5aba10df60ea870bf912f8
2014-03-28 11:56:02 -07:00
Translation updater bot bd00517709 Localisation updates from https://translatewiki.net.
Change-Id: I0481610b68222928b745b664edd6c90d9748b03f
2014-03-27 20:33:09 +00:00
cmcmahon c83ef84cdc [browser test] updates for no beta warning to dismiss
See https://gerrit.wikimedia.org/r/#/c/119217/

Change-Id: If3b6f7c9b9a7ce3a4d4c5d8b822d123b50d3c106
2014-03-27 17:24:12 +01:00
Roan Kattouw c06a86587c Deal with Parsoid's protocol-relative <base> tags in a DOMParser world
Protocol-relative <base> tags are fine when the iframe trick is used
because the iframe inherits a default base URL from the parent document,
so if the <base> is relative it can be resolved against that. However,
a document created with DOMParser (or document.implementation, oops!)
won't inherit anything, so anything other than a fully absolute <base>
will just break.

To make Parsoid's relative <base> work anyway, resolve it in the
context of the main document, then write the resolved version
back into the <base> tag.

Change-Id: I7261bd5dbe9ec1f4077a4e5a00bd2a03ac237ca0
2014-03-26 21:56:23 -07:00
James D. Forrester c149b1c071 Update VE core submodule to master (9c19df0)
New changes:
0318f64 Fix copyright year range for one file not updated to 2011-2014
4dbd57e Add <base> for relative URLs in tests
554cde9 Localisation updates from https://translatewiki.net.
c32448a Update OOjs UI to v0.1.0-pre (1c7875205a)
8f675c8 Localisation updates from https://translatewiki.net.
4fb929c Add a <base> to every test document by default
09c404c Protect against invalid/absent <base> in ve.resolveUrl()
05924db Use DOMParser in ve.createDocumentFromHtml() if available
9c19df0 Update OOjs UI to v0.1.0-pre (e697490c9b)

Local changes:
Use ve.dm.example.base for link tests in mwExample

Change-Id: I384e2a2edeebe9379de4910889a61670d9f734f5
2014-03-26 21:33:52 -07:00
jenkins-bot fc5b995ee9 Merge "Hack around Parsoid's href prefixing in rendering new links" 2014-03-26 22:56:02 +00:00
jenkins-bot 50f9f2b983 Merge "Fix copyright year range for fourteen files not updated to 2011-2014" 2014-03-26 22:55:08 +00:00
jenkins-bot 927d24968d Merge "Make cite transclusion tools actually work" 2014-03-26 22:48:54 +00:00
Trevor Parscal ca95923d73 Make cite transclusion tools actually work
The transclusion tools shown in the toolbar in the reference dialog
passed a template to open with to the transclusion dialog, but it
didn't take that config parameter.

Moved this parameter up from CitationDialog to TransclusionDialog,
and moved its logic into the setup function.

Bug: 63037
Change-Id: I9249c845a5ae7cca2ec4d75d69e1236f7755d246
2014-03-26 22:42:30 +00:00
jenkins-bot 24efd6bd8d Merge "Blank the reference and media search queries when closing dialogs" 2014-03-26 21:49:36 +00:00
Translation updater bot f774eeb4c8 Localisation updates from https://translatewiki.net.
Change-Id: I1e5e7df6dcffd49f336ddb800fdcea2c7b0663ef
2014-03-26 20:43:17 +00:00
cmcmahon b15627f0ec [browser test] Wait longer for save in multiedit workflow.
This timeout caused the only test failure overnight Mar 25.
Timeouts are bad.

Change-Id: I070c3362271ad23b7c38922858ad4079d0754a45
2014-03-26 08:49:56 -07:00
jenkins-bot 460bb9b884 Merge "Rename stray this.refGroup usage to this.group in MWReferenceModel" 2014-03-25 21:09:00 +00:00
Translation updater bot c5644e7703 Localisation updates from https://translatewiki.net.
Change-Id: I9130701ed558bb9486c362706c574733a194cc2c
2014-03-25 20:53:52 +00:00
Roan Kattouw 04f3296234 Rename stray this.refGroup usage to this.group in MWReferenceModel
this.refGroup is only ever read and never written, so obviously it's
always undefined. And it turns out that creating references with
listGroup='mwReference/undefined' crashes when you try to remove
them again.

Bug: 63085
Change-Id: Id326208bd6b3fe3b602ed6e3b57b7ea06d8ceb2c
2014-03-25 13:47:24 -07:00
jenkins-bot cf56fbd0c4 Merge "Make generateCitationFeatures() not explode when citation code isn't loaded" 2014-03-25 18:46:22 +00:00
Roan Kattouw 9d7551ae75 Make generateCitationFeatures() not explode when citation code isn't loaded
Bug: 63074
Change-Id: Ic3973d06707e89993bb551daba0fe13bd3cffc71
2014-03-25 11:26:14 -07:00
James D. Forrester 95dee3ceee Fix copyright year range for fourteen files not updated to 2011-2014
Change-Id: Ibef2bf965dbd970b235a57058bcb3922a8777aa2
2014-03-24 18:36:51 -07:00
James D. Forrester 3f21a91c2b Blank the reference and media search queries when closing dialogs
Bug: 61959
Change-Id: I45e161d322d4fb0a63d35c1a75a2a39ba9f73def
2014-03-24 17:41:29 -07:00
jenkins-bot 2b84bbbfca Merge "Use "Insert citation" label for apply button of CitationDialog" 2014-03-25 00:19:56 +00:00
jenkins-bot 70ff498a5f Merge "Move cite to be after link, instead of after structure" 2014-03-25 00:16:44 +00:00
Trevor Parscal c385c01096 Use "Insert citation" label for apply button of CitationDialog
* Create a method to produce the correct label
* Override that method in the citation dialog subclass

Change-Id: Ic74a23dcf30aae201f3d6c312b760cf058aadf11
2014-03-24 17:16:43 -07:00
Trevor Parscal 1363d15c53 Move cite to be after link, instead of after structure
Change-Id: I69170b68997b8df595cc12e10b3467444e3ae952
2014-03-24 17:13:59 -07:00
jenkins-bot 6465a3f8d6 Merge "Add new 'vehidebetadialog' GET parameter to not show the beta dialog" 2014-03-24 23:26:39 +00:00
jenkins-bot cc45c6a0d1 Merge "Fix 'original dimensions' async call in MediaEdit dialog" 2014-03-24 22:54:01 +00:00
Translation updater bot f295d213e9 Merge "Localisation updates from https://translatewiki.net." 2014-03-24 22:24:56 +00:00
Translation updater bot 58cae294cf Localisation updates from https://translatewiki.net.
Change-Id: Ibe3adb7169a7ce79fa995a3ad42da55ab11430fe
2014-03-24 22:24:00 +00:00