Morris Jobke
16a110e803
Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages
...
only query substorages to calculate the final mtime/size/etag when we need it
2016-11-14 11:39:02 +01:00
Joas Schilling
4c6e9dccfe
Merge pull request #2093 from nextcloud/fix-single-author-with-details
...
Fix single author with details
2016-11-14 09:50:57 +01:00
Nextcloud bot
8c1cd07de3
[tx-robot] updated from transifex
2016-11-14 01:07:06 +00:00
Roeland Jago Douma
965981486f
Fixes not allowed increasing of link share permissions
...
Fixes the following:
1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share
before this increased the permissions of the link share. Which should
not happen.
now: API reponds with an error that the permissions can't be increased.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 20:29:34 +01:00
Roeland Jago Douma
1056692fff
Fixes files_drop when avatars are disabled
...
Fixes : #2080
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:39:38 +01:00
Roeland Jago Douma
896be27e72
Fixes javascript tests for apps.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:28:32 +01:00
Nextcloud bot
150b86a7db
[tx-robot] updated from transifex
2016-11-13 01:07:09 +00:00
Nextcloud bot
1d65d31e0f
[tx-robot] updated from transifex
2016-11-12 01:07:11 +00:00
Morris Jobke
b8bd7621f3
Merge pull request #2094 from nextcloud/prevent-downgrade-attacks
...
Prevent downgrade attacks for apps
2016-11-11 22:46:49 +01:00
Lukas Reschke
9fff4b017d
Merge pull request #2088 from nextcloud/issue-2079-breadcrumb-padding
...
Restore the padding on the home icon
2016-11-11 18:55:48 +01:00
Lukas Reschke
7cb0df28e2
Prevent downgrade attacks for apps
...
We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature.
Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-11 18:53:26 +01:00
Joas Schilling
d61c8d74bb
Merge pull request #2082 from nextcloud/files_drop_sabre32
...
Fixes files_drop for sabre 3.2
2016-11-11 15:09:50 +01:00
Joas Schilling
ac2135560f
Fix single author with details
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 14:11:19 +01:00
Lukas Reschke
c53d7d59f7
Merge pull request #2087 from nextcloud/fix-more-vendor-naming
...
Replace more vendor naming
2016-11-11 12:35:10 +01:00
Joas Schilling
6c5e777bb9
Restore the padding on the home icon
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 09:04:30 +01:00
Joas Schilling
0f06034239
Replace more vendor naming
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 08:54:21 +01:00
Nextcloud bot
d969fc4ac6
[tx-robot] updated from transifex
2016-11-11 01:07:18 +00:00
Roeland Jago Douma
4b3b562c4f
Fixes files_drop for sabre 3.2
...
In the new sabre (3.2) the order of beforeMethod is switched. it used to
be that beforeMethod:METHOD was called after beforeMethod. But now it is
called before. Since we need the view this was broken.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-10 20:44:41 +01:00
Roeland Jago Douma
8cfdcfb40d
Merge pull request #2077 from nextcloud/allow-sharees-to-be-used-for-other-things
...
Only check the sharing backends for file/folder items
2016-11-10 20:16:35 +01:00
Joas Schilling
cbc6118f51
Only check the sharing backends for file/folder items
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-10 16:46:01 +01:00
Robin Appelman
ec2235e14b
fix tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 15:06:24 +01:00
Lukas Reschke
03dbeebc09
Merge pull request #2070 from nextcloud/fix_admin_translations
...
Get correct L10N for Settings Manager
2016-11-10 14:38:11 +01:00
Roeland Jago Douma
99ada40df4
Dispatch event on preview request
...
Fixes : #73
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-10 14:28:09 +01:00
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 13:59:22 +01:00
Roeland Jago Douma
931493b70e
Get correct L10N for Settings Manager
...
Fixes #2022
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-10 11:08:37 +01:00
Nextcloud bot
cfda17d8f3
[tx-robot] updated from transifex
2016-11-10 01:07:14 +00:00
Robin Appelman
d1291f7aee
remove unneeded getDirectoryContent when getting share types for a folder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-09 17:04:44 +01:00
Robin Appelman
74024c8f28
fix phpdoc
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-09 16:59:03 +01:00
Felix Heidecke
d4afccfeb0
Add submit button to validate the federated server,
...
fixes issue #25364
2016-11-09 14:27:05 +01:00
Morris Jobke
742c215946
Merge pull request #2058 from nextcloud/better-error-message-for-installation-error
...
Use a better error message and point the users to the support channels
2016-11-09 13:59:33 +01:00
Morris Jobke
eadccc239a
Merge pull request #2052 from nextcloud/ros-definitions-as-php-class
...
Use a php class for the definitions to avoid loading problems
2016-11-09 13:53:54 +01:00
Roeland Jago Douma
6a75296ccb
Merge pull request #1792 from nextcloud/bump_sabre
...
Bump sabre
2016-11-09 13:06:52 +01:00
Lukas Reschke
da55dd1d1f
Adjust third-party ref
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 11:53:36 +01:00
Lukas Reschke
58ca624b62
Add tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 11:52:40 +01:00
Lukas Reschke
72f45bbfc7
Merge pull request #2055 from nextcloud/js-codecov
...
Javascript code coverage
2016-11-09 10:54:57 +01:00
Lukas Reschke
9305094b8b
Add test and adjust PHP function arguments
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 10:49:57 +01:00
Joas Schilling
2f7e291101
Correctly catch the "soft errors" now
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 10:30:19 +01:00
Joas Schilling
92e5fb4053
Add tests for validity of the definitions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 10:08:29 +01:00
Joas Schilling
224dfaf1e6
Use a better error message and point the users to the support channels
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 09:10:32 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-09 08:52:07 +01:00
Roeland Jago Douma
b6562cb386
Generate js codecov coverage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-09 08:03:29 +01:00
Morris Jobke
05cf1dab4c
Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus
...
Make sure the database is not replaced while we make a backup of the …
2016-11-08 20:37:22 +01:00
Roeland Jago Douma
100cec59a7
Merge pull request #2037 from nextcloud/fix-preview-urls
...
Fix preview URLs
2016-11-08 18:29:57 +01:00
Björn Schießle
1ad3043e4f
Merge pull request #1998 from nextcloud/share-by-mail-notification
...
add share by mail activity
2016-11-08 17:37:46 +01:00
Joas Schilling
1c97d1b4ed
Fix some typos
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 17:05:29 +01:00
Joas Schilling
9296038d78
Fix preview URLs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 16:39:13 +01:00
Joas Schilling
4393e8003b
Make sure the database is not replaced while we make a backup of the service
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 16:32:41 +01:00
Morris Jobke
5f15020b9b
Merge pull request #1618 from nextcloud/show-folder-shared-status
...
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle
3bc643ec23
add new definition
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00