| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 1 | -3/+5 |
|\ |
|
| * | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 1 | -3/+0 |
| |\ |
|
| | * | remove the config option that is no longer needed | Frank Karlitschek | 2013-08-31 | 1 | -3/+0 |
| * | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 1 | -1/+1 |
| * | | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 1 | -0/+5 |
| |/ |
|
* / | Provide 'enable_avatars' in config.php, to disable avatars | kondou | 2013-09-01 | 1 | -0/+3 |
|/ |
|
* | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -2/+12 |
|\ |
|
| * | Only enable logrotate when configured. Also rotate size is settable. | Bart Visscher | 2013-08-28 | 1 | -3/+12 |
* | | invert logic of disable_previews | Georg Ehrke | 2013-08-29 | 1 | -1/+1 |
* | | make it possible to disable previews | Georg Ehrke | 2013-08-23 | 1 | -0/+1 |
* | | style fixes for preview lib | Georg Ehrke | 2013-08-19 | 1 | -0/+2 |
* | | fix merge conflicts | Georg Ehrke | 2013-08-05 | 1 | -1/+6 |
|\| |
|
| * | Merge pull request #4293 from owncloud/config-date | Thomas Müller | 2013-08-04 | 1 | -1/+4 |
| |\ |
|
| | * | add 'logdateformat' to config.sample.php | Thomas Müller | 2013-08-04 | 1 | -1/+4 |
| * | | users's -> user's | Lennart Rosam | 2013-08-02 | 1 | -1/+1 |
| * | | Fix typo (again >.<).. gnah | Lennart Rosam | 2013-08-02 | 1 | -1/+1 |
| * | | Make default language configurable via config.php | Lennart Rosam | 2013-08-02 | 1 | -1/+4 |
| |/ |
|
* | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -8/+8 |
|\| |
|
| * | reduce time for auto expire to 30 days by default | Björn Schießle | 2013-07-26 | 1 | -2/+2 |
| * | Fix some typos | kondou | 2013-07-16 | 1 | -6/+6 |
* | | fix syntax in config.sample.php | Georg Ehrke | 2013-07-29 | 1 | -1/+1 |
* | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -0/+3 |
|\| |
|
| * | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -1/+1 |
| * | session life time is now configurable and set to the same value | Thomas Mueller | 2013-06-26 | 1 | -0/+3 |
* | | yet another update for config.sample.php | Georg Ehrke | 2013-06-05 | 1 | -1/+1 |
* | | update config.sample.php | Georg Ehrke | 2013-06-05 | 1 | -0/+2 |
* | | add sample config for previews | Georg Ehrke | 2013-05-25 | 1 | -0/+8 |
|/ |
|
* | Merge pull request #3111 from owncloud/csp-audio | icewind1991 | 2013-04-24 | 1 | -1/+1 |
|\ |
|
| * | Allow loading of external media ressources | Lukas Reschke | 2013-04-24 | 1 | -1/+1 |
* | | - xframe restriction configurable now | Florian Scholz | 2013-04-24 | 1 | -0/+4 |
|/ |
|
* | fixes #2789 - no internet connectivity check if there is non on purpose | Thomas Mueller | 2013-04-08 | 1 | -1/+4 |
* | Update config.sample.php | Frank Karlitschek | 2013-04-05 | 1 | -2/+2 |
* | Change logQuery from define() to OC::Config | Brice Maron | 2013-03-30 | 1 | -0/+4 |
* | fix missing ',' after "mail_domain" parameter | itheiss | 2013-03-26 | 1 | -1/+1 |
* | Update to reflect new parameter mail_domain | itheiss | 2013-03-26 | 1 | -0/+3 |
* | Remove uneeded \ since we're using " | Lukas Reschke | 2013-03-02 | 1 | -1/+1 |
* | add switch to enable/disable the possibility to change the display name by th... | Björn Schießle | 2013-02-10 | 1 | -0/+3 |
* | make it possible to modify the links to the clients | Georg Ehrke | 2013-02-06 | 1 | -1/+5 |
* | Merge pull request #1445 from owncloud/CSP_font | Thomas Müller | 2013-02-04 | 1 | -1/+1 |
|\ |
|
| * | Also allow local files | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
| * | Allow the loading of local font files embedded via data: | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
| * | Allow loading of external fonts | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
* | | Make fileblacklist configurable | Lukas Reschke | 2013-02-03 | 1 | -0/+3 |
|/ |
|
* | add SSL proxy support | herbrechtsmeier | 2013-01-31 | 1 | -0/+3 |
* | add multiple domains reverse proxy support | Stefan Herbrechtsmeier | 2013-01-31 | 1 | -0/+3 |
* | fix merge conflicts | Björn Schießle | 2013-01-28 | 1 | -0/+19 |
|\ |
|
| * | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 1 | -0/+4 |
| |\ |
|
| | * | Update config/config.sample.php | j-ed | 2013-01-26 | 1 | -0/+4 |
| * | | Warn users not to enable DEBUG in productive environments | Lukas Reschke | 2013-01-25 | 1 | -0/+2 |
| * | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-25 | 1 | -0/+10 |
| |\| |
|