Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 | Thomas Müller | 2015-09-18 | 1 | -4/+1 |
|\ | |||||
| * | Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core in... | Thomas Müller | 2015-09-18 | 1 | -4/+1 |
| |\ | |||||
| | * | use zipstreamer via composer | Nicolai Ehemann | 2015-09-14 | 1 | -3/+0 |
| | * | lib/private/files.php: adapted to minimally changed ZipStreamer API | Nicolai Ehemann | 2015-09-14 | 1 | -2/+2 |
* | | | Merge pull request #19098 from owncloud/db-lock-no-transaction | Thomas Müller | 2015-09-18 | 2 | -16/+35 |
|\ \ \ | |/ / |/| | | |||||
| * | | improve doc | Robin Appelman | 2015-09-17 | 1 | -1/+1 |
| * | | expire old lock rows | Robin Appelman | 2015-09-17 | 2 | -12/+46 |
| * | | Remove the need for the transaction in the database locking backend | Robin Appelman | 2015-09-17 | 1 | -16/+1 |
* | | | Prefer OCS Id from database | Lukas Reschke | 2015-09-18 | 1 | -0/+6 |
* | | | Add repair step for outdated OCS IDs | Lukas Reschke | 2015-09-18 | 2 | -2/+112 |
* | | | Merge pull request #18911 from owncloud/preview-show-cached-directly | Thomas Müller | 2015-09-18 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Show cached previews directly | Robin Appelman | 2015-09-08 | 1 | -0/+6 |
* | | | | Merge pull request #18840 from owncloud/fix-app-disable-route | Thomas Müller | 2015-09-18 | 1 | -23/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into fix-app-disable-route | Robin McCorkell | 2015-09-14 | 64 | -290/+2022 |
| |\ \ \ \ | |||||
| * | | | | | Rebuild app navigation in JS | Robin McCorkell | 2015-09-05 | 1 | -23/+0 |
* | | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiers | Thomas Müller | 2015-09-18 | 2 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow checking whether there are notifiers registered | Joas Schilling | 2015-09-17 | 2 | -0/+14 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19088 from owncloud/fix-availability-int | Thomas Müller | 2015-09-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Explicitly cast number to integer | Robin McCorkell | 2015-09-16 | 1 | -1/+1 |
* | | | | | | | Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenance | Thomas Müller | 2015-09-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make sure Maintenance is checked before auth and others | Joas Schilling | 2015-09-17 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Do not "use" Server | Joas Schilling | 2015-09-17 | 1 | -3/+2 |
* | | | | | | | Add a Sabre plugin that emits an event for apps | Joas Schilling | 2015-09-17 | 2 | -1/+64 |
|/ / / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-17 | 2 | -0/+2 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-17 | 2 | -0/+2 |
* | | | | | | Merge pull request #19086 from owncloud/restore-loadapp-autoload | Thomas Müller | 2015-09-16 | 2 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Restore loadApp() autoload registration | Robin McCorkell | 2015-09-16 | 2 | -3/+7 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #19022 from owncloud/console-loader-validroot | Thomas Müller | 2015-09-16 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Register valid root for all installed apps in console | Robin McCorkell | 2015-09-14 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #19077 from owncloud/check-maintenance-before-everything-e... | Thomas Müller | 2015-09-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Check for maintenance mode first so we send the 503 instead of login verific... | Joas Schilling | 2015-09-16 | 1 | -1/+1 |
* | | | | | | started to implement sharee list view. not completed yet, do not cry please. | Arthur Schiwon | 2015-09-16 | 1 | -0/+1 |
* | | | | | | split off expirationView | Arthur Schiwon | 2015-09-16 | 1 | -0/+1 |
* | | | | | | split off linkShareView | Arthur Schiwon | 2015-09-16 | 1 | -0/+1 |
* | | | | | | split ShareDialogResharerInfoView from base view | Arthur Schiwon | 2015-09-16 | 1 | -0/+1 |
* | | | | | | further work on reimplementing the dialog layout | Arthur Schiwon | 2015-09-16 | 1 | -0/+1 |
* | | | | | | refactor share dialog for multi-purpose use (dropdown, sidebar) and better ma... | Arthur Schiwon | 2015-09-16 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | occ script to disable encryption and to decrypt all files again | Bjoern Schiessle | 2015-09-15 | 2 | -0/+279 |
* | | | | | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic | Robin Appelman | 2015-09-15 | 2 | -70/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Use the view logic for getFolderContent for the node api | Robin Appelman | 2015-09-08 | 2 | -70/+11 |
* | | | | | | Merge pull request #17811 from owncloud/dav-lock-wide | Robin Appelman | 2015-09-15 | 6 | -62/+221 |
|\ \ \ \ \ \ | |||||
| * | | | | | | allow hook cancel | Robin Appelman | 2015-09-14 | 1 | -4/+9 |
| * | | | | | | use the correct path for cache updates when doing chunked assembly | Robin Appelman | 2015-09-14 | 1 | -7/+13 |
| * | | | | | | work directly on storages when doing a chunked upload assembly | Robin Appelman | 2015-09-14 | 2 | -57/+87 |
| * | | | | | | handle notfound exceptions in lock plugin | Robin Appelman | 2015-09-14 | 1 | -1/+5 |
| * | | | | | | wrap the entire put operation in a read lock | Robin Appelman | 2015-09-14 | 4 | -9/+98 |
| * | | | | | | expose locking api in sabre connector | Robin Appelman | 2015-09-14 | 1 | -1/+26 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all | Thomas Müller | 2015-09-15 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Function does return void | Lukas Reschke | 2015-09-15 | 1 | -1/+0 |
* | | | | | | | Merge pull request #19024 from owncloud/remove-get_temp_dir | Thomas Müller | 2015-09-15 | 2 | -9/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |