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

35596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
280d5325c7
Allow to register activity filters via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:40 +01:00
Morris Jobke
3c00ff2616 Merge pull request #2145 from nextcloud/docs_to_com 
docs are on nc.com
 2016-11-16 00:57:35 +01:00
Morris Jobke
cb97cf559b Merge pull request #2144 from nextcloud/fix_1303 
Do not cache version info in the session
 2016-11-15 23:13:53 +01:00
Roeland Jago Douma
28babd319b Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-again 
Add a magic wrapper to allow phpunit4 to run the code again
 2016-11-15 21:48:55 +01:00
Morris Jobke
51688986df Merge pull request #2139 from nextcloud/increase-version-to-ELF 
Use 11.0 instead 9.2
 2016-11-15 20:56:41 +01:00
Roeland Jago Douma
39f336035b
docs are on nc.com 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 19:17:42 +01:00
Roeland Jago Douma
d7665292a2 Merge pull request #2132 from nextcloud/federated-cloud-id 
specify Federated Cloud ID syntax
 2016-11-15 18:57:43 +01:00
Roeland Jago Douma
f07d75a4dd
@since 9.2.0 to @since 11.0.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:51:52 +01:00
Roeland Jago Douma
7a8bf6ea26
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:10:17 +01:00
Roeland Jago Douma
028c668293
Do not cache version info in the sessions 
If the session is cleared and closed for whatever reason the loadVersion
will write to the session anyways. This will lead to an exception.

This should fix #1303

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 17:53:12 +01:00
Lukas Reschke
b775d935f2
Endpoint is now 11.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:10:17 +01:00
Lukas Reschke
5fd428413b
Adjust previous fallbacks 
11.0 is 11 and not 9.2 anymore

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:07:58 +01:00
Joas Schilling
e76ef9aaa8
Add a magic wrapper from hell to allow phpunit4 to run the code again 
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-15 14:49:14 +01:00
Lukas Reschke
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
Jan-Christoph Borchardt
34e3acd897 specify Federated Cloud ID syntax 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-15 12:07:54 +01:00
Nextcloud bot
571c5aac5e
[tx-robot] updated from transifex 2016-11-15 01:07:05 +00:00
Morris Jobke
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
Roeland Jago Douma
d5afe2f3ca Merge pull request #2119 from nextcloud/downstream-26555 
disabling dropping on dragging objects temporarily
 2016-11-14 17:45:15 +01:00
Roeland Jago Douma
0e60b78378 Merge pull request #2117 from nextcloud/master-add-bruteforce-check-to-person-endpoint 
Add bruteforce checker to Person.php
 2016-11-14 17:18:31 +01:00
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
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
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