Commit graph

13138 commits

Author SHA1 Message Date
Ed Sanders 574baf2e8e Provide VE-rebaser in MediaWiki as Special:CollabPad
Change-Id: I3ffe0e2b6af43d4018dcd79877f4f27ed7d6a7e7
2017-05-20 19:51:09 +00:00
James D. Forrester 1ffb299f18 Update VE core submodule to master (ee59e9d33)
New changes:
d336169fe rebaser: Don't spam the entire document into the log on initialization
1963a9993 ve.dm.SurfaceFragment#delete: Don't pre-build a sequence of transactions
6c915f305 TransactionProcessor: modify DM tree branches instead of rebuilding them
8773258bb ve.dm.ElementLinearData.test: Cover compareElements
7a073c78f RebaseClient: Don't log empty rebases in acceptChange
5adce57ea rebaser: Implement author names
78c7beecb rebaser: Tidy up author list UI
85d26f491 Get minimal diff when word starts/ends the paragraph
ca273a56c rebaser: Move author list to widget
ab693bead rebaser: Show active user count

Bug: T160795
Bug: T162762
Bug: T165772
Change-Id: Ibd21e6a78c3958db1c0ec8f0317c4c07f3fa5735
2017-05-20 12:29:48 +00:00
David Lynch 07e4d5fd17 dm.MWTransclusionNode: remove TableCellableNode mixin
Change-Id: Ic08c7ba03ad2bee35a96a750377450475d0efeed
2017-05-19 20:55:14 +02:00
jenkins-bot ed2a6b873e Merge "Allow extension nodes to convert to a specified type of dataElement" 2017-05-19 14:27:16 +00:00
Ed Sanders 153f7b034d Allow extension nodes to convert to a specified type of dataElement
Sub-classes want to dynamically change type, e.g. inlineFoo/blockFoo,
but doing this after storeGeneratedContents invalidates the cache,
so ensure this is done as soon as the element is generated.

Bug: T151130
Change-Id: I80e2f2587cff8e9d9fe6ded5d8581263268deaa8
2017-05-19 16:08:01 +02:00
jenkins-bot 5049351f9b Merge "Revert "Localisation updates from https://translatewiki.net."" 2017-05-19 10:48:57 +00:00
jenkins-bot fbc835be12 Merge "MWCategoryInputWidget: missing 'new' for cached redirected optionwidgets" 2017-05-19 10:13:40 +00:00
David Lynch dfbbe378c3 MWCategoryInputWidget: missing 'new' for cached redirected optionwidgets
Bug: T164820
Change-Id: I8b2ae9112af74910cb6ba5097dcec8be86cc1376
2017-05-19 11:57:17 +02:00
Nemo bis caf858aa97 Revert "Localisation updates from https://translatewiki.net."
Mistaken addition of English strings as Hindi messages.
https://translatewiki.net/wiki/Thread:User_talk:Sfic/Import_of_English_strings_to_Hindi

This reverts commit df892898c5.

Change-Id: Ibc410a0b0ea0315474d8ee681f4b045fc5687c85
2017-05-19 09:03:35 +00:00
Jforrester 352eaea9af Revert "Localisation updates from https://translatewiki.net."
This reverts commit df892898c5.

hi messages corrupted.

Change-Id: I826f13d24bb43f54700a134b98ecc0fa14a6e3b3
2017-05-19 08:35:58 +00:00
Translation updater bot df892898c5 Localisation updates from https://translatewiki.net.
Change-Id: I45389fc125e3fd4823731c1cf561851be734b54c
2017-05-18 23:02:00 +02:00
jenkins-bot 82a9e3d4d0 Merge "Update VE core submodule to master (de3447ce5)" 2017-05-18 18:13:23 +00:00
jenkins-bot 526d1ba71e Merge "Enable edit tab setup on appropriate Special pages" 2017-05-18 16:18:49 +00:00
James D. Forrester 0eecaf42e1 Update VE core submodule to master (de3447ce5)
New changes:
de3447ce5 Update OOjs UI to v0.21.4

Change-Id: Ibb13bce32090a8aab01bc5d82d87dfa2a98ac16e
2017-05-17 19:52:24 +01:00
Bartosz Dziewoński d687e01208 Do not check for visual editor availability when loading source editor
Follow-up to fefb76eebc. Prior to that
change, the condition for this looked like this:

  // … if on a ?veaction=edit/editsource page
  (
    isViewPage &&
    uri.query.veaction in editModes &&
    (
      uri.query.veaction === 'editsource' ||
      init.isVisualAvailable
    )
  )

