upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
45648 commits 951 branches 1208 tags 8.3 GiB
Commit graph

15952 commits

Author SHA1 Message Date
Morris Jobke
f6cdab6b11
Properly escape column name in "createFunction" call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-19 12:12:52 +02:00
Roeland Jago Douma
e7d20cdb5e
Allow php7.3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-12 12:21:19 +02:00
Roeland Jago Douma
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
Nextcloud bot
cef454c280
[tx-robot] updated from transifex 2018-10-10 00:13:24 +00:00
Roeland Jago Douma
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
Nextcloud bot
1302b6f267
[tx-robot] updated from transifex 2018-10-03 16:58:57 +00:00
Roeland Jago Douma
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
Robin Appelman
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
Bjoern Schiessle
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
blizzz
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
blizzz
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
Joas Schilling
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
Joas Schilling
6718bfb83d
Also adjust the expiration of PublicKeyTokenProvider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-20 10:00:08 +02:00
Joas Schilling
3a179b2519
Copy the expiration from 480864b3e3 to getTokenById 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-20 09:59:53 +02:00
John Molakvoæ (skjnldsv)
fcda1f7124
Fix since tag 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 16:13:26 +02:00
John Molakvoæ (skjnldsv)
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
John Molakvoæ (skjnldsv)
d69ddd94de
Typehint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 16:13:19 +02:00
John Molakvoæ (skjnldsv)
ccb8838854
Since requirement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 16:13:14 +02:00
John Molakvoæ (skjnldsv)
19350c4b95
Fix public l10n 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 16:13:10 +02:00
John Molakvoæ (skjnldsv)
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
Joas Schilling
86a2d1fecd
Revert "Use APCu caching of composer" 
This reverts commit 948ab8a4d0.

For details why see https://github.com/nextcloud/server/issues/11290
 2018-09-19 15:56:30 +02:00
John Molakvoæ (skjnldsv)
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
MartB
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
Joas Schilling
2518cdd2d9
Fix exception class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-12 11:57:43 +02:00
Roeland Jago Douma
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
Christoph Wurst
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
Roeland Jago Douma
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
Julius Härtl
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
Robin Appelman
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
Morris Jobke
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
sualko
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
Nextcloud bot
d644cafae7
[tx-robot] updated from transifex 2018-08-25 00:12:33 +00:00
Roeland Jago Douma
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
Roeland Jago Douma
4758942121
Fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-24 21:27:21 +02:00
Morris Jobke
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
Robin Appelman
be9ab8b879
also catch exceptions when loading apps 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-24 17:16:54 +02:00
Morris Jobke
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
Denis Mosolov
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
Sebastian Steinmetz
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
Morris Jobke
ad5093b7a6
Show link to simple sign up page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-08-23 14:41:19 +02:00
Morris Jobke
bb2336f389
Merge pull request #10526 from steiny2k/HEICHEIF 
Support HEIC for previews
 2018-08-22 13:41:19 +02:00
Morris Jobke
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
Nextcloud bot
65410ab1cb
[tx-robot] updated from transifex 2018-08-22 00:12:11 +00:00
Christoph Wurst
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
Morris Jobke
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
Morris Jobke
20839a422b
Refactor some code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-08-21 09:51:05 +02:00
Morris Jobke
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
Nextcloud bot
be3438ca97
[tx-robot] updated from transifex 2018-08-21 00:12:16 +00:00
Michael Weimann
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
Roeland Jago Douma
ce1e213760
Bump autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-20 15:25:07 +02:00