summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-235-6/+6
|\
| * Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI...Martin2015-09-225-6/+6
* | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-231-42/+55
|\ \
| * | catch excexptions during the copy operation and make sure that we free the lo...Bjoern Schiessle2015-09-221-42/+55
* | | Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_fil...Thomas Müller2015-09-231-12/+24
|\ \ \ | |_|/ |/| |
| * | reduce amount of db calls needed for file-locksIndividual IT Services2015-09-221-12/+24
| |/
* | Move mimetype files into /resources/config/Lukas Reschke2015-09-222-14/+25
* | Move certificate bundle into resources/config/Lukas Reschke2015-09-223-9/+2
* | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \
| * | Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| |/
* / Move dummy backend to Tests namespaceLukas Reschke2015-09-222-169/+4
|/
* Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-212-4/+4
|\
| * Minor text typosPhil Davis2015-09-212-4/+4
* | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-4/+6
|\ \
| * | Repeated calls to loginWithApache() should not not try to set user informatio...Thomas Müller2015-09-211-4/+6
* | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-211-0/+5
|\ \ \
| * | | improved error message if user doesn't existsBjoern Schiessle2015-09-211-0/+5
| |/ /
* | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-2/+7
|\ \ \
| * | | dont download the existing file for webdav if we're going to overwrite itRobin Appelman2015-09-211-2/+7
| |/ /
* | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-211-2/+5
|\ \ \ | |/ / |/| |
| * | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
* | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinksharesThomas Müller2015-09-211-0/+5
|\ \ \ | |_|/ |/| |
| * | Discard expiration date from result for non-link sharesVincent Petry2015-09-171-0/+5
| |/
* | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-181-4/+1
|\ \
| * \ Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core in...Thomas Müller2015-09-181-4/+1
| |\ \
| | * | use zipstreamer via composerNicolai Ehemann2015-09-141-3/+0
| | * | lib/private/files.php: adapted to minimally changed ZipStreamer APINicolai Ehemann2015-09-141-2/+2
* | | | Merge pull request #19098 from owncloud/db-lock-no-transactionThomas Müller2015-09-182-16/+35
|\ \ \ \ | |/ / / |/| | |
| * | | improve docRobin Appelman2015-09-171-1/+1
| * | | expire old lock rowsRobin Appelman2015-09-172-12/+46
| * | | Remove the need for the transaction in the database locking backendRobin Appelman2015-09-171-16/+1
| | |/ | |/|
* | | Prefer OCS Id from databaseLukas Reschke2015-09-181-0/+6
* | | Add repair step for outdated OCS IDsLukas Reschke2015-09-182-2/+112
* | | Merge pull request #18911 from owncloud/preview-show-cached-directlyThomas Müller2015-09-181-0/+6
|\ \ \
| * | | Show cached previews directlyRobin Appelman2015-09-081-0/+6
* | | | Merge pull request #18840 from owncloud/fix-app-disable-routeThomas Müller2015-09-181-23/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix-app-disable-routeRobin McCorkell2015-09-1464-290/+2022
| |\ \ \ \
| * | | | | Rebuild app navigation in JSRobin McCorkell2015-09-051-23/+0
* | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiersThomas Müller2015-09-182-0/+14
|\ \ \ \ \ \
| * | | | | | Allow checking whether there are notifiers registeredJoas Schilling2015-09-172-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19088 from owncloud/fix-availability-intThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \
| * | | | | | Explicitly cast number to integerRobin McCorkell2015-09-161-1/+1
* | | | | | | Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenanceThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make sure Maintenance is checked before auth and othersJoas Schilling2015-09-171-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Do not "use" ServerJoas Schilling2015-09-171-3/+2
* | | | | | | Add a Sabre plugin that emits an event for appsJoas Schilling2015-09-172-1/+64
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-172-0/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-172-0/+2
* | | | | | Merge pull request #19086 from owncloud/restore-loadapp-autoloadThomas Müller2015-09-162-3/+7
|\ \ \ \ \ \
| * | | | | | Restore loadApp() autoload registrationRobin McCorkell2015-09-162-3/+7
| |/ / / / /