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

15878 commits

Author SHA1 Message Date
blizzz
d2b9b78c70
Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes 
Fix 2FA being enforced if only backup codes provider is active
 2018-08-10 11:06:40 +02:00
Roeland Jago Douma
a080c425cd
Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists 
use insertIfNotExists to store new mimetypes.
 2018-08-10 10:31:55 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active 
Fixes https://github.com/nextcloud/server/issues/10634.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:26:40 +02:00
Roeland Jago Douma
8c1e75e052
Do not use file as template parameter 
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-09 16:45:25 +02:00
Robin Appelman
5e9d6b1585
use insertIfNotExists to store new mimetypes. 
Also throw an error if we can't find the mimetype after insert

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-09 15:20:55 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:56:04 +02:00
Roeland Jago Douma
0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect 
Fix login redirection if only one 2FA provider is active
 2018-08-09 12:27:29 +02:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares 
Add support for room shares
 2018-08-09 10:44:11 +02:00
Christoph Wurst
201cbf2d33
Fix app code checker to ignore build directory 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 06:44:52 +02:00
Christoph Wurst
d8197f2b97
Rename providerset method to get primary providers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 20:28:21 +02:00
Björn Schießle
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix 
make file cache updates more robust
 2018-08-08 18:27:18 +02:00
Christoph Wurst
c6e47e8a51
Fix login redirection if only one 2FA provider is active 
Fixes https://github.com/nextcloud/server/issues/10500.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 15:25:59 +02:00
Daniel Calviño Sánchez
4b7fa4ac2e Add support for tokens in room shares 
Tokens will be used to give access to a share to guests in public rooms.
Although the token itself is created in the provider of room shares and
no changes are needed for that, due to the code structure it is
necessary to explicitly call the provider from the manager when getting
a room share by token.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez
d9458b303a Add support for room shares to the share manager 
Room shares are implemented in an external app (Nextcloud Talk), so in
order to keep the share manager as isolated as possible from room share
specifics all the validity checks are done in the provider of room
shares. However, due to the code structure it is necessary to explicitly
check for room shares in "generalCreateChecks" to prevent an exception
from being thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
4ee839d69c Add provider for room shares 
The RoomShareProvider is provided by the Talk app, so it is necessary to
check whether the app is available or not, and also whether the class
itself exists or not (just in case an older version of the app that did
not have support yet for room shares is being used).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
857bb45366 Add comment with IDs of internal share types 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
7292a986a0 Add type for room shares 
This type represents shares with a Nextcloud Talk conversation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Roeland Jago Douma
6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now 
Disable Oracle enforcement for now until the following issues are sol…
 2018-08-08 14:10:18 +02:00
Roeland Jago Douma
e7e30ac25f
Merge pull request #10586 from nextcloud/fix/noid/check_if_ua_is_set 
Check if HTTP_USER_AGENT is set before using it
 2018-08-08 13:59:31 +02:00
Roeland Jago Douma
c74a5250e5
Check if HTTP_USER_AGENT is set before using it 
Sentry reported some errors regarding this. Apparently not everybody
sets a user agent. If it is not set we assume this is not IE ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 13:32:03 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login 
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 06:57:52 +02:00
Nextcloud bot
1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
Roeland Jago Douma
70dab08dc8
Merge pull request #10569 from nextcloud/custom-avatar-userconfig 
get avatar custom status from user config
 2018-08-07 20:44:40 +02:00
Robin Appelman
ec8ab83ea5
get avatar custom status from user config 
this saves a cache operation because the user config is already cached

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-07 14:55:33 +02:00
John Molakvoæ (skjnldsv)
7e6fa90fa1
Icons cacher css url fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-07 10:18:46 +02:00
Nextcloud bot
35342b4b7d
[tx-robot] updated from transifex 2018-08-07 00:12:06 +00:00
Joas Schilling
f5c63d7a6e
Disable Oracle enforcement for now until the following issues are solved: 
* Only apps should be checked which say they support oracle
* Only check newly added items, to allow forward migration from an existing database structure

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-06 17:34:40 +02:00
Roeland Jago Douma
01bbd28530
Do not log to error loglevel when converting the error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-06 16:31:30 +02:00
Nextcloud bot
ca54166e35
[tx-robot] updated from transifex 2018-08-06 00:12:21 +00:00
Nextcloud bot
752ee28b1b
[tx-robot] updated from transifex 2018-08-04 00:12:38 +00:00
Nextcloud bot
bf88448f87
[tx-robot] updated from transifex 2018-08-03 00:12:22 +00:00
Roeland Jago Douma
01298cfa72
Merge pull request #10480 from nextcloud/bugfix/10420/settings 
Settings design polishing
 2018-08-02 20:23:21 +02:00
Joas Schilling
483ad01a09
There is no update available if the app didnt have a version (aka was not installed) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-02 14:27:16 +02:00
Nextcloud bot
62af5bf033
[tx-robot] updated from transifex 2018-08-02 00:12:37 +00:00
Roeland Jago Douma
fae7e516b5
Merge pull request #10481 from nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded 
Make the info available if the avatar was uploaded or generated
 2018-08-01 22:54:38 +02:00
Roeland Jago Douma
b5c5faebfc
Merge pull request #10484 from nextcloud/bugfix/noid/theming-cache-update 
Append cache bump parameter to scss files URL
 2018-08-01 13:28:53 +02:00
Julius Härtl
6ce474518c
Append cache bump parameter to scss files URL 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 12:42:49 +02:00
Joas Schilling
decd196162
Make the info available if the avatar was uploaded or generated 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-01 10:56:22 +02:00
Julius Härtl
03971d3695
Move encryption settings to security 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 09:41:09 +02:00
rakekniven
ed026ce4df
Fixed tiny grammar issue 
ID in uppercase.

Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de>
 2018-07-31 13:34:14 +02:00
Bjoern Schiessle
a9e22c5f1c
make file cache updates more robust 
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-31 12:24:38 +02:00
blizzz
c39bc1638b
Merge pull request #10444 from nextcloud/feature/noid/allow-to-filter-unread-count-by-verb 
Allow to filter the unread count by verb
 2018-07-31 12:05:52 +02:00
Christoph Wurst
fc149bab3c
Fix duplicate inserts in the 2fa provider registry DAO 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-07-31 06:43:44 +02:00
Nextcloud bot
5e43f3c6a6
[tx-robot] updated from transifex 2018-07-31 00:12:12 +00:00
Roeland Jago Douma
1f610b4d1f
Merge pull request #10451 from nextcloud/fix/9693/move_logcondition_up 
Fetch logcondition earlier
 2018-07-30 22:07:06 +02:00
Roeland Jago Douma
f208ce920d
Merge pull request #10221 from nextcloud/bugfix/noid/prevent-too-long-identifiers 
Prevent too long identifier names
 2018-07-30 21:00:53 +02:00
Roeland Jago Douma
8cdd134e7e
Fetch logcondition earlier 
Fixes #9693

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-30 14:57:19 +02:00
Joas Schilling
66945f9574
Allow to filter the unread count by verb 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-30 09:41:51 +02:00
Nextcloud bot
0c7a17795b
[tx-robot] updated from transifex 2018-07-28 00:12:07 +00:00
Joas Schilling
ef5074adaa
Fix primary key handling on postgres 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-27 14:45:22 +02:00