4abae96298
Catch more occurences where ExpiredTokenException can be thrown
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-25 10:59:07 +02:00
49e992c1da
Expired PK tokens should not fall back to legacy tokens
...
Fixes #11919
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-25 10:59:07 +02:00
e5814bd948
Merge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14
...
[stable14] always query the lookup server in a global scale setup
2018-10-24 14:44:05 +02:00
7894c40f54
[tx-robot] updated from transifex
2018-10-23 14:54:39 +00:00
d9c080120e
Merge pull request #11976 from nextcloud/bugfix-stable14/9326/make_sure_usermanager_getByEmail_only_returns_IUser
...
[stable14] filter null values for UserManager::getByEmail
2018-10-23 15:15:23 +02:00
9ea758758e
Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
...
Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-23 10:22:47 +02:00
554c80b403
filter null values for UserManager::getByEmail
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-22 15:51:57 +02:00
61fe59795f
Merge pull request #11929 from nextcloud/backport/11870/proper-column-name-escaping
...
[stable14] Properly escape column name in "createFunction" call
2018-10-19 15:48:41 +02:00
2885db8e9b
Merge pull request #11772 from nextcloud/stable14-pretty-urls-dont-work
...
[14] Allow overwrite.cli.url without trailing slash
2018-10-19 12:16:22 +02:00
f6cdab6b11
Properly escape column name in "createFunction" call
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 12:12:52 +02:00
e7d20cdb5e
Allow php7.3
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-12 12:21:19 +02:00
4f983b7565
Backport https://github.com/nextcloud/server/pull/11446
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-11 15:14:33 +02:00
18c35e6060
Normalize getUnjailedPath
...
Fixes #11637
If we do not normalize the unjailed path we might end up with a path
like files/user/folder/. which can break on objectstores
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-11 14:49:32 +02:00
84e39b522c
some small fixes and improvements
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-10 16:08:49 +02:00
cef454c280
[tx-robot] updated from transifex
2018-10-10 00:13:24 +00:00
7e608df598
adjust tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-09 18:32:09 +02:00
52c52f555d
always query the lookup server in a global scale setup and have a nicer label
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-09 17:48:15 +02:00
f7e9533d1e
Allow the creationg of previews of files stored in appdata
...
To allow us to create previews of files stored in appdata we need to
construct the view differently.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-09 11:49:02 +02:00
1302b6f267
[tx-robot] updated from transifex
2018-10-03 16:58:57 +00:00
5e143f1f52
Just update password hash without validating
...
Fixes #11097
If your password hash changed (becuse your are on 7.2 and we moved to
ARGON2). Then we shold not 'set a new password' but just update the
hash. As else we invoke the password policy again which might lock out
users.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-03 12:09:43 +02:00
e46092d7f6
only catch QueryException when trying to build class
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-01 10:44:58 +02:00
28d60274ce
add back-end as parameter to the pre-login hook
...
This is needed for the Global Scale setup to allow the master
node to perform different operations during login, depending
on the user management. Because in case of SAML, the authentication
at the idp happens at the master node.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-09-25 14:17:10 +02:00
ea73f30d77
Merge pull request #11302 from nextcloud/backport/11297/this-database-dude
...
[stable14] Fix expiration code of tokens
2018-09-20 10:52:15 +02:00
a0f2bd8d28
Merge pull request #11294 from nextcloud/stable14-locale-template-fix
...
[stable14] Use user locale as default in the template
2018-09-20 10:37:00 +02:00
2153bcfea8
Merge pull request #11293 from nextcloud/backport/11292/do-not-apcu-cache-the-autoloader
...
[stable14] Revert "Use APCu caching of composer"
2018-09-20 10:08:02 +02:00
6718bfb83d
Also adjust the expiration of PublicKeyTokenProvider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 10:00:08 +02:00
3a179b2519
Copy the expiration from 480864b3e3 to getTokenById
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 09:59:53 +02:00
fcda1f7124
Fix since tag
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:26 +02:00
efbd98183d
Fallback to $lang if no $locale match
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:22 +02:00
d69ddd94de
Typehint
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:19 +02:00
ccb8838854
Since requirement
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:14 +02:00
19350c4b95
Fix public l10n
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:10 +02:00
258330d64d
Use user locale as default in the template
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:06 +02:00
86a2d1fecd
Revert "Use APCu caching of composer"
...
This reverts commit 948ab8a4d0https://github.com/nextcloud/server/issues/11290
2018-09-19 15:56:30 +02:00
e2991d55c7
Fix icons cacher regex for compressed output
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 15:47:33 +02:00
fbc1f5cd38
replace setcookie value with '' instead of null.
...
The php documentation states that an empty string should be used for a cookie when it has no real value.
null leads to the following error: expects parameter 2 to be string, null given
Signed-off-by: Martin Böh <mart.b@outlook.de>
2018-09-19 11:47:40 +02:00
2518cdd2d9
Fix exception class
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-12 11:57:43 +02:00
c83ac2472d
Expire tokens hardening
...
Just to be sure that the field is also not 0
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-07 10:02:56 +02:00
fb98db7da7
Fix handlng of concurrent inserts of the 2FA provider registry DAO
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-31 11:46:27 +02:00
625c81bd11
Merge pull request #10906 from nextcloud/request-params-array
...
ensure we always return an array from `Request::getParams`
2018-08-30 21:07:49 +02:00
e8938df198
Move SCSS variable fetching before the variables.scss to properly calculate color values
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-29 16:47:39 +02:00
c0a283fefb
ensure we always return an array from `Request::getParams`
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-28 18:11:42 +02:00
c6b1c21b8f
Merge pull request #10854 from nextcloud/fix-10764
...
Allow same section class for multiple section types (fix #10764 )
2018-08-28 17:50:20 +02:00
61370549f3
Allow same section class for multiple section types ( fix #10764 )
...
Signed-off-by: Klaus Herberth <klaus@jsxc.org>
2018-08-25 17:32:19 +02:00
d644cafae7
[tx-robot] updated from transifex
2018-08-25 00:12:33 +00:00
ac932309a2
Merge pull request #10827 from steiny2k/HEICHEIF
...
HEIC previews as JPG rather than PNGs to save space.
2018-08-24 21:49:33 +02:00
4758942121
Fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-24 21:27:21 +02:00
48f5cbe439
Merge pull request #10841 from nextcloud/load-app-catch-exceptions
...
also catch exceptions when loading apps
2018-08-24 19:29:47 +02:00
be9ab8b879
also catch exceptions when loading apps
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-24 17:16:54 +02:00
e8817ed3ea
Merge pull request #10724 from nextcloud/large-share-count-performance
...
Improve performance when dealing with large numbers of shares
2018-08-24 17:10:17 +02:00
a0b84bc0fc
Merge pull request #10334 from denismosolov/group-add
...
Add options to create/remove groups via occ
2018-08-24 13:46:16 +03:00
ed15a6f2a2
HEIC previews as JPG rather than PNGs to save space.
...
Signed-off-by: Sebastian Steinmetz <me@sebastiansteinmetz.ch>
2018-08-24 08:58:28 +02:00
ad5093b7a6
Show link to simple sign up page
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-23 14:41:19 +02:00
bb2336f389
Merge pull request #10526 from steiny2k/HEICHEIF
...
Support HEIC for previews
2018-08-22 13:41:19 +02:00
e27817aeda
Merge pull request #10789 from nextcloud/fix/2fa-app-multiple-providers
...
Fix loading providers of 2FA app with more than one provider
2018-08-22 10:50:22 +02:00
65410ab1cb
[tx-robot] updated from transifex
2018-08-22 00:12:11 +00:00
024a70a188
Fix loading providers of 2FA app with more than one provider
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-21 22:53:38 +02:00
383699398f
Merge pull request #10539 from nextcloud/feature-8642-memory-check
...
Adds a setup and cli check for the recommended memory limit
2018-08-21 09:51:33 +02:00
20839a422b
Refactor some code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-21 09:51:05 +02:00
6ad0ba0448
Merge pull request #10710 from nextcloud/fix/iusermanager-createuser-typo
...
Fix typo in IUserManager::createUser doc
2018-08-21 08:13:54 +02:00
be3438ca97
[tx-robot] updated from transifex
2018-08-21 00:12:16 +00:00
2bab916c53
Adds license to files. Updates the branch.
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-20 20:46:23 +02:00
ce1e213760
Bump autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-20 15:25:07 +02:00
c164409ee7
Adds a memory limit warning for console commands if the limit is below the recommended value
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-20 15:24:10 +02:00
c2fced4463
Adds a setup check for the memory limit
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-20 15:24:10 +02:00
4b92a0986c
Merge pull request #10712 from nextcloud/fix/noid/check_if_provider_is_available_before_use
...
Check if a preview provider is available before using it
2018-08-20 13:21:16 +02:00
5b103744c8
Check if a preview provider is available before using it
...
Else if a preview provider is registerd but not available (for example
missing support in some external lib). It will do 💥 . This way the
providers can at least do the sanity checks required.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-17 20:51:35 +02:00
5a996b5f87
Address comments from @rullzer:
...
- implement isAvailable
- run tests only if ImageMagick with HEIC support is available in the
environment
Signed-off-by: Sebastian Steinmetz <me@sebastiansteinmetz.ch>
2018-08-17 18:37:23 +02:00
325e8bea16
add deck and mail to the groupware bundle, remove talk
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-17 13:27:48 +02:00
4c0cbdff36
tokens can't be valid local user names
...
this saves searching for shares on non-public link dav requests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 21:27:57 +02:00
c300516e51
more efficient way to detect added and removed mounts
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 19:56:49 +02:00
f7ae235372
cache OC\Files\Mount\Manager::findIn results
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 19:02:00 +02:00
f8116ad4cf
use more efficient method to find mountpoint for path
...
this changes the complexity from the number of mounts to the depth of
the path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 18:55:52 +02:00
95981810c0
remove double loop for detecting changed mounts
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 18:24:56 +02:00
0b18e2c75d
Add an options to create and remove groups via occ
...
Signed-off-by: Denis Mosolov <denismosolov@gmail.com>
2018-08-16 10:31:20 +03:00
60625de9e4
Fix typo in IUserManager::createUser doc
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-16 08:37:27 +02:00
ac4735a4f2
Update the scope of the lockdownmanager
...
We have the token anyway. So better the scope as well.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-14 09:45:52 +02:00
8601bbc35d
Merge pull request #10621 from nextcloud/feature/noid/add-tos-to-enterprise-bundle
...
Add the ToS app to the enterprise bundle
2018-08-13 15:47:15 +02:00
05b249844e
Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcache
...
Drop support for xcache
2018-08-13 13:55:26 +02:00
ccb040ee01
[tx-robot] updated from transifex
2018-08-13 00:12:09 +00:00
0d7f9e1b8c
Update autoloader
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-12 18:26:50 +02:00
bfa49410a2
Drop support for xcache
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-12 17:14:08 +02:00
6973b82e20
Develop HEIC/HEIF preview support #7406
...
Signed-off-by: Sebastian Steinmetz <me@sebastiansteinmetz.ch>
2018-08-11 00:13:43 +02:00
90a656305b
Bump autoloaders
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
7aad5b7721
Merge pull request #10543 from nextcloud/ignore-deactivated-users
...
Do not show deactivated users in sharees and contacts
2018-08-10 15:01:14 +02:00
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
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
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
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
e1d3965883
Add the ToS app to the enterprise bundle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-09 16:12:48 +02:00
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
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
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
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
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
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
11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
...
make file cache updates more robust
2018-08-08 18:27:18 +02:00
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
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
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
Roeland Jago Douma
Morris Jobke
Nextcloud bot
Roeland Jago Douma
Georg Ehrke
Daniel Kesselberg
Bjoern Schiessle
Robin Appelman
blizzz
Joas Schilling
Joas Schilling
John Molakvoæ (skjnldsv)
MartB
Christoph Wurst
Julius Härtl
sualko
Denis Mosolov
Sebastian Steinmetz
Michael Weimann
Sebastian Steinmetz
Daniel Calviño Sánchez