Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | changed the link in the installer to point to wiki:welcome | Andreas Gohr | 2012-07-14 |
| | |||
* | Release preparations | Adrian Lang | 2012-07-13 |
| | |||
* | Fix HTML injection in mediaFileList (Secunia advisory SA49196) | Adrian Lang | 2012-07-13 |
| | |||
* | supress errors from LDAP bind | Andreas Gohr | 2012-07-11 |
| | |||
* | Merge branch 'ldap_multi_server' of git://github.com/DvaSlona/dokuwiki into ↵ | Andreas Gohr | 2012-07-11 |
|\ | | | | | | | | | | | | | | | pull-request-104 * 'ldap_multi_server' of git://github.com/DvaSlona/dokuwiki: Config method changed from array to comma separated string. Allow multiple LDAP servers. | ||
| * | Config method changed from array to comma separated string. | Mikhail Krasilnikov | 2012-06-13 |
| | | |||
| * | Allow multiple LDAP servers. | Mikhail Krasilnikov | 2012-06-08 |
| | | |||
* | | added lang string for 'Sidebar' | Anika Henke | 2012-07-08 |
| | | |||
* | | Merge pull request #117 from splitbrain/farms | Anika Henke | 2012-07-08 |
|\ \ | | | | | | | added farms to the core | ||
| * | | Prevent information disclosure in farms by disallowing subdirectories | Michael Hamann | 2012-07-08 |
| | | | |||
| * | | renamed conf_path() to farm_confpath() | Anika Henke | 2012-07-08 |
| | | | |||
| * | | Check that animal name is a string, better error message if not | Michael Hamann | 2012-07-08 |
| | | | |||
| * | | Check that the animal is actually inside the farm | Michael Hamann | 2012-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 implementation | Michael Hamann | 2012-07-08 |
| | | | | | | | | | | | | Now the animal can be specified in the animal environment variable. | ||
| * | | plugins.php should belong to the farmer | Anika Henke | 2012-07-08 |
| | | | |||
| * | | improved comments, added link to farm.php | Anika Henke | 2012-07-08 |
| | | | |||
| * | | added farms to the core | Anika Henke | 2012-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.php | Andreas Gohr | 2012-07-08 |
| | | | | | | | | | | | | as discussed at https://github.com/splitbrain/dokuwiki/pull/115 | ||
* | | | danish language update | Mikael Lyngvig | 2012-07-08 |
| | | | |||
* | | | Persian translation | Milad D | 2012-07-08 |
| | | | |||
* | | | Merge remote-tracking branch 'origin/master' | Michael Hamann | 2012-07-08 |
|\ \ \ | |||
| * \ \ | Merge pull request #116 from glensc/install-over-empty-file | Andreas Gohr | 2012-07-08 |
| |\ \ \ | | |/ / | |/| | | consider empty files as no file in installer | ||
| | * | | consider empty files as no file in installer | Elan Ruusamäe | 2012-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 case | Michael Hamann | 2012-07-08 |
| | | | | |||
* | | | | Merge remote-tracking branch 'nextghost/master' | Michael Hamann | 2012-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 include | Martin Doucha | 2012-07-07 |
| | | | | | |||
| * | | | | Stale cache unittest | Martin Doucha | 2012-07-07 |
| | | | | | |||
| * | | | | Make metadata cache dependency non-strict | Martin Doucha | 2012-07-06 |
| | | | | | |||
| * | | | | Merge branch 'master' of git://github.com/splitbrain/dokuwiki | Martin Doucha | 2012-07-06 |
| |\ \ \ \ | |||
| * | | | | | Fix act_validate() | Martin Doucha | 2012-06-18 |
| | | | | | | |||
| * | | | | | Split act_clean() into two functions so that plugins may use action | Martin Doucha | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | string sanitization even for their own new actions | ||
| * | | | | | Cache that has exactly the same age as a dependency may be stale | Martin Doucha | 2012-06-14 |
| | | | | | | |||
* | | | | | | Remove useless condition in p_get_metadata and add explanation | Michael Hamann | 2012-07-08 |
| |_|/ / / |/| | | | | |||
* | | | | | increased font size for mobile version | Anika Henke | 2012-07-08 |
| |_|/ / |/| | | | |||
* | | | | changed meta charset for polyglot markup | Anika Henke | 2012-07-07 |
| | | | | |||
* | | | | force same height on search input and tools select in mobile view | Anika Henke | 2012-07-07 |
| |/ / |/| | | | | | | | | I hate using heights, but couldn't find any other way | ||
* | | | syntax fix for media_diff | Andreas Gohr | 2012-07-06 |
| | | | | | | | | | | | | same problem as in f1d7655b8b6288d5b3d63a44412a69c0aa012ed8 | ||
* | | | Fix act_validate() | Martin Doucha | 2012-07-06 |
| | | | |||
* | | | Split act_clean() into two functions so that plugins may use action | Martin Doucha | 2012-07-06 |
| | | | | | | | | | | | | string sanitization even for their own new actions | ||
* | | | fixed error in html_diff() | Andreas Gohr | 2012-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 mode | Anika Henke | 2012-07-06 |
| | | | |||
* | | | Merge branch 'input-validation' of git://github.com/whoopdedo/dokuwiki into ↵ | Andreas Gohr | 2012-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_getMediaFile | Tom N Harris | 2012-06-29 |
| | | | | |||
| * | | | fix necessary global declaration | Tom N Harris | 2012-06-29 |
| | | | | |||
| * | | | Input wrapper for html forms | Tom N Harris | 2012-06-28 |
| | | | | |||
| * | | | Input validation for media manager | Tom N Harris | 2012-06-28 |
| | | | | |||
| * | | | Input wrapper for exe scripts | Tom N Harris | 2012-06-28 |
| | | | | |||
| * | | | more INPUT wrapper uses: cache purge, sectok, getID | Tom N Harris | 2012-06-27 |
| | | | | |||
| * | | | Input wrapper for action.php | Tom N Harris | 2012-06-27 |
| | | | | |||
* | | | | Merge pull request #113 from lupo49/master | Andreas Gohr | 2012-07-06 |
|\ \ \ \ | | | | | | | | | | | de/de-informal: added missing strings / updates for existing ones. |