Searched +full:conflict -(+path:inc +path:lang) -(+path:lib +path:plugins +path:lang) -(+path:lib +path:tpl +path:dokuwiki +path:lang) (Results 1 – 13 of 13) sorted by relevance
| /dokuwiki/inc/Action/ |
| H A D | Conflict.php | 9 * Class Conflict
11 * Show the conflict resolution screen
15 class Conflict extends AbstractAction class
|
| H A D | Save.php | 48 //conflict check
54 throw new ActionException('conflict');
|
| H A D | Edit.php | 80 // This is used for conflict detection
|
| /dokuwiki/inc/Ui/ |
| H A D | PageConflict.php | 8 * DokuWiki Page Conflict Interface
30 * Show conflict form to ask whether save anyway or cancel the page edits
42 echo p_locale_xhtml('conflict');
55 echo $form->toHTML('Conflict');
|
| /dokuwiki/lib/plugins/extension/ |
| H A D | Notice.php | 129 foreach ($conflicts as $conflict) {
130 $dep = Extension::createFromId($conflict);
|
| /dokuwiki/_test/tests/Action/ |
| H A D | ActionTest.php | 54 array('Conflict', AUTH_EDIT, array('exists' => true, 'ismanager' => false)),
63 array('Conflict', AUTH_CREATE, array('exists' => false, 'ismanager' => false)),
|
| /dokuwiki/vendor/geshi/geshi/src/geshi/ |
| H A D | yaml.php | 35 * as, in general, it's ugly and tends to conflict with plain-text. Ensuring all
|
| /dokuwiki/inc/ |
| H A D | httputils.php | 319 409 => 'Conflict',
|
| H A D | html.php | 616 * show warning on conflict detection
|
| H A D | DifferenceEngine.php | 1322 * Conflict counter.
|
| /dokuwiki/_test/ |
| H A D | composer.lock | 304 "conflict": {
540 "conflict": {
1021 "conflict": {
|
| /dokuwiki/vendor/splitbrain/php-jsstrip/ |
| H A D | composer.lock | 97 "conflict": {
|
| /dokuwiki/vendor/splitbrain/slika/ |
| H A D | composer.lock | 1743 "conflict": {
|