Differences

This shows you the differences between two versions of the page.

--- plugin:conflictmerger [2014-10-28 20:04] – Update the "Compatible" information after successfully running the acceptance tests in the 2014-09-29a release 81.9.131.53
+++ plugin:conflictmerger [2023-10-30 23:48] (current) – Klap-in
@@ Line 1: / Line 1: @@
-====== conflictmerger plugin ======
+====== ConflictMerger Plugin ======
 ---- plugin ----
@@ Line 7: / Line 7: @@
 type       : action
 lastupdate : 2010-02-07
-compatible : 2009-12-25, 2010-11-07a, 2011-05-25c, 2012-01-25a, 2012-10-13, 2013-05-10a, 2013-12-08, 2014-05-05, 2014-09-29a
+compatible : Lemming, Anteater, Rincewind, Angua, Adora Belle, Weatherwax, Binky, Ponder Stibbons, Hrun, Detritus, Elenor of Tsort, Frusterick Manners
 depends    :
 conflicts  :
@@ Line 19: / Line 19: @@
 ===== Download and Installation =====
-Download and install the plugin using the [[plugin:plugin|Plugin Manager]] using the URL given above. Refer to [[:Plugins]] on how to install plugins manually.
+Search and install the plugin using the [[plugin:extension|Extension Manager]]. Refer to [[:Plugins]] on how to install plugins manually.
 ===== Description =====
@@ Line 33: / Line 33: @@
 In order to let several users to edit the same page at the same time, the lock system must be disabled.
-[[http://github.com/splitbrain/dokuwiki/commit/544ed901ab29fc8b73d559c5cc89b7c57f643fc5|Since 2010-02-16]], setting the locktime to 0 in DokuWiki configuration disables the lock system.
+[[https://github.com/dokuwiki/dokuwiki/commit/544ed901ab29fc8b73d559c5cc89b7c57f643fc5|Since 2010-02-16]], setting the locktime to 0 in DokuWiki configuration disables the lock system.
 In releases previous to that date, two changes must be done in DokuWiki code. The following changes completely disable the lock system. If you want to disable it only when locktime is 0, just do the same changes as shown in the commit linked in the previous paragraph.
-First, in //common/inc.php//, modify function //checklock($id)// to always return false. Doing this, DokuWiki will think that no page is locked, letting other users to edit it even if someone is already editing it. This can be done also setting the locktime in the configuration to 0.
+First, in //inc/common.php//, modify function //checklock($id)// to always return false. Doing this, DokuWiki will think that no page is locked, letting other users to edit it even if someone is already editing it. This can be done also setting the locktime in the configuration to 0.
 Second, in //lib/exe/js.php//, comment line //js_runonstart("locktimer.init...//. This will prevent the message warning that the lock is about to expire to show up. This can't be done from the configuration and, in fact, changing the locktime to 0 and not commenting this line will result in a warning message when the user starts to edit a page.
@@ Line 63: / Line 63: @@
 **Note:** in Dokuwiki 2012-10-13 (Adora Belle), SimpleTest was replaced with PHPUnit. I will update the tests for this plugin to replace SimpleTest with PHPUnit in the future. For the time being, I am stuck with an old version of the PHPUnit Selenium2 extension that does not provide some features needed for the acceptance tests (although they were implemented in newer versions of the extension). In the meantime, the SimpleTest tests can be used (although, obviously, they need the Dokuwiki test infrastructure from previous versions).
-The plugin includes a //test// directory with unit tests for merge function and acceptance tests for the whole plugin. The tests use the SimpleTest library used for DokuWiki tests (before [[https://github.com/splitbrain/dokuwiki/commit/3c0d44f1aa44d3ac3d8b9e652d172b1eda680bbf|2012-05-01]]). So if your [[devel:unittesting?rev=1331201100|DokuWiki SimpleTest tests]] are working you shouldn't have any problem to make these work.
+The plugin includes a //test// directory with unit tests for merge function and acceptance tests for the whole plugin. The tests use the SimpleTest library used for DokuWiki tests (before [[https://github.com/dokuwiki/dokuwiki/commit/3c0d44f1aa44d3ac3d8b9e652d172b1eda680bbf|2012-05-01]]). So if your [[devel:unittesting?rev=1331201100|DokuWiki SimpleTest tests]] are working you shouldn't have any problem to make these work.
 You can run them from the main Dokuwiki //_test// directory with