summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* added lang string for 'Sidebar'Anika Henke2012-07-08
|
* Merge pull request #117 from splitbrain/farmsAnika Henke2012-07-08
|\ | | | | added farms to the core
| * Prevent information disclosure in farms by disallowing subdirectoriesMichael Hamann2012-07-08
| |
| * renamed conf_path() to farm_confpath()Anika Henke2012-07-08
| |
| * Check that animal name is a string, better error message if notMichael Hamann2012-07-08
| |
| * Check that the animal is actually inside the farmMichael Hamann2012-07-08
| | | | | | | | | | | | | | This makes sure that the animal that is specified in the URL is actually a subdirectory inside the farm and not somewhere else in the system. This allows that the animals are organized in different subdirectories for more complicated farm setups.
| * Add cli support to farm implementationMichael Hamann2012-07-08
| | | | | | | | Now the animal can be specified in the animal environment variable.
| * plugins.php should belong to the farmerAnika Henke2012-07-08
| |
| * improved comments, added link to farm.phpAnika Henke2012-07-08
| |
| * added farms to the coreAnika Henke2012-07-08
| | | | | | | | | | | | | | * extracted most farm code into inc/farm.php * by default farm.php is nowhere included * added preload.php.dist as an example farm setup * farm.php can be included in preload.php to activate farming
* | no longer allow include statements in local.conf.phpAndreas Gohr2012-07-08
| | | | | | | | as discussed at https://github.com/splitbrain/dokuwiki/pull/115
* | danish language updateMikael Lyngvig2012-07-08
| |
* | Persian translationMilad D2012-07-08
| |
* | Merge remote-tracking branch 'origin/master'Michael Hamann2012-07-08
|\ \
| * \ Merge pull request #116 from glensc/install-over-empty-fileAndreas Gohr2012-07-08
| |\ \ | | |/ | |/| consider empty files as no file in installer
| | * consider empty files as no file in installerElan Ruusamäe2012-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow empty config file to proceed installation as we package default config empty in first install as packager may provide empty file in package, to ensure correct file permissions. import old patch: http://cvs.pld-linux.org/packages/dokuwiki/install.patch
* | | Remove closing PHP tag in stalecheck test caseMichael Hamann2012-07-08
| | |
* | | Merge remote-tracking branch 'nextghost/master'Michael Hamann2012-07-08
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the caching system to expire caches when the last modified time of a dependency is equal to the cache file except for the meta file where the old check is kept in order to avoid additional renderer calls and possible circular dependencies. This avoids stale cache files but means that the parser and renderer could now be called more than once after an edit but we currently don't have a better fix for that.
| * | | Remove unnecessary includeMartin Doucha2012-07-07
| | | |
| * | | Stale cache unittestMartin Doucha2012-07-07
| | | |
| * | | Make metadata cache dependency non-strictMartin Doucha2012-07-06
| | | |
| * | | Merge branch 'master' of git://github.com/splitbrain/dokuwikiMartin Doucha2012-07-06
| |\ \ \
| * | | | Fix act_validate()Martin Doucha2012-06-18
| | | | |
| * | | | Split act_clean() into two functions so that plugins may use actionMartin Doucha2012-06-14
| | | | | | | | | | | | | | | | | | | | string sanitization even for their own new actions
| * | | | Cache that has exactly the same age as a dependency may be staleMartin Doucha2012-06-14
| | | | |
* | | | | Remove useless condition in p_get_metadata and add explanationMichael Hamann2012-07-08
| |_|/ / |/| | |
* | | | increased font size for mobile versionAnika Henke2012-07-08
| |_|/ |/| |
* | | changed meta charset for polyglot markupAnika Henke2012-07-07
| | |
* | | force same height on search input and tools select in mobile viewAnika Henke2012-07-07
| |/ |/| | | | | I hate using heights, but couldn't find any other way
* | syntax fix for media_diffAndreas Gohr2012-07-06
| | | | | | | | same problem as in f1d7655b8b6288d5b3d63a44412a69c0aa012ed8
* | Fix act_validate()Martin Doucha2012-07-06
| |
* | Split act_clean() into two functions so that plugins may use actionMartin Doucha2012-07-06
| | | | | | | | string sanitization even for their own new actions
* | fixed error in html_diff()Andreas Gohr2012-07-06
| | | | | | | | | | The used syntax was invalid in PHP < 3.4 and seemed to be wrong logical as well.
* | styled sidebar toggle title the same in tablet mode as it was in phone modeAnika Henke2012-07-06
| |
* | Merge branch 'input-validation' of git://github.com/whoopdedo/dokuwiki into ↵Andreas Gohr2012-07-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-110 * 'input-validation' of git://github.com/whoopdedo/dokuwiki: fix incorrect usage of tpl_getMediaFile fix necessary global declaration Input wrapper for html forms Input validation for media manager Input wrapper for exe scripts more INPUT wrapper uses: cache purge, sectok, getID Input wrapper for action.php Conflicts: lib/exe/css.php
| * | fix incorrect usage of tpl_getMediaFileTom N Harris2012-06-29
| | |
| * | fix necessary global declarationTom N Harris2012-06-29
| | |
| * | Input wrapper for html formsTom N Harris2012-06-28
| | |
| * | Input validation for media managerTom N Harris2012-06-28
| | |
| * | Input wrapper for exe scriptsTom N Harris2012-06-28
| | |
| * | more INPUT wrapper uses: cache purge, sectok, getIDTom N Harris2012-06-27
| | |
| * | Input wrapper for action.phpTom N Harris2012-06-27
| | |
* | | Merge pull request #113 from lupo49/masterAndreas Gohr2012-07-06
|\ \ \ | | | | | | | | de/de-informal: added missing strings / updates for existing ones.
| * | | de/de-informal - language updates for acl and usermanager plugin ↵lupo492012-07-01
| | | | | | | | | | | | | | | | (synchronize terms)
| * | | de/de-informal: added missing localization / update existing oneslupo492012-06-30
| | | |
| * | | de-informal: Fixed typos "Abonnementliste" (FS#2456)lupo492012-06-30
| | | |
* | | | Merge pull request #114 from NEOhidra/masterAndreas Gohr2012-07-06
|\ \ \ \ | | | | | | | | | | BG: language update
| * | | | updated: Bulgarian translationKiril LastName2012-07-04
| | | | |
* | | | | Merge branch 'httpclient' of git://github.com/whoopdedo/dokuwiki into ↵Andreas Gohr2012-07-06
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-107 * 'httpclient' of git://github.com/whoopdedo/dokuwiki: Adjust unit test to reflect desired behavior of max_bodysize Avoid timeout when content-length is 0 Limit size of reads when max_bodysize is set or content-length is present Skip over chunk extensions that nobody uses because RFC2616 says so HTTPClient will read up to max_bodysize if it can Validate the size of a chunk before reading from the socket Efficiently wait on sockets HTTP headers are already parsed, there is no need for regexp Utility function for writing to a socket Unit test for HTTPClient chunked encoding Utility functions for reading from a socket. Raise an exception on socket errors. Correct handling of chunked transfer encoding. (FS#2535) Avoid strict warnings about unset array keys. Reference static variable through 'self::' as you're supposed to.
| * | | | | Adjust unit test to reflect desired behavior of max_bodysizeTom N Harris2012-07-01
| | | | | |