6f3328a9cd
skip already decrypted files on decrypt all command
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-25 17:52:51 +02:00
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
Bjoern Schiessle
Roeland Jago Douma
Morris Jobke
Nextcloud bot
Roeland Jago Douma
Georg Ehrke
Daniel Kesselberg
Robin Appelman
blizzz
Joas Schilling
Joas Schilling
John Molakvoæ (skjnldsv)
MartB
Christoph Wurst
Julius Härtl
sualko