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

8881 commits

Author SHA1 Message Date
Roeland Jago Douma
92fa373314
Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dude 
Copy the expiration from 480864b3e3 to …
 2018-09-25 09:04:44 +02:00
blizzz
67da97c362
Merge pull request #11222 from nextcloud/gs-and-saml 
make the server ready to use global scale with SAML as auth back-end
 2018-09-24 12:00:13 +02:00
Joas Schilling
f258e65f13
Also adjust the expiration of PublicKeyTokenProvider 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-20 09:54:27 +02:00
Joas Schilling
5e6187926f
Copy the expiration from 480864b3e3 to getTokenById 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-19 17:55:48 +02:00
Joas Schilling
b026b5deb0
Merge pull request #11134 from nextcloud/locale-template-fix 
Use user locale as default in the template
 2018-09-19 16:06:35 +02:00
John Molakvoæ (skjnldsv)
3095ec4125 Fix icons cacher regex for compressed output 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-19 13:06:04 +02:00
Bjoern Schiessle
bb86a8ca36
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-14 17:23:06 +02:00
John Molakvoæ (skjnldsv)
92fbb6d795
Fallback to $lang if no $locale match 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-13 11:37:40 +02:00
John Molakvoæ (skjnldsv)
7d158c62ce
Typehint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-10 11:17:03 +02:00
John Molakvoæ (skjnldsv)
df143cb72a
Use user locale as default in the template 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-10 10:42:08 +02:00
Roeland Jago Douma
c44368b9a3
Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argument 
replace setcookie value with '' instead of null.
 2018-09-07 19:31:30 +02:00
Roeland Jago Douma
47b46fa69d
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:01:31 +02:00
MartB
fe21b10de5 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-06 20:34:16 +02:00
Christoph Wurst
b4b095ca91
Fix @since version on new API 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-05 20:58:39 +02:00
Christoph Wurst
ff58732c0d
Add breadcrumb support to crash reporters 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-05 20:58:39 +02:00
Roeland Jago Douma
adbeb74dc1
Merge pull request #11046 from nextcloud/feature/10725/applogger 
Add wrapper Logger in DIContainer
 2018-09-04 12:15:43 +02:00
Roeland Jago Douma
9319d557a4
Add wrapper Logger in DIContainer 
This makes sure that for example app for the context is always set.
We can in the future extend this to include more info.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 10:05:25 +02:00
Roeland Jago Douma
8354c50911
Deprecate the childSrc functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 07:35:44 +02:00
Roeland Jago Douma
c8fe4b4fc8
Add workerSrc to CSP 
Fixes #11035

Since the child-src directive is deprecated (we should kill it at some
point) we need to have the proper worker-src available

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-04 07:35:44 +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
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
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
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
20839a422b
Refactor some code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-08-21 09:51:05 +02: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
Michael Weimann
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
Michael Weimann
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
blizzz
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
Roeland Jago Douma
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
Sebastian Steinmetz
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
Bjoern Schiessle
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
Robin Appelman
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
Robin Appelman
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
Robin Appelman
f7ae235372
cache OC\Files\Mount\Manager::findIn results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 19:02:00 +02:00
Robin Appelman
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
Robin Appelman
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
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
blizzz
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
Daniel Kesselberg
bfa49410a2
Drop support for xcache 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-08-12 17:14:08 +02:00