Github mirror of MediaWiki extension TwoColConflict - our actual code is hosted with Gerrit (please see https://www.mediawiki.org/wiki/Developer_access for contributing)
Go to file
thiemowmde e7dfe7cc88 Fix TwoColConflictHooksTest messing up UserOptionsLookup
This is not a perfect fix, but it should do for now.

I'm doing a series of cleanups in the test file while we are here.
These are technically unrelated.
* Prefer overrideConfigValues over the classic setMwGlobals.
* Set language to qqx to minimize localization overhead.
* Prefer createNoOpMock for a few critical classes where we really
  want to know what is called.

Bug: T364741
Change-Id: I77360e9295c32c5d28105aa292fb0a9ccd5d7219
2024-05-14 10:10:34 +02:00
.phan Move all global state from context to hooks class 2020-07-03 14:52:07 +00:00
docs Only count clicks on the copy link once 2020-06-26 08:23:37 +00:00
i18n Localisation updates from https://translatewiki.net. 2024-05-14 09:27:28 +02:00
includes Remove bogus Beta opt-out migration code 2024-03-19 08:33:09 +01:00
modules Merge single use dependencies into ext.TwoColConflict.SplitJs 2024-01-20 12:25:09 +01:00
resources build: Update 'svgo' to latest v3.2.0 and re-minify SVGs 2024-01-16 00:23:36 +01:00
tests Fix TwoColConflictHooksTest messing up UserOptionsLookup 2024-05-14 10:10:34 +02:00
.eslintrc.json Convert TwoColConflict extension to ES6 2023-07-11 18:04:17 +02:00
.gitignore Added '/tests/selenium/log' in .gitignore 2020-10-16 10:46:13 +05:45
.gitreview Whoops, track not trace 2016-10-24 17:03:58 -07:00
.phpcs.xml Replace Message mocks with anonymous classes where possible 2022-05-18 10:29:05 +00:00
.stylelintrc.json Use json extension for .stylelintrc 2017-08-17 17:41:58 +02:00
.svgo.config.js build: Update SVGO to v3.0.2 2023-06-14 12:52:06 -07:00
CODE_OF_CONDUCT.md build: Updating mediawiki/phan-taint-check-plugin to 1.3.0 2018-08-19 12:09:10 -07:00
COPYING Add license file 2019-10-23 08:45:38 +02:00
Gruntfile.js Convert TwoColConflict extension to ES6 2023-07-11 18:04:17 +02:00
README.md Add link to README pointing to mediawiki.org 2018-09-27 16:18:03 +02:00
TwoColConflict.alias.php Provide a page to copy the submitted text 2020-06-19 09:36:44 +02:00
composer.json build: Updating dependencies 2024-05-02 14:27:44 +00:00
extension.json Merge single use dependencies into ext.TwoColConflict.SplitJs 2024-01-20 12:25:09 +01:00
package-lock.json build: Updating dependencies 2024-05-02 14:27:44 +00:00
package.json build: Updating eslint-config-wikimedia to 0.27.0 2024-04-18 06:56:59 +00:00

README.md

This extension provides a side-by-side edit merge screen for edit conflict resolution

See https://www.mediawiki.org/wiki/Extension:TwoColConflict for technical documentation and more links.