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

42247 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
0e9009989f
Merge pull request #8020 from nextcloud/fix-avatar-migration 
Make sure we always know for sure if an avatar is generated or not
 2018-01-24 15:18:19 +01:00
Roeland Jago Douma
abb17589b1
Merge pull request #7991 from nextcloud/show-trusted-domain-error-in-status.php 
Send a proper response for status.php on trusted domain error
 2018-01-24 15:05:49 +01:00
Morris Jobke
03072c3914
Merge pull request #7921 from nextcloud/fix_redirect_on_pw_reset 
Removed additional and uneccessary request on password reset
 2018-01-24 14:21:44 +01:00
Morris Jobke
1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin 
Dont polute the log on DAV emaillogin
 2018-01-24 14:00:01 +01:00
Morris Jobke
abd33bb619
Properly catch InvalidTokenException for better error response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-24 13:56:12 +01:00
Luca Adrian Lindhorst
269ca40784
Removed additional and uneccessary request on password reset, to fix redirection afterwards. 
Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de>
 2018-01-24 13:37:06 +01:00
Julius Härtl
ef1265e5f5
Make sure we always know for sure if an avatar is generated or not 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-24 13:10:20 +01:00
Morris Jobke
5520ba3d15
Merge pull request #7902 from nextcloud/fix_7700 
Add fileid preview endpoint
 2018-01-24 12:25:55 +01:00
Julius Härtl
25c62be9d7
Merge pull request #7980 from nextcloud/3rdparty_pimple 
[3rdparty] Bump pimpe to 3.2.3
 2018-01-24 11:24:32 +01:00
Roeland Jago Douma
cda811b6b4
Make filelist and sidebar use the fileid preview endpoint 
This makes sure the preview is cached even after rename! yay!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-24 11:24:18 +01:00
Roeland Jago Douma
0224c61530
Add preview endpoint for the fileid 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-24 11:24:18 +01:00
Morris Jobke
f39f95e4e8
Merge pull request #7917 from nextcloud/warn_old_ocs_route_cons 
Warn about the old OCP\API::register construct for OCS
 2018-01-24 08:36:54 +01:00
Nextcloud bot
d427250d87
[tx-robot] updated from transifex 2018-01-24 01:10:48 +00:00
Roeland Jago Douma
79b7f39753
[3rdparty] Bump pimpe to 3.2.3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 14:09:31 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
9cb3a79b18
Merge pull request #7971 from nextcloud/comradekingu-patch-1 
Spelling: There was an error loading → could not load
 2018-01-23 10:58:43 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Morris Jobke
5c360a41e9
Merge pull request #7858 from nextcloud/fix-local-storage 
Use fallback path if data dir is not available for Storage/Local.php
 2018-01-23 10:52:41 +01:00
Roeland Jago Douma
ef127a30ec
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 10:35:37 +01:00
Morris Jobke
caccf7a2e9
Merge pull request #7989 from nextcloud/cleanup-unused-share-methods 
Remove not used methods of legacy share.php
 2018-01-23 10:00:24 +01:00
Roeland Jago Douma
0660e57b1f
Don't polute log when loggin into dav with email 
* We first try the email as username but this fails
* Then we get the uid from the email and try again

We should not log the first attempt since it polutes the log with failed
login attempts while the login actually is valid.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 09:41:44 +01:00
Nextcloud bot
cc4f9986cf
[tx-robot] updated from transifex 2018-01-23 01:10:50 +00:00
blizzz
c7d9e5fd63
Merge pull request #7354 from nextcloud/refacor-update-page-print 
Refactor method to check if update is needed
 2018-01-22 22:50:05 +01:00
Roeland Jago Douma
23768d5fea
Merge pull request #7985 from nextcloud/remove-public-video 
Remove video preview from files_sharing
 2018-01-22 21:05:41 +01:00
Roeland Jago Douma
eb3fd4bce6
Merge pull request #7988 from nextcloud/cleanup-old-repair-steps 
Remove old repair steps that aren't executed anymore
 2018-01-22 19:54:46 +01:00
Roeland Jago Douma
97aff2dbe0
Merge pull request #7994 from nextcloud/smb-notify-test-timeout 
increase the time we wait for smb notifications in the test
 2018-01-22 19:54:00 +01:00
Robin Appelman
80aef8ed08
increase the time we wait for smb notifications in the test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-22 17:08:24 +01:00
Morris Jobke
37026d8b9d
Send a proper response for status.php on trusted domain error 
* fixes #7732

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 15:58:57 +01:00
Morris Jobke
520f2fd6ea
Merge pull request #7986 from nextcloud/fix_7749 
If the preview is size 0 it is invalid
 2018-01-22 15:37:49 +01:00
Morris Jobke
71cf31f211
Remove not used methods of legacy share.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:54:07 +01:00
Morris Jobke
d9b1492e03
Remove old repair steps that aren't executed anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:51:02 +01:00
Roeland Jago Douma
8703df3233
If the preview is size 0 it is invalid 
* delete it
* throw a NotFound Exception
  - This should a proper 404 to the user
  - Next time it is then regenerated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-22 13:57:00 +01:00
Julius Härtl
4d3dbb345f
Remove video preview from files_sharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-22 13:22:52 +01:00
Roeland Jago Douma
1194e4c2bd
Merge pull request #7975 from nextcloud/3rdparty_rm_polyfill 
[3rdparty] Remove polyfill-php70
 2018-01-22 09:06:23 +01:00
Nextcloud bot
4b4931905c
[tx-robot] updated from transifex 2018-01-22 01:10:39 +00:00
Roeland Jago Douma
226e75d9ca
[3rdparty] Remove polyfill-php70 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-21 10:43:31 +01:00
Nextcloud bot
5845b177c7
[tx-robot] updated from transifex 2018-01-21 01:10:50 +00:00
Roeland Jago Douma
c450dba1a0
Merge pull request #7956 from nextcloud/remove-vendor-detection 
Remove vendor detection
 2018-01-20 11:42:48 +01:00
Morris Jobke
80a36380fc
Disable vendor detection when upgrading from 11.0.x 
Upgrade from 11 to 14 is not supported anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-20 11:14:06 +01:00
Julius Härtl
4d99faae4f
Merge pull request #7955 from nextcloud/remove-app-disable-upgrade 
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x
 2018-01-20 11:01:31 +01:00
Allan Nordhøy
7fb1e458fa
There was an error loading → Could not load 2018-01-20 09:17:26 +01:00
Allan Nordhøy
29d68d7a35
There was an error loading → could not load 2018-01-20 09:15:50 +01:00
Nextcloud bot
2635073909
[tx-robot] updated from transifex 2018-01-20 01:10:57 +00:00
Roeland Jago Douma
0599d9284d
Merge pull request #7961 from nextcloud/smb-2.0.4 
update icewind/smb to 2.0.4
 2018-01-19 20:23:14 +01:00
Robin Appelman
f6c95ca850
update icewind/smb to 2.0.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-19 16:22:36 +01:00
Morris Jobke
34a3613a64
Merge pull request #7953 from nextcloud/theming-background-highres 
Theming: adjust background image resizing
 2018-01-19 14:14:25 +01:00
Morris Jobke
c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-19 14:00:27 +01:00
Julius Härtl
422e20569b
Theming: adjust background image resizing 
Support high resolution login images by resizing only images that are wider than 4096px

fixes #7459

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-19 13:34:43 +01:00
Nextcloud bot
fdd7a53250
[tx-robot] updated from transifex 2018-01-19 01:10:55 +00:00
Morris Jobke
bcba1a97ad
Use fallback path if data dir is not available for Storage/Local.php 
Found while testing strict types for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-18 16:38:01 +01:00