aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9378 from nextcloud/backport/9364/swift-v3stable-swift-v3Roeland Jago Douma2018-05-031-0/+3
|\ | | | | [swiftv3] Log mount and storage issues in getFileInfo
| * Log mount and storage issues in getFileInfoRobin Appelman2018-05-031-0/+3
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #9323 from nextcloud/backport/9322/swift-v3Morris Jobke2018-04-261-3/+3
|\ | | | | [swift] Better swift V3 token handling
| * generateTokenFromCache is only valid for V3Roeland Jago Douma2018-04-261-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * json_decode an associative array for the swift cached tokenRoeland Jago Douma2018-04-261-1/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9287 from nextcloud/backport/9280/stable-swift-v3Roeland Jago Douma2018-04-242-1/+13
|\ | | | | [swift] Swift v3 requires setting a scope
| * Swift v3 requires setting a scopeRoeland Jago Douma2018-04-242-1/+13
|/ | | | | | | | | Unscoped auth is not guaranteed to return a catalog. So require the scope to be set properly. See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9149 from nextcloud/swift-updatesMorris Jobke2018-04-112-1/+1
|\ | | | | [swift] Fix searchdav
| * Update 3rdpartyRoeland Jago Douma2018-04-111-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make displayname selectableRoeland Jago Douma2018-04-111-1/+1
|/ | | | It is dav. so if it is not properly set we just return a 404 anyway.
* Bump openstack to 3.0.5Roeland Jago Douma2018-03-221-0/+0
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* verify cached swift tokenRobin Appelman2018-03-223-13/+29
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Fix bucket and container usageRoeland Jago Douma2018-03-223-4/+8
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Properly cache swift v3 tokenRoeland Jago Douma2018-03-221-1/+6
| | | | | | | The V3 token has an export function. Without this the token is effectively never cached. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* disable part files for object storesRobin Appelman2018-03-221-0/+4
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* don't read existing file when overwriting using object storeRobin Appelman2018-03-221-7/+13
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #8359 from nextcloud/swift-v3Morris Jobke2018-02-2610-28/+166
|\ | | | | Support swift v3 authentication
| * adjust external storage config format to the one used in primary storageRobin Appelman2018-02-262-5/+9
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Kill objectstore CI if we can't create a fileRoeland Jago Douma2018-02-261-0/+7
| | | | | | | | | | | | | | This is more of a hack. But one of the nodes won't properly run this. No sense in waiting 60 minutes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Some swift v3 example configRoeland Jago Douma2018-02-261-0/+22
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Use username + pass in configRoeland Jago Douma2018-02-261-2/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * User proper username + passRoeland Jago Douma2018-02-261-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Other configRoeland Jago Douma2018-02-261-14/+32
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add v3.0 auth runRoeland Jago Douma2018-02-262-1/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * add support for v3 swift authRobin Appelman2018-02-266-15/+94
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_rootMorris Jobke2018-02-262-5/+34
|\ \ | | | | | | theming: handle not being in the serverroot
| * | Remove null checkKyle Fazzari2018-02-251-7/+2
| | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | Add mock to setupKyle Fazzari2018-02-241-16/+4
| | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | theming: handle not being in the serverrootKyle Fazzari2018-02-202-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the theming app assumes it's in the serverroot. However, with Nextcloud's flexibility regarding configurable app paths, this is not a safe assumption to make. If it happens to be an incorrect assumption, the theming app fails to work. Instead of relying on the serverroot, just use the path from the AppManager and utilize relative paths for assets from there. Fix #8462 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | | Merge pull request #8541 from nextcloud/translate-permission-error-pageMorris Jobke2018-02-266-16/+34
|\ \ \ | | | | | | | | Provide translated error message for permission error
| * | | Provide translated error message for permission errorMorris Jobke2018-02-266-16/+34
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6481 from nextcloud/occ-app-install-enableMorris Jobke2018-02-261-0/+13
|\ \ \ \ | | | | | | | | | | add enable flag to occ app:install
| * | | | enable app by default after occ app:installsualko2018-02-261-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Klaus Herberth <klaus@jsxc.org>
| * | | | add enable flag to occ app:install (fix #5834)sualko2018-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Klaus Herberth <klaus@jsxc.org>
* | | | | Merge pull request #8455 from nextcloud/proper_mount_type_externalMorris Jobke2018-02-262-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Properly set the mount type for external storages
| * | | | | Properly set the mount type for external storagesRoeland Jago Douma2018-02-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #8355 from nextcloud/fix-comments-num-indexMorris Jobke2018-02-265-12/+202
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix comments (and systemtags) when involving users with numerical ids
| * | | | | | fix systemtags event with numeric user idsArthur Schiwon2018-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | tests for systemtags related to numeric user idsArthur Schiwon2018-02-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fix creating comments when file is accessible to users with numeric idsArthur Schiwon2018-02-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | test creating comments with numeric user idsArthur Schiwon2018-02-142-6/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #8412 from agates/masterMorris Jobke2018-02-261-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add mtime and storage_mtime to db:convert-filecache-bigint
| * | | | | | Add mtime and storage_mtime to db:convert-filecache-bigintAlecks Gates2018-02-171-1/+1
| | | | | | |
* | | | | | | Merge pull request #8390 from dasisdormax/masterMorris Jobke2018-02-263-18/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add indeterminate state to share permission checkbox
| * | | | | | | Update tests for indeterminate state, fix slashes not being escapedMaximilian Wende2018-02-162-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maximilian Wende <dasisdormax@mailbox.org>
| * | | | | | | Fix indeterminate checkbox state not showing correctlyMaximilian Wende2018-02-151-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the checkbox is updated to the correct state while a permission change is in progress. should fix issue #8371 Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
| * | | | | | | Add indeterminate state to 'can edit' share permission checkbox, see #8371Maximilian Wende2018-02-152-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
* | | | | | | | Merge pull request #8203 from Cybso/split-move-copyMorris Jobke2018-02-265-11/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Split move and copy operations
| * | | | | | | | Split move and copy operationsRoland Tapken2018-02-155-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new 'Move and copy' operation from #6040 requires UPDATE permissions on the selected files. However, READ would be sufficient to create a copy of a file (if not viewed as a public share). For this reason this patch: - changes the permission of the 'MoveCopy' action to PERMISSION_READ - changes the label of the action depending on the permissions - changes the available buttons in the Move/Copy dialog depending on the permissions. The same changes are done to the filelist view for bulk actions. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* | | | | | | | | Merge pull request #8511 from nextcloud/ext-storage-error-warning-fixMorris Jobke2018-02-263-2/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Ext storage error warning fix