opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity
8,400 Commits 62 Branches 86 Tags 49 MiB
Commit Graph

8400 Commits

Author SHA1 Message Date
Guy Brand e92c26f27f Release 2015-08-10a "Detritus" 2015-08-23 15:57:26 +02:00
Guy Brand d1c5a21205 Merge branch 'master' into stable 2015-08-23 15:54:03 +02:00
Guy Brand 0f0d29909c Release preparation 2015-08-23 15:52:48 +02:00
Anika Henke 5cadb52dad Merge pull request #1324 from dokuwiki-translate/lang_update_879 
Translation update (it)
 2015-08-23 11:40:09 +01:00
Torpedo 22cadb78ac translation update 2015-08-23 12:16:33 +02:00
Andreas Gohr a0df818fc1 Merge pull request #1322 from dokuwiki-translate/lang_update_876 
Translation update (it)
 2015-08-23 08:13:50 +02:00
Torpedo 2540fcbb54 translation update 2015-08-22 20:41:05 +02:00
Anika Henke fe147c4063 Merge pull request #1319 from dokuwiki-translate/lang_update_874 
Translation update (it)
 2015-08-22 12:41:12 +01:00
Anika Henke af0ff96019 Merge pull request #1318 from dokuwiki-translate/lang_update_873 
Translation update (it)
 2015-08-22 12:40:44 +01:00
Torpedo 84bef3590b translation update 2015-08-22 12:26:04 +02:00
Torpedo f28fdf54fe translation update 2015-08-22 12:16:09 +02:00
Andreas Gohr c17d5846ee Merge pull request #1315 from phillip-hopper/FixParserMediaTests 
Fix Parser Media tests running locally
 2015-08-21 13:37:41 +02:00
Andreas Gohr 21b07cb4c5 scroll to position only when ACT=index. closes #1314 2015-08-21 13:32:43 +02:00
Phil Hopper d09fc643d6 Fix Parser Media tests running locally 
These tests were passing on travis-ci but failing when run locally because the tests were assuming the value of DOKU_BASE would be '/./' but it was actually '/tmp/' instead.
 2015-08-20 14:51:16 -04:00
Andreas Gohr bb6d40dcf2 Form: fixed class checks 2015-08-18 20:42:11 +02:00
Andreas Gohr a453c16b32 Form: more flexible label handling #1312 
You now can add labels that don't wrap around inputs, but you have to
ensure IDs are properly assigned yourself.

The Label class has been renamed to LabelElement to reflect the naming
scheme of the other elements.
 2015-08-18 20:38:33 +02:00
Andreas Gohr 8f0df229ed Form: added Button element #1312 2015-08-18 20:12:32 +02:00
Andreas Gohr 08099e4fe1 Form: correctly set type attribute for inputs #1312 2015-08-18 19:31:37 +02:00
Anika Henke 2bc52ea3fb Merge pull request #1309 from splitbrain/revert-926-trimSlashes 
Revert "Trim unnecessary / at start of windowssharelink"
 2015-08-17 19:26:35 +01:00
Anika Henke 5ece862cc8 Revert "Trim unnecessary / at start of windowssharelink" 2015-08-17 19:22:10 +01:00
Anika Henke 38c87bd8a0 Merge branch 'dokuwiki-translate-lang_update_826' 2015-08-16 16:45:02 +01:00
Anika Henke 0472957b2c Merge branch 'lang_update_826' of https://github.com/dokuwiki-translate/dokuwiki into dokuwiki-translate-lang_update_826 
Conflicts:
	lib/plugins/styling/lang/ru/intro.txt
	lib/plugins/styling/lang/ru/lang.php
 2015-08-16 16:44:31 +01:00
Anika Henke dc562627d5 Merge pull request #1306 from dokuwiki-translate/lang_update_830 
Translation update (ja)
 2015-08-16 13:28:28 +01:00
Anika Henke 3f7c05f3c8 Merge pull request #1305 from dokuwiki-translate/lang_update_829 
Translation update (hu)
 2015-08-16 13:23:03 +01:00
Hideaki SAWADA e3f0661c72 translation update 2015-08-16 05:21:11 +02:00
Marton Sebok ed589e1f9b translation update 2015-08-15 20:51:51 +02:00
Andreas Gohr 530d672995 updated php-archive to 1.0.7 fixes #1296 2015-08-13 10:40:35 +02:00
Andreas Gohr 0ef04790d1 renamed test file 2015-08-13 10:37:29 +02:00
Andreas Gohr c4eed6437b Merge pull request #1301 from dokuwiki-translate/lang_update_827 
Translation update (cs)
 2015-08-12 10:27:56 +02:00
Turkislav abbfdfefc9 translation update 2015-08-12 10:21:09 +02:00
Andreas Gohr 73554c87a3 Merge pull request #1295 from dokuwiki-translate/lang_update_821 
Translation update (cs)
 2015-08-12 09:11:30 +02:00
Gerrit Uitslag e25a6ed390 Merge pull request #1300 from Dr-Yukon/patch-2 
Create lang.php
 2015-08-12 09:09:49 +02:00
Gerrit Uitslag b05e9d1cca Merge pull request #1299 from Dr-Yukon/patch-1 
Create intro.txt
 2015-08-12 09:08:44 +02:00
Rainbow Spike dbfb8cf451 Create lang.php 2015-08-12 16:13:12 +10:00
Rainbow Spike 31cc75290a Create intro.txt 2015-08-12 16:07:49 +10:00
RainbowSpike d1e3b6f516 translation update 2015-08-12 08:01:10 +02:00
Jaroslav Lichtblau 174004e9f7 translation update 2015-08-11 20:26:17 +02:00
Guy Brand 2beabe635c Release 2015-08-10 "Detritus" 2015-08-10 10:06:28 +02:00
Guy Brand 53a57d16b9 Merge branch master into stable 2015-08-10 10:03:27 +02:00
Guy Brand a060d9973e Release preparation 2015-08-10 10:01:56 +02:00
Anika Henke 43e54da7d9 Merge pull request #1293 from dokuwiki-translate/lang_update_816 
Translation update (es)
 2015-08-08 01:02:43 +01:00
Domingo Redal 5435cf9e10 translation update 2015-08-07 18:41:44 +02:00
Anika Henke 887fadc344 Merge pull request #1292 from dokuwiki-translate/lang_update_813 
Translation update (de)
 2015-08-06 09:56:05 +01:00
Anika Henke 937959a1cc translation update 2015-08-06 10:51:11 +02:00
Gerrit Uitslag 11ff4021d8 Merge pull request #1291 from dokuwiki-translate/lang_update_810 
Translation update (pt-br)
 2015-08-05 22:36:29 +02:00
Frederico Gonçalves Guimarães dde14d5d48 translation update 2015-08-05 22:31:11 +02:00
Gerrit Uitslag 47eaf1b63b Merge pull request #1289 from dokuwiki-translate/lang_update_807 
Translation update (zh)
 2015-08-05 14:04:39 +02:00
lainme 32ba0f96c0 translation update 2015-08-05 14:01:17 +02:00
Gerrit Uitslag a4d6db92b3 Merge pull request #1279 from splitbrain/tpl_action_get2 
TPL_ACTION_UNKNOWN event for building action/button links
 2015-08-05 12:27:31 +02:00
Andreas Gohr ab526dfa3b Merge pull request #1287 from dokuwiki-translate/lang_update_805 
Translation update (fr)
 2015-08-04 16:00:23 +02:00