Changes in Conflict.php en Copyright 2025 Java 8c7c53b0321a3cd3116b8d3b2ad27863a38dece7 - codestyle adjustments: class declaration braces http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#8c7c53b0321a3cd3116b8d3b2ad27863a38dece7 codestyle adjustments: class declaration braces List of files: /dokuwiki/inc/Action/Conflict.php Wed, 30 Aug 2023 15:05:28 +0000 Andreas Gohr <andi@splitbrain.org> 6723156fd9886ff7204e21fb8bf9240b9223b40f - Apply rector fixes to inc/Action http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#6723156fd9886ff7204e21fb8bf9240b9223b40f Apply rector fixes to inc/Action List of files: /dokuwiki/inc/Action/Conflict.php Tue, 29 Aug 2023 11:53:46 +0000 Andreas Gohr <andi@splitbrain.org> f1dcc217bec54b2f5266cb40bae4f752f0c7221c - call Ui\Diff from Ui\(Conflict, Draft) http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#f1dcc217bec54b2f5266cb40bae4f752f0c7221c call Ui\Diff from Ui\(Conflict, Draft) List of files: /dokuwiki/inc/Action/Conflict.php Thu, 16 Jul 2020 11:15:24 +0000 Satoshi Sahara <sahara.satoshi@gmail.com> e4286a8810c742557f3fc9098a9e087c55252d7e - define constructor of Ui classes http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#e4286a8810c742557f3fc9098a9e087c55252d7e define constructor of Ui classes List of files: /dokuwiki/inc/Action/Conflict.php Thu, 16 Jul 2020 10:24:09 +0000 Satoshi Sahara <sahara.satoshi@gmail.com> 2ba8135141600da93d3feb2d2363068d1fad346c - create Ui\ConflictForm http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#2ba8135141600da93d3feb2d2363068d1fad346c create Ui\ConflictForm List of files: /dokuwiki/inc/Action/Conflict.php Wed, 15 Jul 2020 14:11:18 +0000 Satoshi Sahara <sahara.satoshi@gmail.com> 0d02bc2f737241397ce87f4c7a7270fb021756da - Ui\Diff class replaces html_diff() http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#0d02bc2f737241397ce87f4c7a7270fb021756da Ui\Diff class replaces html_diff()Ui\Diff()::diffNavigation() still uses Doku_Form class, Further work needed! List of files: /dokuwiki/inc/Action/Conflict.php Mon, 13 Jul 2020 11:25:42 +0000 Satoshi Sahara <sahara.satoshi@gmail.com> 6467f2ce9c6374fa0d04afda5103e72c4b2702e6 - Ui\Conflict class replaces html_conflict() http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#6467f2ce9c6374fa0d04afda5103e72c4b2702e6 Ui\Conflict class replaces html_conflict() List of files: /dokuwiki/inc/Action/Conflict.php Thu, 09 Jul 2020 13:12:21 +0000 Satoshi Sahara <sahara.satoshi@gmail.com> ec7012214a693c8b3103377245a7d797cf8f9608 - explicitly declare method visibility http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#ec7012214a693c8b3103377245a7d797cf8f9608 explicitly declare method visibility List of files: /dokuwiki/inc/Action/Conflict.php Fri, 31 Mar 2017 11:45:22 +0000 Andreas Gohr <andi@splitbrain.org> ab583a1bc44ef1ef3b917647fc361aabd055c2ac - more doc block fixes http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#ab583a1bc44ef1ef3b917647fc361aabd055c2ac more doc block fixes List of files: /dokuwiki/inc/Action/Conflict.php Sat, 11 Feb 2017 13:20:10 +0000 Andreas Gohr <andi@splitbrain.org> f21dad3906d4ec6b3d86685599409894630abdc1 - all actions should have a class now http://127.0.0.1:8080/history/dokuwiki/inc/Action/Conflict.php#f21dad3906d4ec6b3d86685599409894630abdc1 all actions should have a class nowLots of FIXMEs and the routing isn't integrated, yet List of files: /dokuwiki/inc/Action/Conflict.php Sat, 11 Feb 2017 11:34:11 +0000 Andreas Gohr <andi@splitbrain.org>