Github mirror of MediaWiki extension TwoColConflict - our actual code is hosted with Gerrit (please see https://www.mediawiki.org/wiki/Developer_access for contributing)
转到文件
Translation updater bot dfc1ed9259 Localisation updates from https://translatewiki.net.
Change-Id: Ibb7d3b9607799eccd0275d7be7e3a462e1094f90
2024-04-17 08:12:10 +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-04-17 08:12:10 +02:00
includes Use HookHandlers for core hooks 2023-10-01 13:33:56 +02:00
modules Merge "Fixed styling for info icon on the special talk page conflict resolution screen." 2023-09-25 08:29:04 +00:00
resources build: Update SVGO to latest v2.3.0 and re-crush SVGs 2021-05-18 03:49:19 -07:00
tests Use HookHandlers for core hooks 2023-10-01 13:33:56 +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 2023-04-29 13:31:40 +00:00
extension.json Use HookHandlers for core hooks 2023-10-01 13:33:56 +02:00
package-lock.json build: Updating npm dependencies 2024-02-10 00:10:12 +00:00
package.json [build] Bump wdio-mediawiki to v2.3.0 2023-09-22 16:01:22 +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.