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
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
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
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
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
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
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
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
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
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
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
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
20839a422b
Refactor some code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-21 09:51:05 +02: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
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
Roeland Jago Douma
Morris Jobke
Georg Ehrke
Daniel Kesselberg
Roeland Jago Douma
Robin Appelman
Bjoern Schiessle
blizzz
Joas Schilling
John Molakvoæ (skjnldsv)
MartB
Christoph Wurst
Julius Härtl
sualko
Sebastian Steinmetz
Michael Weimann