plugin:conflictmerger
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
plugin:conflictmerger [2014-05-17 14:32] – [conflictmerger plugin] Update the "Compatible" information after successfully running the acceptance tests in the 2014-05-05 release 81.9.131.130 | plugin:conflictmerger [2023-10-30 23:48] (current) – Klap-in | ||
---|---|---|---|
Line 1: | Line 1: | ||
- | ====== | + | ====== |
---- plugin ---- | ---- plugin ---- | ||
Line 7: | Line 7: | ||
type : action | type : action | ||
lastupdate : 2010-02-07 | 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 | + | compatible : Lemming, Anteater, Rincewind, Angua, Adora Belle, Weatherwax, Binky, Ponder Stibbons, Hrun, Detritus, Elenor of Tsort, Frusterick Manners |
depends | depends | ||
conflicts | conflicts | ||
Line 14: | Line 14: | ||
downloadurl: | downloadurl: | ||
+ | sourcerepo : https:// | ||
---- | ---- | ||
===== Download and Installation ===== | ===== Download and Installation ===== | ||
- | Download | + | Search |
===== Description ===== | ===== Description ===== | ||
Line 32: | Line 33: | ||
In order to let several users to edit the same page at the same time, the lock system must be disabled. | In order to let several users to edit the same page at the same time, the lock system must be disabled. | ||
- | [[http:// | + | [[https:// |
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. | 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 // | + | First, in //inc/common.php//, modify function // |
Second, in // | Second, in // | ||
Line 62: | 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). | **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:// | + | 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:// |
You can run them from the main Dokuwiki //_test// directory with | You can run them from the main Dokuwiki //_test// directory with |
plugin/conflictmerger.1400329932.txt.gz · Last modified: 2014-05-17 14:32 by 81.9.131.130