Commit graph

5735 commits

Author SHA1 Message Date
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
Krenair 9c2e1d8048 Follow redirects in the category widgets
Display the redirects nicely in the UI, etc.

Bug: 52414
Change-Id: Ib62144cb90899d0c525d6f08f6b5f1159b7d2a86
2014-04-16 15:30:14 +00:00
Moriel Schottlender 8d99aa88c8 Fix border checkbox
Make sure border is enabled for unframed types and disabled for
framed images.

Change-Id: I716e9bc4140fbc09aac52930d1dd8213f31617a3
2014-04-16 00:03:35 -04:00
jenkins-bot 24071290a8 Merge "Fix name of advanced settings page in open command" 2014-04-16 02:57:30 +00:00
Krenair 96cdfe28ce Fix name of advanced settings page in open command
Bug: 63984
Change-Id: I924520be81a183a1de3f8f81c60d9ed26fb3a80e
2014-04-16 02:08:30 +01:00
Roan Kattouw b764ecc7f4 Focus the surface in the reference dialog after it opens
Otherwise the surface ends up in a weird half-focused state which
causes it to behave strangely.

Bug: 63909
Change-Id: I3ebc30fde0202116b383a5b497aca65b66732922
2014-04-15 22:25:41 +00:00
James D. Forrester 37030882d1 Fix fencepost error with MWMoreParametersSearchWidget overflow
The logic was checking that there were at least three items to show, then triggering
the MWMoreParametersResultWidget widget with the number of items left in the overflow
if the limit was two. Whoops. :-)

Change-Id: Icec16a2d26bef8bf8d74ed619341afd494ca0479
2014-04-15 12:30:40 -07:00
Trevor Parscal 9cd05d05a0 Make fieldsets render properly
Depends on I797ec22 in OOJS-UI

Change-Id: I3841bc50346e67dfe92814ebe337fd92365ae1d4
2014-04-15 11:47:15 -07:00
Ed Sanders b019036a2c Hide inspectors using new method when saving
Previous hack caused unwanted blur events and subsequent range changes.

Depends on I8388318311 in core.

Change-Id: I9163f4d9928887a5eec09f0651ec0a66cc221cd4
2014-04-14 17:17:42 -07:00
Ed Sanders 3bba5e4d3b Pass required params to open for save dialog
Change-Id: Ib2e8f6255544894d54d9a89a579241b40c58ef90
2014-04-14 16:18:22 -07:00
Trevor Parscal 9e6451d40c Fix inserting references list while selecting another kind of node
There are two ways dialogs determine if they are inserting or updating.

1. They evaluate whether the dialog is inserting or not and set a boolean
   flag, used later to steer the saving code

2. They evaluate whether the dialog is inserting or not and, if not,
   store the node to be updated in a property, used later to steer the
   saving code

In the reference list dialog, setup used strategy 1, and teardown used
strategy 2. We've now normalized to use strategy 2 in both methods, which
fixes this bug.

Bug: 61885
Change-Id: I1b077b2aef4121328bce2b373874dd7373e405a1
2014-04-14 19:44:28 +00:00
cmcmahon 219ca37909 [browser test] make test pass in both Chrome and FF
Change-Id: I36fc3eb31d0a97145cff5f43aef3a5365286de29
2014-04-14 12:10:02 -07:00
jenkins-bot ba7cf40ceb Merge "Also set requiresRange for CitationDialogTool" 2014-04-11 19:26:32 +00:00
Roan Kattouw 2d671a38a2 Also set requiresRange for CitationDialogTool
The citation tools weren't being greyed out when the selection was null

Change-Id: I7d4d486a010f4c1301f3081661e7f343c24452df
2014-04-11 12:19:04 -07:00
jenkins-bot d20ff82e5c Merge "Use updated tab labels on description pages for files in foreign repos" 2014-04-11 19:11:10 +00:00
Roan Kattouw b54b517dbc Followup b2296bdd2: the property is called requiresRange, not requiresFocus
Change-Id: I09937603e1957f1acbdbe4cc56e47e00f31c892b
2014-04-11 11:59:55 -07:00
jenkins-bot d8453acff5 Merge "Remove remaining uses of surfaceModel#getSelection in dialogs" 2014-04-11 18:43:14 +00:00
Ed Sanders 340a939c97 Remove remaining uses of surfaceModel#getSelection in dialogs
These were being used indirectly in the MW*Model's. Use surface
fragments instead.

Fixes I0fae3e5ff2bd.

Change-Id: I1d6aa5e00a9315cf7088f87f9e9d828833feec64
2014-04-11 11:14:43 -07:00
Roan Kattouw 989fd6214c Fix JS error when opening VE on redirect page
Change-Id: I95dd2dc2c52ffa3d420a579592e84001bd2b10e8
2014-04-11 10:13:51 -07:00
jenkins-bot 49ce63020c Merge "Disable MW tools when surface loses focus" 2014-04-10 19:38:09 +00:00
Ed Sanders b2296bdd2a Disable MW tools when surface loses focus
Bug: 62410
Change-Id: I00fa2de637b2c1f2a57c8c1f09e90f71285feab7
2014-04-10 12:01:47 -07:00
Trevor Parscal afb182c23c Limit the number of citation tools to 5
Don't let too much toothpaste get out of that tube aye!?

