summaryrefslogtreecommitdiffstats
path: root/lib/base.php
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-211-7/+1
|\
| * Make working en_US.UTF-8 locale a hard requirementBart Visscher2013-11-081-7/+1
* | add trash bin and file versions delete hooks in OC::registerPreviewHooksGeorg Ehrke2013-11-121-0/+2
* | display the exception instead of meaningless messageThomas Müller2013-11-041-8/+3
|/
* replace template function link_to_docs() with \OC_Helper::linkToDocs()Thomas Mueller2013-11-021-1/+1
* Merge pull request #5443 from owncloud/fix-autoloader-cachingBart Visscher2013-11-011-0/+8
|\
| * Only use autoloader cache when 'instanceid' is available.Andreas Fischer2013-10-221-5/+9
| * Inject memoryCache into Autoloader. Remove recursion-prevention hack.Andreas Fischer2013-10-221-1/+5
* | Make "Please contact your system administrator" a full sentence.Andreas Fischer2013-11-011-1/+1
* | Merge pull request #3889 from owncloud/apps_preloadMorris Jobke2013-10-281-1/+1
|\ \
| * | Don't load the apps when we need to upgradeBart Visscher2013-06-281-1/+1
* | | Merge pull request #5528 from frisco82/changeUpadateNotificationThomas Müller2013-10-241-2/+4
|\ \ \
| * | | Changed update message to be more instructive, changed update style to be les...Ramiro Aparicio2013-10-241-2/+4
* | | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindexThomas Müller2013-10-241-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Remove WebDAV redirect from the root pathVincent Petry2013-10-241-1/+5
| | |/ | |/|
* / | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-231-0/+1
|/ /
* | introduce link_to_docs() and migrate linksThomas Müller2013-10-211-1/+1
* | Use display name from magic cookie, fixes #4884Arthur Schiwon2013-10-181-0/+1
* | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-161-2/+8
|\ \
| * | Include exception message in log entry when session fails to startTom Needham2013-10-121-1/+1
| * | Handle ownCloud logging when data dir not createdTom Needham2013-10-111-6/+2
| * | Log the session exception when ownCloud is not installedTom Needham2013-10-111-3/+6
| * | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+7
| |\ \
| | * | changed the argument to false for getValue , reformated else statementAxel Roenn2013-10-101-3/+2
| | * | Changed default behaviour to not log IP address in case of an auth failure. C...Axel Roenn2013-09-101-2/+8
| | * | On an auth failure the uid and the IP address should be logged to the standar...Axel Roenn2013-09-091-0/+2
* | | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-081-3/+28
|\| | |
| * | | fixing various PHPDoc commentsThomas Müller2013-10-021-2/+2
| * | | remove obsolete function login()Thomas Müller2013-10-021-8/+0
| * | | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-021-4/+17
| * | | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-021-1/+1
| |\ \ \
| * | | | Squashed commit of the following:Thomas Müller2013-10-011-1/+21
* | | | | PHPDoc addedThomas Müller2013-10-071-2/+6
| |/ / / |/| | |
* | | | Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-301-0/+1
|\| | |
| * | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-301-0/+1
| |\ \ \
| | * | | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-241-1/+1
| | * | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-0/+1
* | | | | move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-1/+1
|/ / / /
* | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-251-0/+1
|\| | |
| * | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-191-0/+1
| |\ \ \
| | * | | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+1
* | | | | Note to self 2: Do as you preach. Test!Thomas Tanghus2013-09-181-1/+1
* | | | | Note to self: Test before pushing!!!Thomas Tanghus2013-09-181-1/+1
* | | | | Use new emitter systemThomas Tanghus2013-09-181-1/+3
* | | | | OC_Cache namespace changes and add UserCache to server container.Thomas Tanghus2013-09-171-2/+2
* | | | | /OC/Server has created too early causing issues with config operations as OC:...Thomas Müller2013-09-151-3/+3
* | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-151-0/+8
|\| | | |
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-121-10/+5
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-041-4/+4
| |\ \ \ \
| * | | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-5/+7