summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix api result merging.Tom Needham2013-02-091-3/+3
* Merge in masterTom Needham2013-02-0918-46/+217
|\
| * Fix files router download linksBart Visscher2013-02-081-0/+14
| * Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-masterThomas Müller2013-02-081-1/+1
| |\
| | * quick fixing this require_once.Thomas Mueller2013-02-081-1/+1
| * | missing comma in sql statementThomas Müller2013-02-081-1/+1
| * | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsingicewind19912013-02-071-4/+3
| |\ \
| | * | simplyfy mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-4/+3
| * | | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-071-0/+3
| |\ \ \
| | * | | Move loading of js_config to templatelayoutBart Visscher2013-02-071-0/+3
| * | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layoutblizzz2013-02-071-0/+3
| |\ \ \ \
| | * | | | Fix warning with displayname in user layout templateBart Visscher2013-02-071-0/+3
| | |/ / /
| * | | | Fix previous commitRobin Appelman2013-02-071-1/+1
| * | | | Use dummy request method in CLIRobin Appelman2013-02-071-1/+5
| * | | | Don't try to use routes when called from cliRobin Appelman2013-02-071-8/+10
| | |/ / | |/| |
| * | | Merge pull request #1451 from eMerzh/fix_1065Thomas Müller2013-02-071-0/+3
| |\ \ \
| | * | | Add Redirect to getUrlContent fix #1065Brice Maron2013-02-041-0/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-071-0/+1
| * | | | Merge pull request #1500 from chriskoch/patch-1Frank Karlitschek2013-02-061-2/+2
| |\ \ \ \
| | * | | | Update lib/public/util.phpChristian Koch2013-02-061-2/+2
| * | | | | Merge pull request #1509 from owncloud/correct-public-contacts-testsLukas Reschke2013-02-061-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Correct lib/public/contacts.php testsBart Visscher2013-02-061-2/+2
| | |/ / /
| * | | | Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-061-0/+8
| |\ \ \ \
| | * | | | we get best results regarding mime type detection if we use fileinfo - let's ...Thomas Mueller2013-02-041-0/+8
| * | | | | Added commentsSam Tuke2013-02-061-7/+15
| | |/ / / | |/| | |
| * | | | Merge pull request #1357 from owncloud/alternative-loging-masterThomas Müller2013-02-062-0/+11
| |\ \ \ \
| | * | | | add support for apps to register alternative login methodsThomas Mueller2013-01-292-0/+11
| * | | | | port already approved bugfix to master, https://github.com/owncloud/core/pull...Björn Schießle2013-02-061-1/+7
| * | | | | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-1/+19
| * | | | | Merge pull request #1476 from owncloud/disable-error-handler-while-running-ph...Thomas Müller2013-02-052-5/+7
| |\ \ \ \ \
| | * | | | | fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
| | * | | | | disable error handler while running phpunitThomas Mueller2013-02-051-3/+5
| * | | | | | offer change password only when the action is supported by the user backendArthur Schiwon2013-02-051-0/+18
| * | | | | | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-052-9/+21
| |\ \ \ \ \ \
| | * | | | | | Minor improvement to commentsSam Tuke2013-02-051-7/+6
| | * | | | | | Merge github.com:owncloud/coreSam Tuke2013-02-0524-151/+464
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge github.com:owncloud/coreSam Tuke2013-01-3171-3361/+4563
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/coreSam Tuke2013-01-2367-954/+1026
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryptionSam Tuke2013-01-141-0/+13
| * | | | | | | | | | spell checkThomas Mueller2013-02-051-1/+1
| * | | | | | | | | | pass the argument to the ctorThomas Mueller2013-02-051-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | setlocale test is pointless on WindowsThomas Mueller2013-02-051-0/+5
| * | | | | | | | | new function \OC_Util::runningOnWindows()Thomas Mueller2013-02-051-0/+7
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-052-2/+37
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #1449 from owncloud/fixing-namespace-local-storage-masterThomas Müller2013-02-041-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | fixing namespaceThomas Mueller2013-02-041-2/+2
| * | | | | | | | Merge pull request #1234 from owncloud/fix-issue-192Thomas Müller2013-02-041-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix sharing issue with collection and children mismatchesMichael Gapczynski2013-01-191-1/+2
| * | | | | | | | Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-...Thomas Müller2013-02-041-0/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | in case file based session handling in enabled - we need to make sure the con...Thomas Mueller2013-02-041-0/+11
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 01:48:39 +0000