summaryrefslogtreecommitdiffstats
path: root/lib/base.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into clean_up_utilkondou2013-09-021-15/+51
|\
| * Merge master into oc_previewGeorg Ehrke2013-08-301-9/+17
| |\
| | * Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-301-1/+3
| | |\
| | | * move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-301-0/+1
| | | * move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-301-1/+2
| | * | Merge pull request #4578 from houbaastef/masterStephane Martin2013-08-301-5/+10
| | |\ \
| | | * | fixes #4574Stephane Martin2013-08-261-5/+10
| | * | | Use the real username in preferences and magic cookie instead of case-insensi...Arthur Schiwon2013-08-301-3/+4
| | | |/ | | |/|
| * | | Merge master into oc_previewGeorg Ehrke2013-08-291-6/+25
| |\| |
| | * | Only enable logrotate when configured. Also rotate size is settable.Bart Visscher2013-08-281-1/+2
| | * | Check for installed state before registering the logrotate background jobBart Visscher2013-08-281-1/+15
| | * | Very simple log rotationBart Visscher2013-08-281-0/+1
| | * | Merge pull request #3891 from owncloud/fix_loadAppScriptFileBart Visscher2013-08-281-5/+8
| | |\ \
| | | * | Check if the app is enabled and the app path is found before trying to load t...Bart Visscher2013-06-281-5/+8
| | * | | Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-281-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix octemplate string escaping.Thomas Tanghus2013-08-141-1/+1
| * | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-231-16/+19
| |\| | |
| * | | | Merge branch 'master' into oc_previewThomas Müller2013-07-301-31/+22
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merge conflicts ...Georg Ehrke2013-07-101-10/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-06-171-4/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-06-061-7/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-05-291-17/+28
| |\ \ \ \ \ \ \
| * | | | | | | | move to OC namespaceGeorg Ehrke2013-05-291-2/+2
| * | | | | | | | connect preview lib to filesystem hooksGeorg Ehrke2013-05-291-0/+9
* | | | | | | | | Merge branch 'master' into clean_up_utilkondou2013-08-201-16/+19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | add quota streamwrapper that limits the amount of data that can be written to...Robin Appelman2013-07-251-16/+19
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-2/+2
* | | | | | | | Clean up \OC\Utilkondou2013-08-151-4/+4
|/ / / / / / /
* | | | | | | shorten wording on config directory errorsJan-Christoph Borchardt2013-07-231-1/+2
* | | | | | | In debug mode uncaught exceptions should display a nice pageBart Visscher2013-07-211-3/+7
* | | | | | | Cleanup error generation in base.phpBart Visscher2013-07-161-20/+8
* | | | | | | Use autoloader for Patchwork/PHP/Shim/NormalizerBart Visscher2013-07-161-0/+1
* | | | | | | Merge pull request #3962 from owncloud/move-error-handlersBart Visscher2013-07-151-3/+2
|\ \ \ \ \ \ \
| * | | | | | | Move error handlers from OC_Log to OC\Log\ErrorHandlerBart Visscher2013-07-051-3/+2
* | | | | | | | Merge pull request #3487 from owncloud/basic_auth_hackThomas Müller2013-07-141-7/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Move comment and set requesttoken.Thomas Tanghus2013-06-051-3/+2
| * | | | | | | Cleanup hacke v.2Thomas Tanghus2013-05-311-4/+2
| * | | | | | | Revert "Clean up hack."Thomas Tanghus2013-05-311-2/+4
| * | | | | | | Clean up hack.Thomas Tanghus2013-05-311-4/+2
| * | | | | | | Hack base.php to make Basic Auth workThomas Tanghus2013-05-251-1/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-081-2/+3
| |/ / / / / |/| | | | |
* | | | | | session_life_time -> session_lifetimeThomas Mueller2013-06-281-2/+2
* | | | | | session life time is now configurable and set to the same valueThomas Mueller2013-06-261-5/+14
| |_|_|_|/ |/| | | |
* | | | | Init dummy session firstVictor Dubiniuk2013-06-171-3/+3
| |_|_|/ |/| | |
* | | | Merge branch 'master' into move-maint-startThomas Mueller2013-06-141-24/+45
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #3578 from owncloud/ocdialogThomas Tanghus2013-06-031-0/+2
| |\ \ \
| | * | | Replacement for jquery.dialog to fit better with ownCloud design.Thomas Tanghus2013-06-021-0/+2
| * | | | Merge pull request #3560 from owncloud/init-order-sessionJörn Friedrich Dreyer2013-06-031-3/+3
| |\ \ \ \
| | * | | | initialize the session earlierRobin Appelman2013-05-311-3/+3
| | |/ / /
| * | | | merge master into backgroundjobRobin Appelman2013-06-021-73/+57
| |\| | |