summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / /
* | | | | | Merge pull request #19022 from owncloud/console-loader-validrootThomas Müller2015-09-161-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Register valid root for all installed apps in consoleRobin McCorkell2015-09-141-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19077 from owncloud/check-maintenance-before-everything-e...Thomas Müller2015-09-161-1/+1
|\ \ \ \ \
| * | | | | Check for maintenance mode first so we send the 503 instead of login verific...Joas Schilling2015-09-161-1/+1
* | | | | | started to implement sharee list view. not completed yet, do not cry please.Arthur Schiwon2015-09-161-0/+1
* | | | | | split off expirationViewArthur Schiwon2015-09-161-0/+1
* | | | | | split off linkShareViewArthur Schiwon2015-09-161-0/+1
* | | | | | split ShareDialogResharerInfoView from base viewArthur Schiwon2015-09-161-0/+1
* | | | | | further work on reimplementing the dialog layoutArthur Schiwon2015-09-161-0/+1
* | | | | | refactor share dialog for multi-purpose use (dropdown, sidebar) and better ma...Arthur Schiwon2015-09-161-0/+2
|/ / / / /
* | | | | occ script to disable encryption and to decrypt all files againBjoern Schiessle2015-09-152-0/+279
* | | | | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logicRobin Appelman2015-09-152-70/+11
|\ \ \ \ \
| * | | | | Use the view logic for getFolderContent for the node apiRobin Appelman2015-09-082-70/+11
* | | | | | Merge pull request #17811 from owncloud/dav-lock-wideRobin Appelman2015-09-156-62/+221
|\ \ \ \ \ \
| * | | | | | allow hook cancelRobin Appelman2015-09-141-4/+9
| * | | | | | use the correct path for cache updates when doing chunked assemblyRobin Appelman2015-09-141-7/+13
| * | | | | | work directly on storages when doing a chunked upload assemblyRobin Appelman2015-09-142-57/+87
| * | | | | | handle notfound exceptions in lock pluginRobin Appelman2015-09-141-1/+5
| * | | | | | wrap the entire put operation in a read lockRobin Appelman2015-09-144-9/+98
| * | | | | | expose locking api in sabre connectorRobin Appelman2015-09-141-1/+26
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-allThomas Müller2015-09-151-1/+0
|\ \ \ \ \ \
| * | | | | | Function does return voidLukas Reschke2015-09-151-1/+0
* | | | | | | Merge pull request #19024 from owncloud/remove-get_temp_dirThomas Müller2015-09-152-9/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |