Commit Graph

328 Commits

Author SHA1 Message Date
Patrick Brown b43568ad38 Document all options in the interwiki config 2015-07-22 22:28:09 -04:00
Patrick Brown 0cfb5a3076 Remove non-functioning interwiki links 2015-07-22 22:04:09 -04:00
Patrick Brown ccee93d9d1 Unit test for interwiki URL encoding bug 2015-07-16 02:50:41 -04:00
Patrick Brown 282d636f25 Change interwiki links to HTTPS 2015-07-16 02:31:53 -04:00
Andreas Gohr f624c79c43 Merge pull request #1032 from chang-zhao/patch-1
Update wordblock.conf
2015-02-16 09:29:20 +01:00
chang-zhao c9f9ddf9a8 Update wordblock.conf
moved those keywords to http & added penis
2015-02-13 12:56:51 +03:00
chang-zhao 8b7f89f548 Update wordblock.conf 2015-02-12 19:51:22 +03:00
Tim222 fb45dc56a0 Update interwiki.conf
Support for the URI scheme tel: #643
2015-02-12 13:56:22 +01:00
chang-zhao 25839a4134 Update wordblock.conf
wordblock.conf too restrictive #1021 - removed fetish, bi...sex & gay...sex
2015-02-12 15:09:51 +03:00
Rainbow Spike 2cabdb626a Update mysql.conf.php.example
Fix some typos
2014-12-10 11:42:56 +10:00
Andreas Gohr b30dd803e3 disable flash uploading by default
Thanks to Kacper Szurek for reporting this
2014-12-02 16:18:26 +01:00
Martijn Ras e4729a0500 Fixed typo and added check 2014-06-30 13:32:35 +02:00
Gerrit Uitslag 02fdb91295 Merge pull request #527 from splitbrain/userlink
Linked and formatted user names
2014-03-16 21:52:10 +01:00
Gerrit Uitslag becfa414b5 refactor detail.php to template.php
- refactor detail en mediamanager link creation
- refactor metadata listing
2014-02-25 15:45:00 +01:00
Gerrit Uitslag 2a2a43c4fa change default userspace to :user:<username> and add interwiki class 2014-02-17 00:37:28 +01:00
Gerrit Uitslag 6496c33fc8 interwiki : prefixed configurls handled as wikilinks 2014-02-15 14:34:26 +01:00
Gerrit Uitslag 4485a89171 Fix double slash in coral interwikilink 2014-02-15 11:28:09 +01:00
Gerrit Uitslag 2345e871e4 wikilink creating refactored to _resolveinterwiki().
Added DOKU_BASE for local target
2014-02-15 11:11:15 +01:00
Gerrit Uitslag 7c2f8eec8f handle interwiki without slashes as pageids. Added user interwiki
* allowed urlparams
 * added `wiki:users:` as default user profile link
2014-02-14 23:54:54 +01:00
Anika Henke 8f8f057a71 Merge pull request #265 from splitbrain/video-audio
Added video and audio support
2014-02-02 12:29:36 -08:00
Andreas Gohr ad5be2d085 fix comment typo FS#2923 2014-02-02 17:09:46 +01:00
Anika Henke a051c2744a Merge remote-tracking branch 'origin/master' into video-audio 2014-02-02 14:43:06 +00:00
Andreas Gohr 5284857cb2 protect authplain and current auth plugin 2014-01-05 20:45:32 +01:00
Andreas Gohr 168f022328 protect extension, not plugin anymore 2014-01-05 20:31:11 +01:00
Andreas Gohr 16660d32b7 use config for firguring out if an extension is protected 2014-01-05 20:29:14 +01:00
Anika Henke c5393ecb1a Merge remote-tracking branch 'origin/master' into video-audio
Conflicts:
	inc/parser/xhtml.php
