wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 14:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
12816 commits 162 branches 1 tag 191 MiB
Commit graph

10114 commits

Author SHA1 Message Date
jenkins-bot ec897c120b Merge "Pass $overlay to FieldsetLayout and FieldLayout in various places" 2017-03-01 00:35:06 +00:00
Ed Sanders e163a09105 Use more specific event name for switching editor from the toolbar 
As we are in the global toolbar event namespace, 'switch' could
mean anything.

Change-Id: I66751faa249710af634ed0fd0c2f2a0bcd872db3
 2017-02-28 23:07:54 +00:00
Ed Sanders 109a136bd6 Use pencil icon for editor switcher dropdown 
Pencil is the icon we use for 'edit' elsewhere in the UI.
Use the eye icon for the VE tool to specify 'visual'.

Bug: T116417
Change-Id: I12b6bab2a52758685abde04579b274a32d651174
 2017-02-28 22:59:51 +00:00
jenkins-bot a61bbb18e3 Merge "Transclusion dialog: Add VE specific rules from OOjs UI" 2017-02-28 21:49:15 +00:00
Volker E 4e4d1da7a3 Transclusion dialog: Add VE specific rules from OOjs UI 
Adding VE specific rules from OOjs UI in preparation of removing them
from the library.

Change-Id: I798717b60badb521d28f8f7a7036a99e5a26d61a
 2017-02-28 12:24:22 -08:00
Ed Sanders b3989e4f07 Move switching methods to ArticleTarget and fix in mobile 
Change-Id: I7796dab5d2a24f9719870abf383925442b787612
 2017-02-28 11:47:35 -08:00
Ed Sanders b3cfca5401 MobileArticleTarget: Don't explicitly set menu indicator 
It is now inferred from toolbar position.

Change-Id: I9e3ac28aee74599b4b35ac2f870dca2556efb027
 2017-02-28 10:37:30 -08:00
jenkins-bot 2e2a5e452c Merge "Use list tool group for editor switching" 2017-02-28 18:33:44 +00:00
jenkins-bot 0070838981 Merge "Use ems for mobile surface font sizes, and add top/bottom spacing" 2017-02-28 18:30:23 +00:00
jenkins-bot 8a12dfd2ee Merge "Update tests to Selenium 3" 2017-02-28 16:04:27 +00:00
Ed Sanders 5ca02bae09 Use ems for mobile surface font sizes, and add top/bottom spacing 
Change-Id: Ida827b54a49c427f2fad2de1f634d8c4e4d28154
 2017-02-28 15:07:39 +00:00
Ed Sanders cb60db4c7f Use list tool group for editor switching 
Bug: T116417
Change-Id: Iadf5a81e2733ab81fe25c686dcd6dad8eac3885c
 2017-02-28 15:06:48 +00:00
Željko Filipin f776983204 Update tests to Selenium 3 
Bug: T158074
Change-Id: I784fc7bb85f32d5e50b5abb500c51493839ccebe
 2017-02-28 14:39:00 +01:00
Translation updater bot df7307c1b8 Localisation updates from https://translatewiki.net. 
Change-Id: Iaead1637d6460165edf1282450ba148e48d468a9
 2017-02-27 22:40:16 +01:00
Ed Sanders a3433e67fd Move modules loaded from DAT.init/TargetLoader to ResourceLoader 
This will make it easier for third parties to load the required
modules for an article-like target.

Also cleanup mobileArticleTarget to better match desktopArticleTarget.

Change-Id: Idb75e2bd99d8cf2c298e101cf92e8af4f85f5ad5
 2017-02-27 16:48:56 +00:00
Translation updater bot 4c9bc6ce53 Localisation updates from https://translatewiki.net. 
Change-Id: Ia9c63305453091afe7ebd5b5c5361dd2474ab11c
 2017-02-26 22:55:11 +01:00
Translation updater bot 49d2dade48 Localisation updates from https://translatewiki.net. 
Change-Id: Ie31ed3d14e14a362b890588db76946c2f6567755
 2017-02-25 22:44:27 +01:00
Translation updater bot 0f769f9a4c Localisation updates from https://translatewiki.net. 
Change-Id: Iea0b0881d660a604f83716425c1d2d38bb474dd1
 2017-02-24 22:49:39 +01:00
jenkins-bot a629b62b43 Merge "For the mode switch tool, show a different tooltip when disabled" 2017-02-24 19:23:53 +00:00
James D. Forrester 440a73206d For the mode switch tool, show a different tooltip when disabled 
Bug: T158723
Change-Id: I8c397e9b10c51d78c0b0f18c494ca9f36400d23e
 2017-02-24 08:49:47 -08:00
Translation updater bot a520037a38 Localisation updates from https://translatewiki.net. 
Change-Id: I7f5ea4a13665e807fe98c1f8d68d88536217d439
 2017-02-23 23:11:42 +01:00
L10n-bot ce86129067 Merge "Localisation updates from https://translatewiki.net." 2017-02-22 21:53:36 +00:00
Translation updater bot 18e340ef5f Localisation updates from https://translatewiki.net. 
Change-Id: I388c3a778615dc9d561e3ba15016fbed6bd825da
 2017-02-22 22:54:16 +01:00
Ed Sanders 501d0c94d2 Cache generated content request when inserting templates 
We request the generated content of a template to determine
if it will be block or inline. This is the same request as
the view makes later to show the rendering, so we should cache
this repsonse.

Bug: T156698
Change-Id: I0ffd36ccd0aa821aa44d99328f2e3a2abc23dc0f
 2017-02-22 04:00:38 +00:00
jenkins-bot 703e784d1a Merge "build: Bump grunt-jsonlint to latest and make pass" 2017-02-21 16:14:38 +00:00
Translation updater bot a3d001d7a5 Localisation updates from https://translatewiki.net. 
Change-Id: I716d04e411b2381f38381d80e9b70661007a3738
 2017-02-21 00:02:00 +01:00
Translation updater bot 50a0c7125a Localisation updates from https://translatewiki.net. 
Change-Id: Ie015f94ba4db43ac49f9a16e3fbe18ee715c27df
 2017-02-19 22:52:36 +01:00
Translation updater bot 63efc6c9af Localisation updates from https://translatewiki.net. 
Change-Id: Ibc99be0de6a97d39ccf7b13c40283410b8ac08a5
 2017-02-18 22:51:16 +01:00
James D. Forrester dddd2c0180 build: Bump grunt-jsonlint to latest and make pass 
grunt-jsonlint       1.0.8  →   1.1.0

Change-Id: I4a5cdd39f6215cc61a1ef530386a87fdcb0c0088
 2017-02-17 16:12:12 -08:00
James D. Forrester cc239a08da build: Bump stylelint and make pass 
grunt-stylelint              0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
 2017-02-17 15:23:12 -08:00
Translation updater bot 2dd0e06e87 Localisation updates from https://translatewiki.net. 
Change-Id: Ia236c6849f1c3194ebb59c666006f1edf03687cf
 2017-02-17 22:55:18 +01:00
Translation updater bot 8f5380cc12 Localisation updates from https://translatewiki.net. 
Change-Id: I46eaee06ac9f40e39685ebfccc76bd342439803e
 2017-02-16 23:09:58 +01:00
jenkins-bot 9164b6e400 Merge "DesktopArticleTarget.init: Don't hardcode single-tab accesskey" 2017-02-16 19:19:42 +00:00
jenkins-bot 97d689c824 Merge "MWSaveDialog: Switch to save panel when showing message" 2017-02-16 17:14:12 +00:00
jenkins-bot 6b6df0759e Merge "Tables: Add support for editing mw-collapsible/mw-collapsed" 2017-02-16 16:39:36 +00:00
David Lynch 288422cb9e MWSaveDialog: Switch to save panel when showing message 
Fixing T107251 made it so that clicking "save" always switched back to the
save panel momentarily, causing a flicker of "maybe I can edit this"
experience. With this change, we can only switch back to the save panel when
saving from other panels if a message is being shown.

Bug: T156891
Change-Id: I8f67693283e61c39cfce40ee12d5c6788dd97932
 2017-02-16 10:32:21 -06:00
