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

43452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Morris Jobke
bb82bfac6d
Merge pull request #9302 from nextcloud/update-phan-config 
Improve phan config
 2018-04-26 13:53:14 +02:00
Morris Jobke
b7e8ab97e7
Merge pull request #9308 from nextcloud/proper-ocp-constants 
Move log constants to ILogger
 2018-04-26 11:53:21 +02:00
Lukas Reschke
3aaa2307e9
Improve phan config 
* exclude routes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-26 11:51:05 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Nextcloud bot
12c5db9032
[tx-robot] updated from transifex 2018-04-26 00:12:10 +00:00
Morris Jobke
9c64a203e3
Merge pull request #9256 from nextcloud/fed-sharing-improvements 
improve error reporting and move format parameter to the options
 2018-04-25 15:49:30 +02:00
Bjoern Schiessle
0e0cfa0fa1
improve error reporting and move format parameter to the options 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-25 13:53:56 +02:00
Morris Jobke
5a4a0add3c
Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-api 
Migrate groups fetch to ocs api
 2018-04-25 13:45:35 +02:00
Morris Jobke
c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api 
Make ShareesAPIController strict
 2018-04-25 11:53:52 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
John Molakvoæ (skjnldsv)
8c845be11c
Workflow engine to ocs api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-25 07:47:16 +02:00
John Molakvoæ (skjnldsv)
d53193fd8e
Settings groups to ocs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-25 07:37:20 +02:00
Nextcloud bot
3e14f21ae7
[tx-robot] updated from transifex 2018-04-25 00:11:50 +00:00
Roeland Jago Douma
0dc019370d
Merge pull request #9248 from nextcloud/fix-files-ellipsis 
Fix ellipsis in filename column
 2018-04-24 20:36:41 +02:00
Roeland Jago Douma
d59791ab6f
Merge pull request #9292 from nextcloud/bugfix/9279/cast_db_backend_numeric 
Cast retrieved DB fields to string
 2018-04-24 20:04:38 +02:00
Roeland Jago Douma
81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma
074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Joas Schilling
09398397b3
Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_api 
Make the ShareAPIController strict
 2018-04-24 11:57:52 +02:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma
4d5a2cce8d
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 08:07:25 +02:00
Nextcloud bot
9339c7d20f
[tx-robot] updated from transifex 2018-04-24 00:11:53 +00:00
Roeland Jago Douma
3b3ff39431
Make ShareesAPIController strict 
Fixes #9279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 22:05:21 +02:00
Roeland Jago Douma
3b34a77c58
Make the ShareAPIController strict 
Fixes #9279

With types we can force php to not cast a full nummeric user to an int.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 20:31:57 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
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>
 2018-04-23 19:34:09 +02:00
Morris Jobke
83b0ce0955
Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccess 
Access needs UserManager, missed to add in #8833
 2018-04-23 17:49:07 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Morris Jobke
351255b216
Merge pull request #9276 from nextcloud/remove-unused-config-sample 
Remove unused config option
 2018-04-23 16:29:06 +02:00
Arthur Schiwon
ed5f53bd49
Access needs UserManager, missed to add in #8833 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-23 15:58:50 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
000f41ba01
Merge pull request #9275 from nextcloud/group_backends 
Make the group backends also possible using interfaces
 2018-04-23 15:37:34 +02:00
Morris Jobke
f2e18d496e
Remove unused config option 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 15:06:38 +02:00
Morris Jobke
6c6feeaa1e
Merge pull request #9269 from nextcloud/fix-DI-for-federeatedfilesharing-controller 
Fix DI for federated file sharing controller
 2018-04-23 15:06:11 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
093cd01ac2
Fix DI for federated file sharing controller 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 13:49:28 +02:00
Roeland Jago Douma
5fcd97dcb6
Bump autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 13:27:14 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Roeland Jago Douma
cf0501d632
Make the group backends also possible using interfaces 
Just like for the user backends the group backends should also be
properly done using interfaces.

This adds the interfaces and abstract class to get started

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 11:49:28 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
3ff041f86d
Merge pull request #9245 from nextcloud/fix-race-condition-when-preparing-upload-folder 
Fix race condition when preparing upload folder
 2018-04-23 08:50:16 +02:00
Roeland Jago Douma
a80fcf177b
Merge pull request #9255 from nextcloud/less-deprecated-calls 
Less deprecated calls to OCP\Util::writeLog
 2018-04-23 08:04:50 +02:00
Nextcloud bot
a74fbe78a7
[tx-robot] updated from transifex 2018-04-23 00:11:49 +00:00
Julius Härtl
cbdaa8b7ce
Add min-width to trick the table width calculation in safari 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-22 23:09:15 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Morris Jobke
dd34cb7540
Less deprecated calls to OCP\Util::writeLog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-22 20:41:49 +02:00
Daniel Calviño Sánchez
375a55b0ad
Fix race condition when preparing upload folder 
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

When all the active uploads were finished the list of known uploads was
cleared. However, an upload is not active until it actually starts
sending the data, so while waiting for the upload directory to be
created the upload is already in the list of known uploads yet not
active. Due to all this, if the active uploads finished while another
pending upload was waiting for the upload directory to be created that
pending upload would be removed from the list of known uploads too, and
once the directory was created and thus the chunks were sent a field of
a null upload object would be accessed thus causing a failure.

Instead of removing all the known uploads at once when the active
uploads finish now each upload is explicitly removed when it finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-04-22 20:38:11 +02:00
Nextcloud bot
74b5ab8d39
[tx-robot] updated from transifex 2018-04-22 00:11:51 +00:00