2013-11-02 13:10:14 +00:00
Andreas Gohr 17dd878610 removed old, possibly never used interwiki definitions
If you used any of them readd them from http://usemod.com/intermap.txt
2013-08-04 12:58:30 +02:00
Anika Henke 2a2a2ba2f6 added basic suport for embedding (html5) videos 2013-08-02 21:35:13 +01:00
Michael Hamann 0320882f76 Remove search_references() and the refshow configuration option
The refshow configuration option wasn't used as described anymore
already in the latest release and after the introduction of the media
usage index the parameter is also no longer relevant for internal
optimization. The only place where it was still used is the no longer
used search_references()-function which is removed here, too.
2013-07-31 18:05:43 +02:00
Andreas Gohr e0086ca277 check for spam in summary as well, added common spam summary 2013-06-12 21:45:37 +02:00
Anika Henke 01fb97e278 fixed references from old mysql authtype to new mysql plugin in mysql.conf example 2013-05-27 17:01:43 +01:00
Andreas Gohr 8e06db6889 removed Satisfy All directive FS#2750 2013-04-19 11:48:56 +02:00
Anika Henke 28e3011634 fixed rfc interwiki url 2013-04-05 02:10:20 +01:00
Andreas Gohr 3da7921f08 Merge branch 'master' into future
* master: (162 commits)
  fixed revision JS for images
  upgraded SimplePie to 1.3.1 FS#2708
  removed obsolete browser plugin (migrate does it)
  adjust spacing to match standard 1.4em grid
  added comment on use of whitelist vs blacklist
  Updated idfilter() function for IIS
  use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
  added 'home' class to first link in hierarchical breadcrumbs
  reduced required max width to go into tablet mode
  re-added linear gradients for firefox
  added missing styling for disabled form elements (FS#2705)
  fixed acronyms in italics (FS#2684)
  improved print styles (includes fixes for FS#2645 and FS#2707)
  basic styles improvements
  Greek language update
  Use list in acl help text, for more structure
  Galician language update
  touch the config on save, even if no changes were made
  unwind the width narrowing commit
  put some whitespace between form submit button and fieldset bottom border
  ...

Conflicts:
	lib/plugins/config/admin.php
	lib/plugins/config/settings/config.class.php
2013-02-03 22:57:45 +01:00
Antoine Turmel 054a11302c Typo fix for TL;DR 2012-11-16 12:06:47 +01:00
Andreas Gohr 92cc83cde4 removed a bunch of outdated and irrelevant networking acronyms 2012-11-16 10:57:36 +01:00
Andreas Gohr 383dc9895e Merge branch 'master' into future
* master: (45 commits)
  TarLib code cleanup
  TarLib: fixed appending in non-dynamic mode
  fixed third method of adding files in TarLib
  fix lone zero block in TarLib created archives
  fix use of constructor in TarLib
  Slovak language update
  Korean language update
  Latvian language update
  removed redundant variables in tpl_include_page() (because of 3ff8773b)
  added cut off points for mobile devices as parameters to style.ini
  Corrected typo: ruke -> rule
  Persian language update
  Spanish language update
  russian language update
  Kazach language update
  correctly check hash parameter in media dispatcher FS#2648
  avoid broken browser_uid on IE
  Removed acronyms for "Perl" and "PERL" as Perl is not an acronym. See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
  Made striplangs.php executable
  release preparations
  ...
2012-11-04 20:19:52 +01:00
Matt Perry 7d18f46f46 Removed acronyms for "Perl" and "PERL" as Perl is not an acronym.
See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
2012-10-16 09:37:24 -07:00
Andreas Gohr 3094e817f9 changed default auth to authplain
We need to decide how to handle the renaming of the auth classes. Should
this be done automatically somehow? Or is an admin expected to fix this
manually when updating?
2012-10-06 11:11:50 +02:00
Andreas Gohr 3791b5891b use more secure password hash for admin pass FS#2536 2012-06-23 15:00:09 +02:00
Andreas Gohr 10544f7eec added .ico to allowed mime types
the new template allows to use a favicon in media/wiki/favicon.ico so we
should support uploading it as well.
2012-05-23 09:14:14 +02:00
Andreas Gohr 3891d3ec0d Merge branch 'master' into phpunit
* master:
  added option to disable reverse DNS lookups
2012-04-23 12:34:17 +02:00
Andreas Gohr 22ef1e32c5 added option to disable reverse DNS lookups 2012-04-23 12:24:08 +02:00
Andreas Gohr 73d2d14ce0 Merge branch 'master' into phpunit
* master: (29 commits)
  some edge case checking in search result highlighting
  Resolve empty page ID to configured start page
  Added more detail error code for unauthorized calls in xmlrpc interface.
  changed internal Mailer members from private to protected
  made it possible to disable HTML mails in the config
  removed commented code left from the quoted_printable days
  add missing table tags for HTML diff mails
  fixed subscriber mail signatures
  use real HRs in HTML mails
  Add various headers to the mails FS#2247. pull request #83 closed
  removed footer image from HTML mails
  use inlinestyles for diffs in HTML mails
  fixed signature stripping
  fixed mailprefix handling
  fixed missing replacement for HTML notify mails
  allow image embeds in HTML mail templates
  Added HTML wrapper for mails
  allow non-txt extensions when accessing locales
  added Mailer class to autoloader
  Replaced mail_send calls with new Mailer class
  ...
2012-04-20 21:44:48 +02:00
Tobias Sarnowski f9b8008a4c BROKEN added enable/disable feature for plugins 2012-04-17 17:27:27 +02:00
Andreas Gohr 317250bbd4 rearranged the config options
We had a lot of options lumped together under "Advanced Settings". I
introduced two more categories and move a few options to other existing
categories.
I also reordered the appropriate entries in the source files to make it
easier to find stuff when extending the options.
2012-04-16 19:42:49 +02:00
Andreas Gohr 8aea638195 Merge branch 'master' into htmlmail
* master:
  extended some config options a bit, to make more clear what they do
  rearranged the config options

Conflicts:
	conf/dokuwiki.php
	lib/plugins/config/lang/en/lang.php
	lib/plugins/config/settings/config.metadata.php
2012-04-15 15:21:04 +02:00
Andreas Gohr 7cd0713ea6 rearranged the config options
We had a lot of options lumped together under "Advanced Settings". I
introduced two more categories and move a few options to other existing
categories.
I also reordered the appropriate entries in the source files to make it
easier to find stuff when extending the options.
2012-04-15 14:57:20 +02:00
Andreas Gohr ae7c596cf4 Merge branch 'master' into htmlmail
* master: (382 commits)
  Romanian language update
  Marathi language update
  Arabic Language Update
  when there's not enough space for images, make sure they stay proportional (might be FS#2480)
  added minimal RTL print styles (part of FS#2185)
  moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
  removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
  removed comments from accidentally commented lines in tpl_includeFile()
  removed obsolete template file
  added tpl_includeFile() to core
  Make getTitle method in remote interface public
  Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
  BG: language update
  Korean language update
  fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
  deleted very old (and unused) images
  added accidentally removed '<?php' back in (was in 57fc5edd)
  wrapped X-UA-Compatible meta tag with conditional comments
  added explanation to todo in _forms.css
  removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
  ...

Conflicts:
	inc/auth.php
	inc/load.php
2012-04-15 13:45:45 +02:00
Andreas Gohr 2398a2b541 made it possible to disable HTML mails in the config 2012-04-15 13:25:05 +02:00
Anika Henke b7c3da9b00 Merge pull request #82 from splitbrain/new-template
The new default template "dokuwiki", a new era has begun

Thanks to Clarence Lee for the initial design, Anika Henke and Andreas Gohr for the hard work, Michael Hamann and Håkan Sandell for testing and many others for valuable feedback.
2012-04-07 14:31:39 -07:00
Dominik Eckelmann 3a6d76070b Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Conflicts:
	lib/exe/xmlrpc.php
2012-03-14 12:52:36 +01:00
Andreas Gohr 1cbac89c95 make new template the default 2012-03-10 17:27:35 +01:00
Andreas Gohr a7c93226bd make RSS contents (media/pages) configurable 2012-03-02 08:08:29 +01:00
Anika Henke 91e9045718 added two new config options: tagline and sidebar
Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible.
2012-01-29 19:15:13 +00:00
Dominik Eckelmann eb20307ad6 removed xmlrpc and xmlrpcuser - added remote and remoteuser config option 2012-01-08 14:38:52 +01:00
Andreas Gohr 37c23632c3 added missing config metadata FS#2383
Translators need to add another string.
2011-11-27 11:37:26 +01:00
Piyush Mishra 2fb7abe3de renamed plugins.protected.php to plugins.required.php and added it cascade to allow overwriting as a local protected file 2011-11-06 19:32:01 +05:30
Anika Henke 29d511bfa5 Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller
This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001

Thanks to Piyush for the work and Google for sponsoring it!

Conflicts:
	inc/lang/en/lang.php
2011-09-10 20:23:40 +01:00
Hakan Sandell 98aafb569e Code cleanup documentation before merge
Function get_plugin_components() moved to extantion manager
2011-09-10 10:59:10 +02:00
Piyush Mishra b838050e58 added new plugins config cascade and added plugin.info.txt 2011-08-20 19:11:52 +05:30
Kate Arzamastseva e5d185e17e issue #9 config option to disable media revisions, auth 2011-08-02 20:25:17 +03:00
Kate Arzamastseva abc5e9c041 merging 2011-07-10 14:42:10 +03:00
Kate Arzamastseva 3e98e6857f media getting metadata fix 2011-06-29 16:59:18 +03:00
Kate Arzamastseva 532850ed04 media getting metadata fix 2011-06-23 13:13:34 +03:00
Andreas Gohr 28f4004c93 Made the maximum embed size for datauris configurable
The feature is now disabled by default.
Metadata for config manager was added.
2011-06-18 10:16:47 +02:00
Andreas Gohr 809d3ba53b Use data uris for small image files in CSS
This patch adds a new config option 'cssdatauri'. When enabled, the CSS
patcher will automatically convert all occurances of small (<600 byte)
PNG and GIF images in the CSS to embedded, base64 encoded data uris.

This reduces the number of needed HTTP requests and avoids the HTTP header
overhead.
2011-06-17 01:41:51 +02:00
Guy Brand 8dbd31e5a7 Fix broken link to config help page 2011-04-16 10:07:11 +02:00
Marc Schiffbauer a3f9f75c26 Make .htaccess access protection work in more setups
Before this patch with a .htaccess file on a higher level in the
hierarchy with "Satisfy Any" it has been possible that the directory
protection didn't work as expected.
2011-03-29 23:48:47 +02:00
Tom N Harris 8c4c7aef44 Remove config for external tokenizer 2011-03-22 18:40:11 -04:00
Michael Hamann d8e733eea8 Merge branch 'indexer_rewrite' 2011-03-08 00:33:35 +01:00
Anika Henke 5e5debec39 deleted obsolete word list conf file for old spellchecker 2011-03-05 11:31:58 +00:00
Michael Hamann f77fc90de1 Merge branch 'master' into indexer_rewrite
Conflicts:
	inc/fulltext.php
	inc/indexer.php
	lib/exe/indexer.php
2011-02-24 23:27:24 +01:00
Elan Ruusamäe 9a75132c18 Add skype interwiki 2011-02-13 18:56:26 +01:00
Elan Ruusamäe d56f539665 Add LAN 2011-02-13 18:55:36 +01:00
lupo49 023e47d6f2 Support for VoIP/SIP callto-links (FS#2167) 2011-02-11 16:18:20 +01:00
Andreas Gohr 95412639d7 added some spammers to the blacklist 2011-02-09 18:35:31 +01:00
Andreas Gohr 0411c186ca that smiley was far too happy 2011-02-08 09:00:41 +01:00
Andreas Gohr 28ac81641d added one of the most important smileys 2011-02-07 22:24:54 +01:00
Andreas Gohr 3c89623811 adjusted dokubug> interwiki URL 2011-01-26 14:33:04 +01:00
Michael Hamann fc756e0d4d Merge branch 'master' into indexer_improvements
Conflicts:
	inc/fulltext.php
	inc/indexer.php
	lib/exe/indexer.php
2011-01-23 20:33:32 +01:00
Adrian Lang 731ae6527a Merge branch 'master' of github.com:splitbrain/dokuwiki 2011-01-14 21:45:52 +01:00
Anika Henke 8480b938f5 added paypal interwiki links
usage: [[paypal>email@address.com]]
2011-01-04 23:01:24 +00:00
Guy Brand 5526795c71 Allow a prefix for subject of sent mails (Close FS#2021) 2010-12-31 15:46:43 +01:00
Adrian Lang b5a0be432b Various changes to feed.php’s parameter handling
* Do not emit E_NOTICEs
  * Introduce explicit feed mode default value »recent« instead of handling
    every unknown feed mode as recent changes mode. This means:
    - FEED_MODE_UNKNOWN is only executed if the given feed mode is indeed
      unknown. This is specifically not the case if no feed mode request param
      has been specified or the requested feed mode is »recent«.
    - FEED_MODE_UNKNOWN dies with an error as default behaviour
  * opt[items] is forced to be a non-negative integer
  * opt[show_minor] is forced to be a boolean and thus has a default value of
    false instead of null
2010-12-08 17:43:22 +01:00
Matthias Schulte b66a6bd459 fixed abbreviation FS#2108 / added RFC 2010-11-30 20:05:49 +01:00
Tom N Harris 1c07b9e622 Use external program to split pages into words
An external tokenizer inserts extra spaces to mark words in the input text.
The text is sent through STDIN and STDOUT file handles.

A good choice for Chinese and Japanese is MeCab.
http://sourceforge.net/projects/mecab/
With the command line 'mecab -O wakati'
2010-11-16 18:09:53 -05:00
Andreas Gohr df61352eb6 spam list update 2010-11-07 10:57:02 +01:00
Andreas Gohr ba60e49d53 we now maintain our spam blacklist FS#2035 2010-10-02 13:29:48 +02:00
Andreas Gohr 2d80806237 release preparations 2010-08-29 13:48:18 +02:00
Anika Henke ef362bb863 moved update message from its own file (conf/msg) into doku.php (FS#1800) 2010-06-27 13:58:07 +01:00
Andreas Gohr 7aeda57486 added proxy exception regexp FS#1247 2010-06-26 20:42:48 +02:00
Andreas Gohr 0636144287 Added license chooser to installer FS#1926
This adds a license chooser to the installer. The installer defaults to
the more free CC-BY-SA. CC-NC-BY-SA is still the default in dokuwiki.php
to keep backwards compatibility.

The license array was reordered and Non-Derivative licenses removed
(they don't make much sense for wiki content).
2010-06-26 16:02:30 +02:00
Andreas Gohr f03fd95752 new fnencode option FS#1649
This patch adds an option to choose how filenames are encoded
when saved to the file system. You can choose between urlencoding
(url), the new SafeFn method (safe) and storing real UTF-8 (utf-8).
2010-04-04 20:28:39 +02:00
YoBoY 229529655f Limiting use of readdir in the idx_indexLengths function (v2).
Each searches on the wiki use this function. Scanning the index directory eachtime is time consuming with a constant series of disk access.
Switching a normal search to use file_exists 1 or more times, and not readdir all the directory.
Switching a wildcard search to use a lengths.idx file containing all the word lengths used in the wiki, file generated if a new configuration parameter $conf[readdircache] is not 0 and fixed to a time in second. Creation of a new function idx_listIndexLengths to do this part.
2010-03-24 21:27:23 +01:00
Andreas Gohr bc87043b78 minor tweaks on sample conf files FS#1723 2010-02-28 11:39:07 +01:00
Tanguy Ortolo 003d21aecc Update license GFDL and added CC0 2010-02-28 10:47:16 +01:00
Andreas Gohr 01eab857bc added new mime types and file icons FS#1888 2010-02-14 20:26:02 +01:00
Andreas Gohr 81276e7487 Fixed license URL FS#1883 2010-02-14 20:10:37 +01:00
Adrian Lang 6c1f778cae Fix section editing killing next section 2010-02-08 10:16:35 +01:00