Change-Id: I5cd92b7826d55ddde505f1bb883c6f8ed3223ec0
2014-04-10 11:47:34 -07:00
jenkins-bot 9a7e602b76 Merge "Remove zh-[cn|tw] in favour of zh-han[s|t]" 2014-04-10 14:50:47 +00:00
Siebrand Mazeland 639b7bc6b2 Remove zh-[cn|tw] in favour of zh-han[s|t]
Change-Id: I8ba62c08980d60b1932b1a9a07f756446a1bed3b
2014-04-10 12:19:23 +02:00
Ed Sanders 0e51180709 Update VE core submodule to master (55a5cdc): use new ve.ui.Dialogs and ve.ui.Inspectors
Move various bits of code from initialize to setup as required.

MWDialog is now useless so use ve.ui.Dialog directly.

New changes:
0b2d03f [BREAKING CHANGE] Pass fragments, not surfaces, to windows (reprise)
0101ac4 Update OOjs UI to v0.1.0-pre (ac6848398c)

Change-Id: I0fae3e5ff2bd0da5b74c244af226b07b1f5883bd
2014-04-09 20:28:30 -07:00
Roan Kattouw f2422d916c Update VE core submodule to master (c150259) for scalable changes
ve.dm.Scalable is now a computational model for image scaling and
size manipulation. This commit adjusts the nodes and the edit and
insertion dialog to handle the new scalable model, and by that
use a centralized computational engine for all scaling and size
changes.

New changes:
3ec19fb8 Refactor Scalable functionality

Change-Id: I017a017924f544cc8bc9b7d8245335759ae0e890
2014-04-09 17:29:49 -07:00
jenkins-bot 93d2175901 Merge "Limit the number of initially visible parameters in the parameter search widget" 2014-04-09 23:06:13 +00:00
Trevor Parscal 70655da2b9 Limit the number of initially visible parameters in the parameter search widget
* Truncate beyond 3 parameters
* Add a special option class that, when clicked, shows the remaining parameters
* Use a special option class for the no parameters item instead of hacking the normal one
* Simplify the design of the no parameters item: no icon, centered text

Change-Id: Ia8259e91b42a59c2b08019df36217d485208ad99
2014-04-09 12:56:02 -07:00
Translation updater bot 3dc9a388a3 Localisation updates from https://translatewiki.net.
Change-Id: Iff6d0157e956d9c76b6921f3fd225cdcfd79d514
2014-04-09 19:40:51 +00:00
Ed Sanders 164cf27299 Use new model directionality in MW
Depends on I2065e17020dc89 in core.

Change-Id: I6e99db601af58a9c4200f885887de451f9f70daa
2014-04-09 18:21:25 +00:00
jenkins-bot 89319a5d28 Merge "[browser test] Fix edit mode test." 2014-04-09 14:09:26 +00:00
Krenair 99640bf1a7 Use updated tab labels on description pages for files in foreign repos
See I4a43b759

Bug: 63666
Change-Id: Ie4aeddde4909f455472dc5239156c23200033ee8
2014-04-09 00:26:29 +01:00
Translation updater bot c25a48c057 Localisation updates from https://translatewiki.net.
Change-Id: I3c1be1b8841860f1372e4df97a3bc77c2a6f5862
2014-04-08 20:07:22 +00:00
jenkins-bot 6c6937a2ad Merge "Actually actually fix double-clicking on hieroglyphics nodes" 2014-04-08 19:29:54 +00:00
jenkins-bot 7297802c10 Merge "Additional initializeSelection methodicde" 2014-04-07 21:54:05 +00:00
Roan Kattouw cedca2490c Actually actually fix double-clicking on hieroglyphics nodes
Bug: 63651
Change-Id: Ib97d202b43e6910a3e223d14031c33a95ca7a251
2014-04-07 14:45:18 -07:00
Translation updater bot 729f81d3db Localisation updates from https://translatewiki.net.
Change-Id: If993097e66cc2a8092770a05fc435f556300e1ec
2014-04-07 20:39:24 +00:00
Trevor Parscal 84ed719cd0 Additional initializeSelection methodicde
Changes:

* Change uses of initializeSelection to selectItem
* Use "choose" event to respond to deliberate item selection by the user

Depends on changes in OOJS-UI (Ib3826ed)

Change-Id: Ia167a70ca5f40b1f15adad30620fdb13ef0d02d7
2014-04-07 12:15:40 -07:00
cmcmahon 8134988b48 [browser test] Fix edit mode test.
This test never worked.  Last week this feature broke but the
test continued to pass.  Let's not do that again.

Change-Id: I9819a3304191959b9b194b3e675dfdd273618881
2014-04-07 11:50:54 -07:00
Translation updater bot fc3ae966c3 Localisation updates from https://translatewiki.net.
Change-Id: Iaaf15f689e37de89071a6e624a7b15ffa430ef66
2014-04-06 19:45:23 +00:00
Translation updater bot 079f99ba6c Localisation updates from https://translatewiki.net.
Change-Id: I6f97b8bd8eb6a8e846becb70e2615be5004298a1
2014-04-05 19:47:04 +00:00
Trevor Parscal fc94173ff6 Fix more intalize typos
Change-Id: I24e0b3a93c15cc8a781eb9a35d9ba09510db40bd
2014-04-04 17:13:34 -07:00
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