summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into oc_avatarskondou2013-09-031-3/+5
|\
| * Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-021-3/+0
| |\
| | * remove the config option that is no longer neededFrank Karlitschek2013-08-311-3/+0
| * | Employ config option for OpenSSL config file, if provided.Owen Winkler2013-09-021-1/+1
| * | Start a branch for easier OpenSSL configuration.Owen Winkler2013-09-021-0/+5
| |/
* / Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-0/+3
|/
* Merge master into oc_previewGeorg Ehrke2013-08-291-2/+12
|\
| * Only enable logrotate when configured. Also rotate size is settable.Bart Visscher2013-08-281-3/+12
* | invert logic of disable_previewsGeorg Ehrke2013-08-291-1/+1
* | make it possible to disable previewsGeorg Ehrke2013-08-231-0/+1
* | style fixes for preview libGeorg Ehrke2013-08-191-0/+2
* | fix merge conflictsGeorg Ehrke2013-08-051-1/+6
|\|
| * Merge pull request #4293 from owncloud/config-dateThomas Müller2013-08-041-1/+4
| |\
| | * add 'logdateformat' to config.sample.phpThomas Müller2013-08-041-1/+4
| * | users's -> user'sLennart Rosam2013-08-021-1/+1
| * | Fix typo (again >.<).. gnahLennart Rosam2013-08-021-1/+1
| * | Make default language configurable via config.phpLennart Rosam2013-08-021-1/+4
| |/
* | Merge branch 'master' into oc_previewThomas Müller2013-07-301-8/+8
|\|
| * reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-2/+2
| * Fix some typoskondou2013-07-161-6/+6
* | fix syntax in config.sample.phpGeorg Ehrke2013-07-291-1/+1
* | merge conflicts ...Georg Ehrke2013-07-101-0/+3
|\|
| * session_life_time -> session_lifetimeThomas Mueller2013-06-281-1/+1
| * session life time is now configurable and set to the same valueThomas Mueller2013-06-261-0/+3
* | yet another update for config.sample.phpGeorg Ehrke2013-06-051-1/+1
* | update config.sample.phpGeorg Ehrke2013-06-051-0/+2
* | add sample config for previewsGeorg Ehrke2013-05-251-0/+8
|/
* Merge pull request #3111 from owncloud/csp-audioicewind19912013-04-241-1/+1
|\
| * Allow loading of external media ressourcesLukas Reschke2013-04-241-1/+1
* | - xframe restriction configurable nowFlorian Scholz2013-04-241-0/+4
|/
* fixes #2789 - no internet connectivity check if there is non on purposeThomas Mueller2013-04-081-1/+4
* Update config.sample.phpFrank Karlitschek2013-04-051-2/+2
* Change logQuery from define() to OC::ConfigBrice Maron2013-03-301-0/+4
* fix missing ',' after "mail_domain" parameteritheiss2013-03-261-1/+1
* Update to reflect new parameter mail_domainitheiss2013-03-261-0/+3
* Remove uneeded \ since we're using "Lukas Reschke2013-03-021-1/+1
* add switch to enable/disable the possibility to change the display name by th...Björn Schießle2013-02-101-0/+3
* make it possible to modify the links to the clientsGeorg Ehrke2013-02-061-1/+5
* Merge pull request #1445 from owncloud/CSP_fontThomas Müller2013-02-041-1/+1
|\
| * Also allow local filesLukas Reschke2013-02-041-1/+1
| * Allow the loading of local font files embedded via data:Lukas Reschke2013-02-041-1/+1
| * Allow loading of external fontsLukas Reschke2013-02-041-1/+1
* | Make fileblacklist configurableLukas Reschke2013-02-031-0/+3
|/
* add SSL proxy supportherbrechtsmeier2013-01-311-0/+3
* add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-0/+3
* fix merge conflictsBjörn Schießle2013-01-281-0/+19
|\
| * Merge pull request #1318 from j-ed/masterThomas Müller2013-01-281-0/+4
| |\
| | * Update config/config.sample.phpj-ed2013-01-261-0/+4
| * | Warn users not to enable DEBUG in productive environmentsLukas Reschke2013-01-251-0/+2
| * | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-251-0/+10
| |\|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 19:59:02 +0000