In the refactor, the `uri.query.veaction === 'editsource'` check was
lost.

Since that code is pretty messy (probably predating the source editor
and hastily adjusted), instead change the check for `isVisualAvailable`
to just `isAvailable`. If the requested mode turns out to not be
available later, the editor will not load.

Bug: T165146
Change-Id: Idfaf9115dd20cec8f8e044a704b93b07984cdcee
2017-05-16 18:57:56 +02:00
jenkins-bot cde2110722 Merge "Update VE core submodule to master (45aa796b3)" 2017-05-16 16:19:14 +00:00
jenkins-bot 4249e7898e Merge "Rename deprecated Card to current TabPanel" 2017-05-16 09:50:42 +00:00
jenkins-bot cfa8de994e Merge "MWTransclusionNode: Implement MWTransclusionTableCell" 2017-05-15 18:05:01 +00:00
David Lynch 0eb6b94b4c MWTransclusionNode: Implement MWTransclusionTableCell
Back in de98382a55, references to MWTransclusionTableCell were introduced,
but weren't followed through on. So, actually add it. Have cellable
Transclusions use it as their type.

Bug: T144122
Depends-On: I054f12f4218102a12d7a9ea843f9c61e8825c52c
Change-Id: I367f878bfd1c58e20b62368cb78120604b48d791
2017-05-15 12:09:11 -05:00
James D. Forrester 6e77dfe7cb Update VE core submodule to master (45aa796b3)
New changes:
c54d06474 Add class to TableCellableNode and move some styles there
fd9e1059d Remove 'cellable' attribute

Change-Id: I186e7b0b61ac920c309f9aa0c40db7244849c0ec
2017-05-15 17:41:15 +01:00
jenkins-bot b22333040f Merge "Update VE core submodule to master (8e29310db)" 2017-05-15 16:38:15 +00:00
Ed Sanders 63c36c87da Always prefer wikitext for action=edit on non-SET wikis
Ideally we could use the preferred editor, but this breaks
tab switching to the old editor.

Bug: T165238
Change-Id: I5f5ee5566cdd2080ba7c89d43cf127b457537768
2017-05-15 12:48:30 +01:00
jenkins-bot 5e11f1669a Merge "Fix action=edit links for NWE" 2017-05-15 11:06:49 +00:00
Ed Sanders 9342e45f7b Fix action=edit links for NWE
We added support loading NWE from action=edit in I35208cce069
but missed this check in the front-end.

Bug: T165238
Change-Id: I2732eaa81a3f968b34c4e878b2ad36de981dd567
2017-05-15 11:52:06 +01:00
James D. Forrester 57aad56a7b Enable edit tab setup on appropriate Special pages
Using the forthcoming wgRelevantPageIsProbablyEditable.

Bug: T165010
Depends-On: I6c6ca1cfd93e7be917952980f1e1d57aec3a1292
Change-Id: I6c6ca1cfd93e7be917952980f1e1d57aec3a1229
2017-05-15 11:14:29 +01:00
James D. Forrester 20e9740714 Update VE core submodule to master (8e29310db)
New changes:
e7e9e0ba3 TableAction: Handle non-TableCell cells better
9537931cb ve.ui.TableAction: Don't pre-build sequences of transactions
c5f0d7ce1 Process transaction before selecting nodes for annotation events

