summaryrefslogtreecommitdiff
path: root/conf
Commit message (Collapse)AuthorAge
* Merge branch 'master' into futureAndreas Gohr2013-02-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Typo fix for TL;DRAntoine Turmel2012-11-16
| |
| * removed a bunch of outdated and irrelevant networking acronymsAndreas Gohr2012-11-16
| |
* | Merge branch 'master' into futureAndreas Gohr2012-11-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Removed acronyms for "Perl" and "PERL" as Perl is not an acronym.Matt Perry2012-10-16
| | | | | | | | See http://learn.perl.org/faq/perlfaq1.html#Whats-the-difference-between-perl-and-Perl-
* | changed default auth to authplainAndreas Gohr2012-10-06
|/ | | | | | 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?
* use more secure password hash for admin pass FS#2536Andreas Gohr2012-06-23
|
* added .ico to allowed mime typesAndreas Gohr2012-05-23
| | | | | the new template allows to use a favicon in media/wiki/favicon.ico so we should support uploading it as well.
* Merge branch 'master' into phpunitAndreas Gohr2012-04-23
|\ | | | | | | | | * master: added option to disable reverse DNS lookups
| * added option to disable reverse DNS lookupsAndreas Gohr2012-04-23
| |
* | Merge branch 'master' into phpunitAndreas Gohr2012-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * rearranged the config optionsAndreas Gohr2012-04-15
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'master' into htmlmailAndreas Gohr2012-04-15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | made it possible to disable HTML mails in the configAndreas Gohr2012-04-15
| | |
* | | BROKEN added enable/disable feature for pluginsTobias Sarnowski2012-04-17
| | |
* | | rearranged the config optionsAndreas Gohr2012-04-16
| |/ |/| | | | | | | | | | | | | 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.
* | Merge pull request #82 from splitbrain/new-templateAnika Henke2012-04-07
|\ \ | | | | | | | | | | | | 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.
| * | make new template the defaultAndreas Gohr2012-03-10
| | |
* | | Merge branch 'master' of https://github.com/splitbrain/dokuwikiDominik Eckelmann2012-03-14
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/exe/xmlrpc.php
| * | | make RSS contents (media/pages) configurableAndreas Gohr2012-03-02
| |/ /
| * | added two new config options: tagline and sidebarAnika Henke2012-01-29
| | | | | | | | | | | | 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.
| * | added missing config metadata FS#2383Andreas Gohr2011-11-27
| |/ | | | | | | Translators need to add another string.
* / removed xmlrpc and xmlrpcuser - added remote and remoteuser config optionDominik Eckelmann2012-01-08
|/
* renamed plugins.protected.php to plugins.required.php and added it cascade ↵Piyush Mishra2011-11-06
| | | | to allow overwriting as a local protected file
* Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki ↵Anika Henke2011-09-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Code cleanup documentation before mergeHakan Sandell2011-09-10
| | | | | | | | Function get_plugin_components() moved to extantion manager
| * added new plugins config cascade and added plugin.info.txtPiyush Mishra2011-08-20
| |
* | issue #9 config option to disable media revisions, authKate Arzamastseva2011-08-02
| |
* | mergingKate Arzamastseva2011-07-10
|\|
| * Made the maximum embed size for datauris configurableAndreas Gohr2011-06-18
| | | | | | | | | | The feature is now disabled by default. Metadata for config manager was added.
| * Use data uris for small image files in CSSAndreas Gohr2011-06-17
| | | | | | | | | | | | | | | | | | 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.
* | media getting metadata fixKate Arzamastseva2011-06-29
| |
* | media getting metadata fixKate Arzamastseva2011-06-23
|/
* Fix broken link to config help pageGuy Brand2011-04-16
|
* Make .htaccess access protection work in more setupsMarc Schiffbauer2011-03-29
| | | | | | 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.
* Remove config for external tokenizerTom N Harris2011-03-22
|
* Merge branch 'indexer_rewrite'Michael Hamann2011-03-08
|\
| * Merge branch 'master' into indexer_rewriteMichael Hamann2011-02-24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
| * \ Merge branch 'master' into indexer_improvementsMichael Hamann2011-01-23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
| * | | Use external program to split pages into wordsTom N Harris2010-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'
* | | | deleted obsolete word list conf file for old spellcheckerAnika Henke2011-03-05
| |_|/ |/| |
* | | Add skype interwikiElan Ruusamäe2011-02-13
| | |
* | | Add LANElan Ruusamäe2011-02-13
| | |
* | | Support for VoIP/SIP callto-links (FS#2167)lupo492011-02-11
| | |
* | | added some spammers to the blacklistAndreas Gohr2011-02-09
| | |
* | | that smiley was far too happyAndreas Gohr2011-02-08
| | |
* | | added one of the most important smileysAndreas Gohr2011-02-07
| | |
* | | adjusted dokubug> interwiki URLAndreas Gohr2011-01-26
| |/ |/|
* | Merge branch 'master' of github.com:splitbrain/dokuwikiAdrian Lang2011-01-14
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-29 10:05:29 +0000