Commit Graph

8843 Commits

Author SHA1 Message Date
Guy Brand 43300a4eb2 Release 2016-06-26 "Elenor of Tsort" 2016-06-26 13:24:04 +02:00
Guy Brand 6122d28a9f Merge branch 'master' into stable 2016-06-26 13:20:50 +02:00
Guy Brand c8574e7db0 Release preparation 2016-06-26 13:19:27 +02:00
Andreas Gohr bac9448b6a Merge pull request #1615 from dokuwiki-translate/lang_update_62
Translation update (ko)
2016-06-26 12:54:28 +02:00
Myeongjin c256465607 translation update 2016-06-26 12:36:11 +02:00
Andreas Gohr c42ea50472 Merge pull request #1612 from dokuwiki-translate/lang_update_61
Translation update (ja)
2016-06-25 20:28:37 +02:00
Hideaki SAWADA f11017b861 translation update 2016-06-25 18:26:59 +02:00
Andreas Gohr ce5bade5fe Merge pull request #1457 from splitbrain/authpdo
AuthPDO Plugin implements #1029, replaces #1143
2016-06-24 14:53:56 +02:00
Andreas Gohr 80cf2ac2d7 removed wrong comment - str_getcsv isn't powerful enough
See https://github.com/splitbrain/dokuwiki/issues/1535#issuecomment-227039700
2016-06-22 15:15:02 +02:00
Andreas Gohr 48c6a3bd4c Merge pull request #1607 from splitbrain/config_title
Fix #1606 link to the first section of the configuration manager
2016-06-22 14:57:05 +02:00
Andreas Gohr 1eedb76485 Merge pull request #1610 from dokuwiki-translate/lang_update_60
Translation update (zh)
2016-06-22 13:05:38 +02:00
JellyChen 2409660a79 translation update 2016-06-22 13:01:40 +02:00
Michael Hamann cbfba95601 Fix #1606 link to the first section of the configuration manager 2016-06-19 18:58:00 +02:00
Andreas Gohr e86c66ad88 Merge pull request #1605 from andersruneson/update-php.net-urls
Fixed broken links to php.net and redirecting pages to php.net
2016-06-14 15:41:51 +02:00
Anders Sandblad 59752844d1 Fixed broken links to php.net and redirecting pages to php.net 2016-06-14 08:48:12 +02:00
Gerrit Uitslag 9bbceb0ecf Merge pull request #1558 from splitbrain/syntaxtableclasses
Let plugin add their own classes to list/table created with doku's renderer methods
2016-06-12 22:50:10 +02:00
Andreas Gohr b2b8b6e707 Merge pull request #1604 from dokuwiki-translate/lang_update_41
Translation update (sk)
2016-06-12 14:15:12 +02:00
Michalek ee6a0dd4ce translation update 2016-06-12 09:56:39 +02:00
Andreas Gohr bdb8810b1d upped copyright year 2016-06-11 13:02:37 +02:00
Andreas Gohr a1b0aa1e27 try to fix flaky test by clearing the statcache 2016-06-11 12:34:56 +02:00
Andreas Gohr f56d5034a8 run HTTP tests against EU server
this hopefully helps with recent problems of spradically failing tests.
2016-06-11 09:09:16 +02:00
Andreas Gohr 7d769f7571 warn about classes to be valid 2016-06-11 08:38:10 +02:00
Andreas Gohr c23fdc4603 added authpdo to the list of bundled plugins 2016-06-10 09:51:47 +02:00
Andreas Gohr d1c44d00a3 Merge pull request #1101 from splitbrain/emailsignature
Clean up of mail text signature
2016-06-10 09:45:09 +02:00
Andreas Gohr 3882015e04 Merge branch 'master' into authpdo
* master: (152 commits)
  updated jquery to 2.2.4
  fixed interwiki test
  simplified amazon interwiki links. closes #1588
  minor optimization how cell counts are fixed in tables
  Beautify code
  Keep query params during redirect to headpage
  Add sleep(1) to remoteapicore to ensure new other timestap(=rev nr)
  take care of file size change of zero
  refactor duplicate sizechange code into its own function
  always separate a number and a unit by a non-breaking space
  fix an unfortunate line break in one of the tabs of the mediamanager when using Arabic
  added doku_hasTextBeenModified, rename doku_checkSummary
  shortening dokucookie option names for extension manager
  Fix xmlrpc constructor for php7
  translation update
  translation update
  translation update
  add phpdocs
  remote api ackcheck: if user given, but no groups, retrieve groups
  use variable in remoteapicore_test
  ...
