27c08167df
Don't even try to combine when the subject is different
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
6ddf43e27a
Provider for the files app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
ca2124a2a1
Register the settings of the files app via info.xml
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
0d940e581a
Move the favorites filter to IFilter
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
5d71896c8e
Move files filter to IFilter
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
bc1008ac38
Use 11.0 instead 9.2
...
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
571c5aac5e
[tx-robot] updated from transifex
2016-11-15 01:07:05 +00:00
e5b61527da
Merge pull request #2125 from nextcloud/downstream-26546
...
Transfer ownership now returns exit code on error
2016-11-15 00:08:09 +01:00
d5afe2f3ca
Merge pull request #2119 from nextcloud/downstream-26555
...
disabling dropping on dragging objects temporarily
2016-11-14 17:45:15 +01:00
42d754becd
Merge pull request #2084 from nextcloud/files_drop_avatars_disabled
...
Fixes files_drop when avatars are disabled
2016-11-14 17:14:09 +01:00
561a4fd989
Merge pull request #2115 from nextcloud/oc_26527
...
Skip broken shares when transferring ownership (#26527 )
2016-11-14 17:07:59 +01:00
c9b1108e8e
Merge pull request #2110 from nextcloud/oc_26526
...
First process group shares and then user shares
2016-11-14 17:06:28 +01:00
030118cd85
Merge pull request #2111 from nextcloud/oc_26549
...
Remove unused $view from FilesPlugin (#26549 )
2016-11-14 17:00:04 +01:00
1355f2039e
Transfer ownership now returns exit code on error ( #26546 )
2016-11-14 16:57:18 +01:00
04f8521b2c
Merge pull request #2112 from nextcloud/downstream-26206
...
Introduce an event for first time login based on the last login time …
2016-11-14 16:13:16 +01:00
03cbc7217c
disabling dropping on dragging objects temporarily
...
better solution
2016-11-14 15:35:25 +01:00
ff96fffe39
Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms
...
Fixes not allowed increasing of link share permissions
2016-11-14 15:21:08 +01:00
2b61b89391
Skip broken shares when transferring ownership ( #26527 )
2016-11-14 15:18:34 +01:00
506ccdbd8d
Introduce an event for first time login based on the last login time stamp
...
Use firstLogin event to trigger creation of default calendar and default address book
Delay login of admin user after setup so that firstLogin event can properly be processed for the admin
Fixing tests ...
Skeleton files are not copied over -> only 3 cache entries are remaining
Use updateLastLoginTimestamp to properly setup lastLogin value for a test user
2016-11-14 14:50:10 +01:00
17ea1bfb75
Remove unused $view from FilesPlugin ( #26549 )
...
The Sabre FilesPlugin never uses the view so remove it.
2016-11-14 14:45:33 +01:00
3fe7186e31
First process group shares and then user shares
...
This prevents a validation failure where the code checks whether a file
is already shared with another user, but the check disables itself when
the owner is the same. Processing the groups first prevents the check
to kick in too early when the group share still has the old owner while
we try transferring the user share.
2016-11-14 14:39:17 +01:00
cebb689925
Merge pull request #2106 from nextcloud/proper-empty-message-for-tags
...
Show specific empty message for tag input fields
2016-11-14 14:02:07 +01:00
fdd904414f
Merge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent
...
remove unneeded getDirectoryContent when getting share types for a folder
2016-11-14 11:49:24 +01:00
b35812fce6
Show specific empty message for tag input fields
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-14 11:46:21 +01:00
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
8c1cd07de3
[tx-robot] updated from transifex
2016-11-14 01:07:06 +00:00
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
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
150b86a7db
[tx-robot] updated from transifex
2016-11-13 01:07:09 +00:00
1d65d31e0f
[tx-robot] updated from transifex
2016-11-12 01:07:11 +00:00
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
d969fc4ac6
[tx-robot] updated from transifex
2016-11-11 01:07:18 +00:00
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
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
ec2235e14b
fix tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 15:06:24 +01:00
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
cfda17d8f3
[tx-robot] updated from transifex
2016-11-10 01:07:14 +00:00
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
6a75296ccb
Merge pull request #1792 from nextcloud/bump_sabre
...
Bump sabre
2016-11-09 13:06:52 +01:00
58ca624b62
Add tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-09 11:52:40 +01:00
1ad3043e4f
Merge pull request #1998 from nextcloud/share-by-mail-notification
...
add share by mail activity
2016-11-08 17:37:46 +01:00
1c97d1b4ed
Fix some typos
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-08 17:05:29 +01:00
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
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
087dab85b4
add activity for share by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
742ece8b7a
Fix styling of the breadcrumbs icon
...
* properly center share icon
* also apply styles for public share icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 11:14:36 +01:00
6c323496ab
fix share icon position and remove debug log
2016-11-08 10:36:39 +01:00
8d7df51a0e
[tx-robot] updated from transifex
2016-11-08 01:06:57 +00:00
0c1fd16d54
Add tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 21:02:23 +01:00
07d027feeb
Show link icon when shared by link
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 15:38:56 +01:00
Joas Schilling
Lukas Reschke
Nextcloud bot
Morris Jobke
Roeland Jago Douma
Vincent Petry
Michael Jobst
Thomas Müller
Roeland Jago Douma
Robin Appelman
Björn Schießle
Christoph Wurst