summaryrefslogtreecommitdiffstats
path: root/lib/base.php
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Merge branch 'master' into oc_avatarskondou2013-08-311-9/+26
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use defaultavatarskondou2013-08-291-0/+6
* | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-131-14/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Revert "fixes #4574"Thomas Müller2013-09-061-10/+5
| | |_|/ | |/| |
| * | | Merge branch 'master' into clean_up_utilkondou2013-09-021-15/+51
| |\ \ \ | | | |/ | | |/|
| | * | Merge master into oc_previewGeorg Ehrke2013-08-301-9/+17
| | |\ \
| | * \ \ Merge master into oc_previewGeorg Ehrke2013-08-291-6/+25
| | |\ \ \ | | | | |/ | | | |/|
| | * | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |