861b333979
Added localization for merge handling
2011-04-30 15:38:46 +02:00
9ae98fa586
Scroll to and select first merge conflict in editor
...
When a user is thrown back to the editor because there are conflicts to
handle, the editor is now scrolled to the first conflict automatically.
Only tested in Chrome so far.
2011-04-30 15:12:56 +02:00
4e4618a9fd
deny serving with merge conflicts present
2011-04-30 13:15:46 +02:00
dd00f9df1c
make merge conflict labels completely customizable
2011-04-30 13:15:22 +02:00
795f50065d
mark merge conflicts and let the user solve them
2011-04-30 09:16:44 +02:00
4adfcfcfa9
Try to automatically resolve conflicts using 3way merge
...
No merge conflict handling, yet.
2011-04-30 09:02:50 +02:00
72dbd63d98
Added 3way merge from PEAR Text_Diff3
...
This adds 3way merge functionality to our DifferenceEngine stack. The
code was taken from the PEAR Text_Diff3 package and adapted to work with
our implementation.
For the curious:
Here's a short Origin tree of the different versions of the Diff code to
make clear how our implementation is related to the PEAR package.
-- original code Geoffrey T. Dairiki
`-- Adaption for the Horde project
|-- Adaption for phpwiki
| `-- Adaption for MediaWiki
| `-- Adaption for DokuWiki
`-- Creation of PEAR Text_Diff
2011-04-30 08:24:02 +02:00
7146bcbf4d
Merged pull request #42 from lupo49/master.
...
language updates: update.dokuwiki.org is currently used for update/msg-checks
2011-04-28 05:06:31 -07:00
84ddc6debb
language updates: update.dokuwiki.org is currently used for update/msg-checks
2011-04-28 13:42:19 +02:00
8eafbfcb7a
Czech language update
2011-04-27 21:55:54 +02:00
f3401340a7
Korean language update
2011-04-27 21:54:51 +02:00
cf800b38ad
Bulgarian language update
2011-04-27 21:53:25 +02:00
c34221fc83
Merged pull request #41 from lupo49/master.
...
de/eu - language updates / tpl_getfavicon()
2011-04-27 12:44:14 -07:00
a1bbd05b46
Remove deprecated call-time pass-by-reference in inc/common.php
...
The value is still passed by reference as the parameter of the called
function is declared as reference.
2011-04-27 20:52:56 +02:00
8e702eb487
eu: language updates
2011-04-27 11:30:56 +02:00
fe537d1f0b
Merge remote branch 'upstream/master'
2011-04-27 11:21:29 +02:00
02901e5af5
Merge HEAD, branch 'master' of github.com:lupo49/dokuwiki
2011-04-27 11:21:08 +02:00
65f40513c5
Fix p_get_first_heading for when the search index is empty
...
When the search index is empty, there was a warning and no headings were
displayed. Now the headings are displayed and there is no warning
anymore.
2011-04-26 23:40:24 +02:00
a7e5f74cc2
allow tpl_getFavicon() returning the absolute path to the icon file
2011-04-26 21:49:33 +02:00
549bcf6b95
de/de-informal: language updates (added "packageinstalled")
2011-04-23 11:27:42 +02:00
c66f16a3e1
Make the page lookup by title case insensitive again
...
The page lookup by title has been case insensitive before the indexer
rewrite, since then it has been case sensitive, this makes it case
insensitive again.
2011-04-23 00:04:37 +02:00
c991623aea
Release preparations
2011-04-22 22:42:36 +02:00
0c074a526c
Make ft_pageLookup respect the namespace restriction again
...
Before this change all pages of the given namespace have been included
in the result, now the search is restricted to the namespace again as it
was before the new indexer has been implemented.
2011-04-22 09:54:40 +02:00
9bd9209784
Fix HTML in DifferenceEngine tests
2011-04-21 17:29:01 +02:00
4b1755bd15
Make locktimer more robust
...
If no HTML element with the id wiki__text exists, locktimer.init led to a
JavaScript error.
2011-04-21 09:21:00 +02:00
30d5f02368
Portuguese language update
2011-04-20 21:13:09 +02:00
93475e69b3
Enable metadata rendering in the indexer
...
Metadata is rendered now in the indexer when it's cache is invalid.
2011-04-20 16:07:39 +02:00
c9fc06d99a
Hungarian language update
2011-04-19 21:30:59 +02:00
02172c3b15
Latvian language update
2011-04-19 21:26:19 +02:00
6929b6c180
Merge https://github.com/akate/dokuwiki into akate-058f1c3
2011-04-18 21:48:47 +02:00
1f663d37c1
Revert "correctly disable unfinished media options popup"
...
This reverts commit 342e58c8c0
2011-04-18 20:23:08 +02:00
f493983cbd
Merge remote-tracking branch 'upstream/master'
2011-04-18 17:00:40 +03:00
058f1c3e98
Ukrainian language update
2011-04-18 00:19:20 +03:00
1ffa310368
Ukrainian language update
2011-04-18 00:11:10 +03:00
342e58c8c0
correctly disable unfinished media options popup
...
We disabled the media options shortly before the last release because of
an unfixed bug. The disabling was not complete which caused problems
with templates not incorporating the needed CSS.
Since the option dialog hasn't been fixed yet, this patch also disables
the creation of the corresponding HTML to avoid the mentioned template
problems.
2011-04-17 22:39:21 +02:00
53b4f65b95
Traditional Chinese update
2011-04-17 20:30:07 +02:00
7349aca1ef
Don't ignore bundled plugin paths
2011-04-17 16:39:28 +02:00
ee379b013d
Japanese update (missing file)
...
Signed-off-by: Guy Brand <gb@unistra.fr>
2011-04-17 16:38:50 +02:00
f76f425eb3
Japanese update
...
Signed-off-by: Guy Brand <gb@unistra.fr>
2011-04-17 16:17:48 +02:00
7d643c1796
Trap onbeforeunload when event fired (attempt to fix FS#2196)
2011-04-17 16:04:10 +02:00
f24af5915f
tiny fixes for xhtml strict
2011-04-17 11:14:45 +01:00
90f84a7bad
removed empty id in register form (FS#2222)
2011-04-17 10:41:35 +01:00
9f09385fc6
do not strip empty form parameters FS#2222
2011-04-17 09:18:10 +02:00
02097e2a6c
attach textChanged property to window attempt to fix FS#2196
2011-04-17 09:09:10 +02:00
23ae1b94a2
Bulgarian language update
2011-04-17 08:55:59 +02:00
cfcd890b39
removed incorrect nbsps in diff view (FS#2223)
2011-04-16 20:16:25 +01:00
6c006c1847
Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master
2011-04-16 15:24:51 +02:00
ff9a8d11b6
French strings update
2011-04-16 15:15:25 +02:00
f4ca4fedd6
Removed hard coded strings from plugin manager
2011-04-16 15:14:19 +02:00
d8f5fe8a1b
eo: updates for esperanto language
2011-04-16 14:37:13 +02:00
Andreas Gohr