Ed Sanders 9337e6ecbd Tables: Add support for editing mw-collapsible/mw-collapsed 
We don't support editing <div>s right now (as they're BranchNodes) nor
<span>s (as they're annotations), but most of those are inside templates
and so not editable in VE anyway.

Bug: T157989
Change-Id: I647b2a544fd16952696d0de8d07cb72189b27ecb
 2017-02-16 17:21:44 +01:00
Bartosz Dziewoński 22df25c108 Pass $overlay to FieldsetLayout and FieldLayout in various places 
We now use dialog's overlay in every case where we have a FieldsetLayout
or a FieldLayout with a help popup inside a dialog.

Bug: T100571
Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
 2017-02-16 02:56:03 +01:00
Bartosz Dziewoński c3be577216 ve.ui.MWAdvancedSettingsPage: Actually display help for settings about language variants 
Follow-up to 712ea472d3.

Change-Id: I2f3617fb4e9a80272e559b35c947052c0d8e534b
 2017-02-16 02:19:09 +01:00
Bartosz Dziewoński 2c78411113 ve.test.utils.createSurfaceFromDocument: Actually attach surface to DOM 
Bug: T158141
Change-Id: I999bcdc7095a3b9e2a86a7d5eca0e1f3ceb175ef
 2017-02-16 01:17:17 +01:00
Translation updater bot a21a89ac77 Localisation updates from https://translatewiki.net. 
Change-Id: I8a6a7bf01f41eed3d8d7c1cf5ccfb515c16586ce
 2017-02-15 22:47:52 +01:00
Translation updater bot 7d95edacde Localisation updates from https://translatewiki.net. 
Change-Id: I16205f62bba23e5d0d157d433a635feac710aba5
 2017-02-14 22:57:45 +01:00
David Lynch b1d68872b0 DesktopArticleTarget.init: Don't hardcode single-tab accesskey 
Bug: T156141
Change-Id: I1312283437714bf338a8ee3cf63e93ac67db1c45
 2017-02-14 11:24:50 -06:00
L10n-bot 6909c24d5d Merge "Localisation updates from https://translatewiki.net." 2017-02-13 22:19:02 +00:00
Translation updater bot ae92640bf3 Localisation updates from https://translatewiki.net. 
Change-Id: I79bc57730f31d46f3319d1108313d35547d7f2fc
 2017-02-13 23:19:33 +01:00
Bartosz Dziewoński 7beaf0ab9c ve.ce.MWTableNode: Provide preview of sortable table styling 
Algorithm for deciding which cells handle sorting is exactly
the same as in the real jQuery Tablesorter.

Depends on changes in VE core:
* I50426e173c68af7df49e47fe3bec0465a9a55c26
* Iabb372dfe7bf5feef314315ac74a788c6c58dc20

Bug: T139072
Change-Id: I4446be2ad459b05590754da9bb6c3dd8f796be42
 2017-02-13 21:36:43 +00:00
Ed Sanders 08b3f73f16 MWTableDialog: Extend initial values so 'done' button behaves correctly 
Depends-On: I608431365f2a482536affe1dae3fe21bc20e16b4
Change-Id: Idd468caa9417ffd8e0475083c884ef6c554ee152
 2017-02-13 08:30:51 -08:00
Ed Sanders 444ed0b7d8 MWTableDialog: Inherit actions from core 
Change-Id: Ice7f18ac2e1b7728a52a48482728d1b1278ca66f
 2017-02-13 08:30:51 -08:00
Translation updater bot 0b620cf417 Localisation updates from https://translatewiki.net. 
Change-Id: Id1187371077f15d98540f91be55ee2f074254ce5
 2017-02-12 22:44:26 +01:00
jenkins-bot 3c56d19e66 Merge "vw.ui.MWTableDialog: Add "Cancel" button" 2017-02-12 15:07:37 +00:00
Translation updater bot 30cb88940e Localisation updates from https://translatewiki.net. 
Change-Id: If95955b60c6c2b371bda27b1db2272939c3da982
 2017-02-10 22:55:28 +01:00
Bartosz Dziewoński aa22a8c482 vw.ui.MWTableDialog: Add "Cancel" button 
The dialog already supports cancelling by pressing Escape,
but the usual dedicated button was missing.

Change-Id: Ic63b5b59940a43474051466bdbbba0dbeb4342a9
 2017-02-10 15:26:33 +01:00
jenkins-bot a234120771 Merge "Check for 'veaction' when clicking section edit links" 2017-02-09 18:33:55 +00:00
Bartosz Dziewoński 5200f2ef34 ve.ui.MWSaveDialog: Show a hint to use Ctrl+Enter to submit when pressing Enter 
Or Cmd+Enter for Mac.

Depends on VisualEditor core changes:
* I93f50e325f993d82a821bf02f5e7f56fe1b9de62
* Id0a357b038fc5730f61bcf3ba730838dcda9b00e

Bug: T153241
Change-Id: I6b0a5e2c4e4ec72016463c8ba6576d33d59be8e5
 2017-02-09 16:47:41 +00:00
Translation updater bot c201ae6172 Localisation updates from https://translatewiki.net. 
Change-Id: Ia95042d9cd6c81e99c49848e0d17e33347bbc9c8
 2017-02-08 22:47:18 +01:00
Ed Sanders 6bd650d50a Check for 'veaction' when clicking section edit links 
Such as in the 'add topic' link.

Bug: T157104
Change-Id: Ide2d4cf8c23a5d0db24456d15b4312f7c0a5f922
 2017-02-08 17:48:04 +00:00
Translation updater bot 02aa33cfbd Localisation updates from https://translatewiki.net. 
Change-Id: I74eab9790e644bb90f354ae5d6a9f3cbb7ca2d6b
 2017-02-07 23:07:39 +01:00
jenkins-bot 6e585c457c Merge "Move wikitext signature command to correct file" 2017-02-07 20:47:57 +00:00
Ed Sanders 8ab21d2ef5 Move wikitext signature command to correct file 
So that signature availability is checked.

Bug: T157286
Change-Id: If1e585ce02e0bc9f5aa93129d315f83f183f5952
 2017-02-07 20:21:32 +00:00
Ed Sanders f2cf73eaaf Define default HTML types for extension nodes 
Use span/div for inline/block nodes respectively.

Bug: T157389
Change-Id: I4c501a6af88a490eec83af26adaa515a2b1d18d1
 2017-02-07 20:12:39 +00:00
David Lynch 8a7d44224c ArticleTarget: try to refresh editToken if getWikitextFragment fails 
Refactor saveFail's badtoken handling out so it can be reused by
getWikitextFragment.

Bug: T156991
Change-Id: I686cddb5be4484211fa69640044db1bc34eacefc
 2017-02-07 11:20:59 -06:00
jenkins-bot 158807f86c Merge "Remove explicit toolbar indicator definitions" 2017-02-06 17:11:59 +00:00
Translation updater bot 19569f4b02 Localisation updates from https://translatewiki.net. 
Change-Id: If656029a98191aad2523fe743ac42b1a26920190
 2017-02-05 22:57:31 +01:00
Ed Sanders 7a058a4de8 Remove explicit toolbar indicator definitions 
These are now computed upstream based on position of toolbar.

The menu tool now needs its indicator explicitly hidden.

Change-Id: Id2280f70553e1e45f3a42af45684c5808797925c
 2017-02-04 10:25:37 +00:00
Translation updater bot bb029d2ebc Localisation updates from https://translatewiki.net. 
Change-Id: Ibe93c0e21b2c4adb1796c0d07f9f0843e834be4e
 2017-02-03 23:06:06 +01:00
jenkins-bot 61d449c9d2 Merge "ve.ui.MWSaveDialog: Prettify the 'messages' shown" 2017-02-01 23:50:58 +00:00
jenkins-bot 5015af4a32 Merge "ve.init.mw.ArticleTarget: Don't try to clear non-existent message" 2017-02-01 23:48:30 +00:00
jenkins-bot fbe31de0d3 Merge "ve.ui.MWSaveDialog: Remove unused $saveActions div" 2017-02-01 23:48:10 +00:00
Translation updater bot 8390b1f3fb Localisation updates from https://translatewiki.net. 
Change-Id: I1d46d45a3dda6243a24cddbdb0dd679f8628fee9
 2017-01-31 22:58:54 +01:00
Bartosz Dziewoński e8d99c5536 ve.ui.MWSaveDialog: Prettify the 'messages' shown 
This is currently used to display a warning about missing edit summary
and to display a CAPTCHA field. They now appear in a separated area at
the bottom of the dialog, which slides into view when a message is
added.

Change-Id: I7541284a92d5fd2fa8f469d479e059098c59c0ac
 2017-01-31 17:37:00 +00:00
Bartosz Dziewoński 6f367ea0ec ve.init.mw.ArticleTarget: Don't try to clear non-existent message 
This is just dead code. We never call `.showMessage( 'captcha', ... )`
(the CAPTCHA is shown in the 'api-save-error' message).

Change-Id: I48f51e89d5b366384d184e2ed505be9e7b8f3401
 2017-01-31 14:40:32 +01:00
Bartosz Dziewoński a0cb3029cb ve.ui.MWSaveDialog: Remove unused $saveActions div 
Change-Id: I47da48b29d3bddd598946de655cf1e8b086daf45
 2017-01-31 13:43:47 +01:00
Translation updater bot 2e690797c0 Localisation updates from https://translatewiki.net. 
Change-Id: Idc95868d10a1fd04899fcbec7a280b55743a874d
 2017-01-30 22:52:00 +01:00
jenkins-bot 7b46d105b1 Merge "Advanced Settings: improve displaytitle field" 2017-01-30 19:40:13 +00:00
David Lynch 00fb8c8e58 Advanced Settings: improve displaytitle field 
* Remove the checkbox; an empty field, or a value exactly equal to the page
  title means no displaytitle.
* Automatically fill the field with the current page title
* The field was mispositioned

Bug: T155818
Bug: T156665
Change-Id: I46db6b14616c9a021e757284972537cac00546a1
 2017-01-30 19:29:25 +00:00
WMDE-Fisch a0af0b0529 Disable VisualEditor in the TwoColConflict extension 
As for the Translate extension this will read a global set by the
TwoColConflict extension to disable the VisualEditor and its hooks
on the modified edit conflict page there.

Bug: T156251
Change-Id: I164d1546c9d98d8715650e13c63a01d06c76315d
 2017-01-30 14:06:59 +01:00
Ed Sanders 1d7f929a91 Update VE core submodule to master (139bdf7) 
New changes:
d79138b Overwrite selected content when pasting via DataTransferItem
3c4737f Ensure clipboard is never empty text
3b1339e Create dummy platform and target for tests
4d63c8e Pass text as string to insertDocument when detected as plain text

Local change:
Remove VE standalone module

Flow used to use it, but not anymore. Going forward no one should
be using it in MW.

Bug: T154020
Bug: T156302
Bug: T156498
Depends-On: I078c244ef524669da477a43f9b37c847252e5ad7
Change-Id: Ifc4be16269f819890f2dcdddbbdebf9694ad2868
 2017-01-29 18:50:47 +00:00
Translation updater bot 662789bb13 Localisation updates from https://translatewiki.net. 
Change-Id: Ib90e3f4f0482f1642fe8dde53dd0f601d3e942cc
 2017-01-28 22:56:32 +01:00
Translation updater bot 0383c3c61b Localisation updates from https://translatewiki.net. 
Change-Id: I19e481d7151511014ac3fabd241cdf01932a937e
 2017-01-27 15:00:35 +01:00
jenkins-bot 19c0dd3aa4 Merge "MWSaveDialog: only focus summary if we're on the save panel" 2017-01-27 07:25:31 +00:00
David Lynch 60866eade2 Override ui.CommentInspector so that copying from it sets text/x-wiki 
Bug: T154837
Change-Id: I3413c955aa23d34683e1a028a581b1ea34d55d49
 2017-01-27 01:13:41 -06:00
David Lynch b976f2cf38 MWSaveDialog: only focus summary if we're on the save panel 
Firefox throws exceptions when trying to focus hidden inputs. Using the
"preview" keyboard shortcut entirely bypasses the save panel, but the ready
process assumes it'll always be opened first.

Bug: T153958
Change-Id: Ifb3861116565e77c30b3874fe47889298c3ace6d
 2017-01-27 00:51:33 -06:00
jenkins-bot fb48db7227 Merge "Ignore section edit links when no action present" 2017-01-26 14:13:24 +00:00
Ed Sanders 1df022a6d6 Ignore section edit links when no action present 
BUg: T156282
Change-Id: If3d039da36db946dcbba123d3cdc4e99c45f6a4e
 2017-01-25 18:13:56 +00:00
Translation updater bot dc7ce167b3 Localisation updates from https://translatewiki.net. 
Change-Id: Ie1b9552f69f104a50f0b317d1c6db4d046526ffc
 2017-01-25 14:49:37 +01:00
jenkins-bot fb1d1cdfaf Merge "Use target=_blank for link in template 'extra description'" 2017-01-25 12:53:03 +00:00
jenkins-bot 7d9d6b35d2 Merge "Update actions on live inspectors and preview dialogs" 2017-01-23 23:33:44 +00:00
Translation updater bot 23bce58071 Localisation updates from https://translatewiki.net. 
Change-Id: Ib31aa19ef33f7b5017bf3ed49684cae670fd50c7
 2017-01-23 22:50:30 +01:00
Ed Sanders 133da969ce Use target=_blank for link in template 'extra description' 
We already do this for 'missing description'.

Bug: T155879
Change-Id: Iccf48070ab2b5890d6891856be4ee5cce5308d0d
 2017-01-23 13:07:53 +00:00
Translation updater bot 07f877d476 Localisation updates from https://translatewiki.net. 
Change-Id: I6a51ed82a750a1fd6c3bb5697bb9b69067b2e96d
 2017-01-22 22:45:16 +01:00
Translation updater bot e821a8e24b Localisation updates from https://translatewiki.net. 
Change-Id: Ib7a453738fc26748d5b202c7598db1009d72b145
 2017-01-21 22:46:51 +01:00
Thalia 43c2865f90 Update actions on live inspectors and preview dialogs 
Make inspectors inheriting from MWLiveExtensionInspector
and dialogs inheriting from MWExtensionPreviewDialog
update their 'done' action every time updatePreview is
called. Since both mix in ExtensionWindow, two new methods,
updateActions and isModified are added there.

This should make it more difficult to insert an empty node
accidentally or create a transaction just by opening and
closing an inspector or dialog.

For more complicated dialogs, or inspectors or dialogs
that don't live-update, this behaviour will have to be
implemented separately.

Bug: T155330
Change-Id: Iacafa01fcd419faaec9b112c96be86693a57d561
 2017-01-21 18:29:18 +00:00
Ed Sanders 171286c120 Fix typo in target config 
Change-Id: I5815ce5b0e05ce166e02bfcced520e3770f5453d
 2017-01-20 23:15:23 +00:00
Ed Sanders f58d00b110 Move #getWikitextFragment up to ArticleTarget 
Change-Id: Ice4b04db4a45c07ccffc3892e6db5d814c2ec37b
 2017-01-20 23:15:17 +00:00
Ed Sanders e5555d6d85 Remove MWMobileSurface & Context 
The hacks contained within context were ancient and no
longer used, and thanks to a typo in mw.MobileArticleTarget
neither of these classes was being used anyway.

Change-Id: I52f2b6d5aa5ddbcc45ac6107eaf9407570b73672
 2017-01-20 23:15:11 +00:00
Ed Sanders 1ae5c13cb9 Update VE core submodule to master (f0dcedb) 
New changes:
5b448fa [BREAKING CHANGE] Merge Mobile/DesktopSurface into Surface
2d8959b Localisation updates from https://translatewiki.net.
7eee772 Follow-up 2d8959b: Fix build for added language 'io'
f0dcedb ve.dm.TableMatrix: Really indent ASCII-art comments

Change-Id: I62708f7caeb03b16cd318aab0b0ee3c674e75a26
 2017-01-20 14:35:39 -08:00
Translation updater bot 015017376e Localisation updates from https://translatewiki.net. 
Change-Id: Id8ab05872453edaf2c54c841dcc6abf7b7e68f32
 2017-01-20 09:46:04 +01:00
Translation updater bot c549b370fa Localisation updates from https://translatewiki.net. 
Change-Id: I1e6889a7d649cc1fcceab4ee748c8eafece4b40b
 2017-01-18 22:20:13 +01:00
Translation updater bot b0944d5ad3 Localisation updates from https://translatewiki.net. 
Change-Id: I08914c4a309c016d8ceff90da41328d3c3b12110
 2017-01-17 22:17:40 +01:00
jenkins-bot 1e32b1d31d Merge "Re-order all meta code to put categories first" 2017-01-17 02:39:55 +00:00