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

8627 commits

Author SHA1 Message Date
Morris Jobke
9444a3fad1
Merge pull request #9632 from nextcloud/enhancement/stateful-2fa-providers 
Stateful 2fa providers
 2018-06-25 15:49:58 +02:00
Robin Appelman
587d7cc7d2
Merge pull request #9526 from Blaok/files-scan-shallow 
allow shallow (non-recursive) scan when scanning file storage
 2018-06-25 13:01:22 +02:00
Christoph Wurst
7be465febe
Make new classes strict and fix license header 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-25 07:38:52 +02:00
Roeland Jago Douma
082646f7e5
Merge pull request #9955 from nextcloud/bug/noid/onedrive_propfind 
Request a valid property for DAV opendir
 2018-06-22 15:02:20 +02:00
Roeland Jago Douma
ed29984501
Merge pull request #9868 from nextcloud/user-backend-table 
make table name configurable for db user backend
 2018-06-21 19:23:23 +02:00
Roeland Jago Douma
54c4d95a11
Request a valid property for DAV opendir 
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-21 19:01:27 +02:00
Roeland Jago Douma
8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware 
Public share middleware & controller
 2018-06-21 10:09:20 +02:00
John Molakvoæ (skjnldsv)
71ce8f3107
Split css variables and fix url variables 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:17:06 +02:00
Morris Jobke
50df29ded0
Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finish 
Wait for cron to finish before running upgrade command
 2018-06-20 14:14:07 +02:00
Roeland Jago Douma
e7338173e8
Add PublicShareMiddlewareTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
20e514690c
Don't allow public share pages if link sharing is disabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
366981fba6
Move public preview endpoint over 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
f36ef8ca80
Add the new PublicShareController and PublicShareMiddleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:35 +02:00
Christoph Wurst
13d93f5b25
Make 2FA providers stateful 
This adds persistence to the Nextcloud server 2FA logic so that the server
knows which 2FA providers are enabled for a specific user at any time, even
when the provider is not available.

The `IStatefulProvider` interface was added as tagging interface for providers
that are compatible with this new API.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-20 08:30:26 +02:00
John Molakvoæ (skjnldsv)
21441fad9b
Added new search standard 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-19 23:53:20 +02:00
John Molakvoæ (skjnldsv)
e5f08620d4
Better design for core search, fixes and style to scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-19 23:53:19 +02:00
Robin Appelman
8a1cbbd90e
Don't pretend we can add/remove users to/from groups when we can't 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-19 16:23:02 +02:00
Morris Jobke
18e9631810
Wait for cron to finish before running upgrade command 
* fixes #9562

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-19 14:22:45 +02:00
Robin Appelman
3392302d22
make table name configurable for db user backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-19 14:14:44 +02:00
Morris Jobke
8646f01320
Merge pull request #9881 from nextcloud/user-db-backend-querybuilder 
use query builder in all places in the db user backend
 2018-06-19 14:12:22 +02:00
Roeland Jago Douma
82959ca93e
Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-19 07:46:43 +02:00
Roeland Jago Douma
970dea9264
Add getProvider helper function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
df34571d1d
Use constant for token version 
And don't set the version in the constructor. That would possible cause
to many updates.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
9e7a95fe58
Add more tests 
* Add a lot of tests
* Fixes related to those tests
* Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
1999f7ce7b
Generate the new publicKey tokens by default! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
f168ecfa7a
Actually convert the token 
* When getting the token
* When rotating the token

* Also store the encrypted password as base64 to avoid weird binary
stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
d03d16a936
Add publickey provider to manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
4bbc21cb21
SetPassword on PublicKeyTokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:55 +02:00
Roeland Jago Douma
4c0d710479
Just pass uid to the Token stuff 
We don't have user objects in the code everywhere

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
1f17010e0b
Add first tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
02e0af1287
Initial PKT implementation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:54 +02:00
Roeland Jago Douma
3dd5f3d5f6
Abstract the Provider via a manager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-18 22:11:53 +02:00
Julius Härtl
6b6c43bf79
Merge pull request #9884 from nextcloud/groups-search-use-proper-keys 
Add search to users details groups
 2018-06-18 16:43:06 +02:00
blizzz
60adc92eb5
Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_id_regenerate 
Update the token on session regeneration
 2018-06-18 13:25:18 +02:00
John Molakvoæ (skjnldsv)
cc2d58a850
Keep userids as keys on group search 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 22:54:28 +02:00
Morris Jobke
8f6acbff62
Merge pull request #9258 from nextcloud/theming-logo-png 
Convert theming app logo to PNG to show it properly in emails
 2018-06-15 17:02:14 +02:00
Morris Jobke
d82ef72161
Merge pull request #9197 from nextcloud/fix-avatar-center 
Fix avatar generator centering
 2018-06-15 16:16:13 +02:00
Robin Appelman
4187d2cdb3
use query builder in all places in the db user backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-15 14:16:10 +02:00
Morris Jobke
a0496b2a78
Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelay 
Fix #9864: Decrease $maxDelay in Throttler.php
 2018-06-15 07:34:28 +02:00
Mark Berezovsky
ad66c6bf08 Fix #9864: Decrease $maxDelay in Throttler.php 
Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
 2018-06-15 04:58:08 +03:00
Daniel Calviño Sánchez
00c3a7eb4c Fix HTTP client given options being overriden by default options 
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-14 21:36:04 +02:00
Julius Härtl
ceee91d9d4
Add info message if an exception occurs during the svg to png conversion 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-14 17:36:02 +02:00
Robin Appelman
3047ef31bd
Add count to function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-14 14:32:22 +02:00
Roeland Jago Douma
8c47a632e0
Allow updating the token on session regeneration 
Sometimes when we force a session regeneration we want to update the
current token for this session.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 08:09:36 +02:00
Roeland Jago Douma
699049be1b
Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-backup-dirs 
Background job to clean up old backups of the updater
 2018-06-13 22:16:24 +02:00
John Molakvoæ (skjnldsv)
16ec9d9670
Removed old route, fix tests and fix var type 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
156da29cea
Avatar imagick bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
4432cfd445
Embedded font 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
ed4309ce41
Unify colour algorithm output 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
eea6f74ca4
Controller tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00