2016-06-10 09:38:49 +02:00
Andreas Gohr 3be11e103a Merge pull request #1543 from splitbrain/jquery2
upgraded jQuery to 2.2.3
2016-06-10 09:37:02 +02:00
Andreas Gohr 2e0ebe6009 allow passing multiple classes as array 2016-06-10 09:28:32 +02:00
Andreas Gohr 786818ddd1 Merge pull request #1556 from splitbrain/onlyeditwarningonchange
Check if content really changed in the Editor, before popup a warning…
2016-06-10 08:49:51 +02:00
Andreas Gohr 16f765dd94 updated jquery to 2.2.4 2016-06-10 08:44:37 +02:00
Andreas Gohr 3b82d1ee68 fixed interwiki test 2016-06-02 22:10:12 +02:00
Andreas Gohr 21ced9d012 simplified amazon interwiki links. closes #1588 2016-06-02 21:46:05 +02:00
Andreas Gohr dbd52c81e0 minor optimization how cell counts are fixed in tables
array splice operations are expensive. when many cells in a table row
are missing, the operation should be executed only once instead for each
missing cell.
2016-06-02 20:32:50 +02:00
Gerrit Uitslag a566f85e9b reformatting 2016-05-28 00:59:57 +02:00
Gerrit Uitslag f3cd98a067 use variable for wikiurl in tests 2016-05-28 00:56:40 +02:00
Gerrit Uitslag 774514c9e8 translate html and text string for signature
Default only text string exists, via localized translation a wiki admin
can add his/her own (html) version.
2016-05-28 00:39:11 +02:00
Andreas Gohr c6c3f80ec3 Merge pull request #1504 from mape2k/authplain_fix_user_cache
Invalidate user session cache after profile data was changed (fix #1117)
2016-05-26 17:00:34 +02:00
Andreas Gohr 39287e2bfd Merge pull request #1593 from micgro42/fixQuerySting
Keep query params during redirect to headpage
2016-05-26 16:54:09 +02:00
Andreas Gohr 0ce3757b24 Merge pull request #1589 from splitbrain/sizechange-0
Small fixes for file size changes
2016-05-26 16:51:13 +02:00
Michael Grosse e380abb28e Beautify code 2016-05-26 09:27:31 +02:00
Michael Grosse 9dc5397370 Keep query params during redirect to headpage
As discussed in Issue #1454 dokuwiki currently "forgets" additional
queryparams when redirecting from devel: to devel:start

Example:
https://www.dokuwiki.org/devel:?foo=bar
should result in
https://www.dokuwiki.org/devel:start?foo=bar
but actually results in
https://www.dokuwiki.org/devel:start

This commit fixes that behaviour.

Fixes #1454
2016-05-25 17:02:01 +02:00
Gerrit Uitslag 261aac3869 Merge branch 'master' of github.com:splitbrain/dokuwiki 2016-05-23 22:10:44 +02:00
Gerrit Uitslag 879851d3f0 Add sleep(1) to remoteapicore to ensure new other timestap(=rev nr)
Could improve failing test of #1589
2016-05-23 22:09:49 +02:00
Anika Henke 0b9c149d8b Merge branch 'dokuwiki-translate-lang_update_18' 2016-05-23 02:05:32 +01:00
Anika Henke 0fe6fed05c Merge branch 'lang_update_18' of https://github.com/dokuwiki-translate/dokuwiki into dokuwiki-translate-lang_update_18
Conflicts:
	lib/plugins/authplain/lang/hr/lang.php
	lib/plugins/config/lang/hr/lang.php
2016-05-23 02:04:51 +01:00
Anika Henke 0b78a6ed78 take care of file size change of zero 2016-05-23 01:55:03 +01:00
Anika Henke cd2a4cfd5f refactor duplicate sizechange code into its own function 2016-05-23 01:55:01 +01:00
Anika Henke 25692208e5 always separate a number and a unit by a non-breaking space 2016-05-23 01:54:49 +01:00
Andreas Gohr 7f89f08962 added missing statement to capability check 2016-05-20 15:57:56 +02:00
Andreas Gohr d96e9e80f1 Merge pull request #1550 from splitbrain/remoteapiGetversions
Remoteapi getversions
2016-05-20 15:06:21 +02:00
Andreas Gohr 79ed314ec9 Merge pull request #1559 from splitbrain/keepfilteroptionsextentionmgr
Keep filter options in the extension manager
2016-05-20 15:01:24 +02:00