wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35729 commits 157 branches 562 tags 714 MiB
Commit graph

35729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
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
Roeland Jago Douma
561a4fd989 Merge pull request #2115 from nextcloud/oc_26527 
Skip broken shares when transferring ownership (#26527)
 2016-11-14 17:07:59 +01:00
Roeland Jago Douma
b7e13b43fb Merge pull request #2114 from nextcloud/downstream-26498 
make object prefix configurable
 2016-11-14 17:07:00 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
030118cd85 Merge pull request #2111 from nextcloud/oc_26549 
Remove unused $view from FilesPlugin (#26549)
 2016-11-14 17:00:04 +01:00
Vincent Petry
1355f2039e
Transfer ownership now returns exit code on error (#26546) 2016-11-14 16:57:18 +01:00
Jörn Friedrich Dreyer
9802c5cdd8
Cache js, css and woff files for a week (#26591) 
increases the cache duration for css and js files from 2 hours to half a year. Should they change the versionhash changes as well and a new file is fetched. Half a year should be long enough for oc updates.

Also allows caching woff files for 7 days. Currently, there is no versionhash available, but pressing F5 will also refresh the woff files.
 2016-11-14 16:52:28 +01:00
Roeland Jago Douma
1e3d806416 Merge pull request #2113 from nextcloud/downstream-26299 
We need to ensure that the app holding the objectstore implementation…
 2016-11-14 16:44:16 +01:00
Vincent Petry
1141fcc9ac
Skip hidden files when counting visible files in list (#26522) 
The file list UI logic that renders the next page doesn't properly
exclude hidden files when not shown. This fix makes sure that only rows
that are actually visible are counted when rendering a page, this makes
sure that the page will always have enough elements displayed.
 2016-11-14 16:21:57 +01:00
Roeland Jago Douma
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
Michael Jobst
03cbc7217c
disabling dropping on dragging objects temporarily 
better solution
 2016-11-14 15:35:25 +01:00
Lukas Reschke
0d89c14911
Add bruteforce checker to Person.php 
Also check for attempts on this endpoint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-14 15:26:23 +01:00
Roeland Jago Douma
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
Vincent Petry
2b61b89391
Skip broken shares when transferring ownership (#26527) 2016-11-14 15:18:34 +01:00
Jörn Friedrich Dreyer
4a9361905d
make object prefix configurable 2016-11-14 15:10:56 +01:00
Thomas Müller
895b638a2c
We need to ensure that the app holding the objectstore implementation is loaded - fixes owncloud/objectstore#38 2016-11-14 15:00:45 +01:00
Thomas Müller
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
Vincent Petry
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
Vincent Petry
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
Morris Jobke
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
Roeland Jago Douma
b27b690fa9
Add intergration test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-14 13:54:25 +01:00
Morris Jobke
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
Morris Jobke
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
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
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