Bug: T144122
Change-Id: I97ec7e8a4ca92ab74783622c610595e415238e96
2017-05-15 09:56:01 +01:00
Translation updater bot dd9a7ad9f9 Localisation updates from https://translatewiki.net.
Change-Id: I3becfe7c241e510b558e65a54060d3e93cc907b5
2017-05-14 22:48:41 +02:00
Translation updater bot db24f81138 Localisation updates from https://translatewiki.net.
Change-Id: Ic7ce8924f898681caafe37761384f0f30919fc8c
2017-05-12 23:19:04 +02:00
jenkins-bot 55ea205623 Merge "Update VE core submodule to master (347765f82)" 2017-05-12 18:42:11 +00:00
jenkins-bot 849dae5e4a Merge "build: Enable MediaWiki.Commenting.FunctionComment.MissingParamComment" 2017-05-12 02:06:42 +00:00
jenkins-bot d569544fb9 Merge "build: Enable MediaWiki.Commenting.FunctionComment.MissingParamTag" 2017-05-12 02:06:41 +00:00
jenkins-bot 51549e2440 Merge "build: Enable MediaWiki.Commenting.FunctionComment.MissingParamName" 2017-05-12 02:03:33 +00:00
jenkins-bot 4f36b20f2b Merge "build: Enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" 2017-05-12 02:03:32 +00:00
jenkins-bot adbd05be82 Merge "build: Enable MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" 2017-05-12 02:02:36 +00:00
jenkins-bot f0ac2b6758 Merge "build: Enable MediaWiki.Commenting.FunctionComment.MissingReturn" 2017-05-12 02:01:29 +00:00
jenkins-bot 71e174ddb1 Merge "build: Enable MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" 2017-05-12 01:58:28 +00:00
jenkins-bot ec3c318a32 Merge "build: Bump mediawiki-codesniffer to 0.8.0 and make pass" 2017-05-12 01:58:26 +00:00
Translation updater bot 898091bfed Localisation updates from https://translatewiki.net.
Change-Id: Ifa7703be93365df355b7de8db47e878a10b33256
2017-05-11 23:37:50 +02:00
James D. Forrester 7819eda622 build: Enable MediaWiki.Commenting.FunctionComment.MissingParamComment
Change-Id: I29bd2c3dcc3a90a52036ab7e6bf2227af61703d7
2017-05-11 21:20:37 +00:00
James D. Forrester 79d15b18b8 Update VE core submodule to master (347765f82)
New changes:
8155f98fd Upgrade tree differ to support timeouts, and handle them
f36fcb6c9 Update OOjs UI to v0.21.3
2496f0521 Localisation updates from https://translatewiki.net.
7212fc4ab MobileContext: Fix alignment of label and description
865b2fcc7 VisualDiff: Bring in close dialog fix from downstream
822855b50 Expose arguments in DummyPlatform.getMessage for more thorough tests
cda556554 VisualDiff: Show attribute changes for inline objects

Bug: T164724
Change-Id: Id51a927b540ea55abc1187f3556ad3052afe2453
2017-05-11 12:43:17 -07:00
James D. Forrester 2a81a95782 build: Enable MediaWiki.Commenting.FunctionComment.MissingParamTag
Change-Id: Ia6d758bebd45d31143a3dfd3357cc4687449a1cb
2017-05-11 08:19:44 -07:00
James D. Forrester 59715b66c2 build: Enable MediaWiki.Commenting.FunctionComment.MissingParamName
Change-Id: Id0b92c026690799db84f53402ce29913754bba0b
2017-05-11 08:19:44 -07:00
James D. Forrester 307a8f0ed7 build: Enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
Change-Id: Id11360a266b5a5269856a9adbf3cd27cda52f178
2017-05-11 08:19:44 -07:00
James D. Forrester 945719f43e build: Enable MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
Change-Id: Ib1e607addcb13c8fced2058ef5a80a96c95ff31e
2017-05-11 08:19:44 -07:00
James D. Forrester 9a27f80b3e build: Enable MediaWiki.Commenting.FunctionComment.MissingReturn
Change-Id: I714220880e91583a6e3cc575810fe02e3e822538
2017-05-11 08:19:44 -07:00
James D. Forrester e12651b1c2 build: Enable MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
Change-Id: Ie1c745c4ea6ddaad6d41285ad444e7a91dc48cc9
2017-05-11 08:19:44 -07:00
James D. Forrester 56bfb7828c build: Bump mediawiki-codesniffer to 0.8.0 and make pass
Change-Id: If509e5ba639bcda497fe7898f6eb79265967139d
2017-05-11 08:19:44 -07:00
Volker E f695877de7 Rename deprecated Card to current TabPanel
Renaming CardLayout to TabPanelLayout and all connected code instances.
Follow-up to Icfe1652cc038dc131b6b855ce9b45040b8ee5178

Bug: T164903
Change-Id: I9ce4e31e390522d469e126fb3a4b05787cef7fef
2017-05-10 11:46:49 -07:00
David Lynch 2f40972807 MWWikitextDataTransferHandlerFactory: Don't reimplement getText
I forgot about getText in 41ca528705, apparently.

Bug: T163237
Change-Id: Ibb646fc03a0293845c4449cbbe6c822ba63751f8
2017-05-10 10:58:42 -05:00
jenkins-bot 862c3ca22e Merge "MWWikitextDataTransferHandlerFactory: skip getWikitextFragment if possible" 2017-05-10 15:51:16 +00:00