Commit Graph

8392 Commits

Author SHA1 Message Date
Roeland Jago Douma f630b12fc7
Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_file
Do not use file as template parameter
2018-08-09 19:49:47 +02:00
Roeland Jago Douma 46d340045d
Merge pull request #10598 from schoonc/patch-1
Removed unused variable isFile
2018-08-09 17:00:03 +02:00
Roeland Jago Douma 8c1e75e052
Do not use file as template parameter
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-09 16:45:25 +02:00
Roeland Jago Douma 0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect
Fix login redirection if only one 2FA provider is active
2018-08-09 12:27:29 +02:00
Björn Schießle 6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares
Add support for room shares
2018-08-09 10:44:11 +02:00
schoonc b0917dfac9
Removed unused variable isFile 2018-08-09 00:30:42 +03:00
Michael Weimann 9135e10062
Restores the guest icons 2018-08-08 23:19:37 +02:00
Christoph Wurst d8197f2b97
Rename providerset method to get primary providers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 20:28:21 +02:00
Christoph Wurst c6e47e8a51
Fix login redirection if only one 2FA provider is active
Fixes https://github.com/nextcloud/server/issues/10500.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 15:25:59 +02:00
Daniel Calviño Sánchez e1561f0e8f Add custom handling for room shares to the resharer information
Like done with group shares, received room shares are described as such
in the UI.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez 2d062daa11 Add custom handling for room shares to the list of sharees
Like done for other types of shares, room shares are now explicitly
described as such in the UI.

The avatar used is the image provided in the "shareWithAvatar" property
of the share. If none is given then the avatar is the first letter of
the display name of the room share with a coloured background seeded
from the room token. If the display name of the room is empty then no
letter is shown in the avatar; no special handling is done in that case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 7292a986a0 Add type for room shares
This type represents shares with a Nextcloud Talk conversation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
John Molakvoæ b198e17071
Merge pull request #10568 from nextcloud/apps-menu-fixes
Fix apps max-height
2018-08-08 09:22:21 +02:00
Roeland Jago Douma 75de67a98f
Merge pull request #10525 from nextcloud/notifications-fix
Fixed notifications position
2018-08-08 09:15:26 +02:00
Nextcloud bot 1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
John Molakvoæ (skjnldsv) 2b15b4cb74
Fix apps max-height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-07 10:27:39 +02:00
Nextcloud bot 35342b4b7d
[tx-robot] updated from transifex 2018-08-07 00:12:06 +00:00
Joas Schilling f67d942fad
Merge pull request #10530 from nextcloud/bugfix/10528/public-template
Fix issues when using the public layout without a PublicTemplateResponse
2018-08-06 15:41:54 +02:00
Roeland Jago Douma 49662f3def
Merge pull request #10485 from nextcloud/update-triangle
Fix design of update error page
2018-08-06 15:38:43 +02:00
Nextcloud bot ca54166e35
[tx-robot] updated from transifex 2018-08-06 00:12:21 +00:00
Nextcloud bot a625a4d704
[tx-robot] updated from transifex 2018-08-05 00:12:29 +00:00
Nextcloud bot 752ee28b1b
[tx-robot] updated from transifex 2018-08-04 00:12:38 +00:00
Julius Härtl 4f2013bd40
Make public layout also usable without a PublicTemplateResponse
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-03 20:41:56 +02:00
Julius Härtl b4ea19c981
Fix base layout content padding
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-03 19:21:10 +02:00
Julius Härtl 2d3e5c817c
Remove header-classes since it is never used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-03 18:25:06 +02:00
John Molakvoæ (skjnldsv) 05b53aaf8c
Fixed notifications position
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-03 15:07:55 +02:00
Roeland Jago Douma 755f13ee9f
Merge pull request #10519 from nextcloud/min-height-wrapper
Min height 100% on content-wrapper
2018-08-03 14:05:28 +02:00
Jan-Christoph Borchardt 6d7bf81421
Fix HTML on update error page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-03 13:30:49 +02:00
Jan-Christoph Borchardt 49cbd8cd95
Add margin below detailed logs
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-03 13:30:36 +02:00
Jan-Christoph Borchardt 2fb6799ad6
Use images instead of inline SVG and unicode
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-03 13:20:45 +02:00
John Molakvoæ (skjnldsv) 49189190b9
Min height 100% on content-wrapper
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-03 12:02:23 +02:00
Roeland Jago Douma af6f93b025
Merge pull request #10515 from nextcloud/revert-zindex
Fixed design zindex
2018-08-03 11:27:48 +02:00
John Molakvoæ (skjnldsv) 248b786bd0
Fixed design zindex
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-03 10:27:38 +02:00
Nextcloud bot bf88448f87
[tx-robot] updated from transifex 2018-08-03 00:12:22 +00:00
Roeland Jago Douma 94c35d542f
Merge pull request #10482 from nextcloud/content-list-checkbox-visibility-fix
Only show checkbox on hover/focus + accessibility fixes
2018-08-02 12:36:10 +02:00
John Molakvoæ (skjnldsv) 5f372b1cd5
Add class to show all checkboxes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-02 10:31:36 +02:00
Nextcloud bot 62af5bf033
[tx-robot] updated from transifex 2018-08-02 00:12:37 +00:00
Roeland Jago Douma 494f9fb86c
Merge pull request #10486 from nextcloud/detect-hidden-navigation
Mobile fixes
2018-08-01 22:57:28 +02:00
Roeland Jago Douma fae7e516b5
Merge pull request #10481 from nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded
Make the info available if the avatar was uploaded or generated
2018-08-01 22:54:38 +02:00
Jan-Christoph Borchardt 4574698443
Fix double container on 'Possible CSRF attack' page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-01 18:54:48 +02:00
John Molakvoæ (skjnldsv) 0a967818db
Mobile fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-01 14:29:26 +02:00
Jan-Christoph Borchardt ede469a240
Inline error svg icon because there is no SCSS on guest page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-01 13:51:23 +02:00
Jan-Christoph Borchardt d64a9f3d0d
Fix text overflow on update page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-01 13:36:44 +02:00
Jan-Christoph Borchardt 81dc12a77b
Fix triangle on update page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-08-01 13:30:31 +02:00
Roeland Jago Douma 369a6c13eb
Merge pull request #10474 from danielkesselberg/bugfix/10379/no-files-in-here
Set emptyText depending on filepicker type
2018-08-01 12:56:08 +02:00
Roeland Jago Douma 8162b349e7
Merge pull request #10483 from nextcloud/detect-hidden-navigation
No margin left if the navigation is hidden
2018-08-01 12:54:42 +02:00
Joas Schilling 6690197ff1
Merge pull request #10471 from nextcloud/bugfix/noid/improve-url-detection
Improve URL detection
2018-08-01 12:13:17 +02:00
John Molakvoæ (skjnldsv) 36a45597bb
No margin left if the navigation is hidden
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-01 11:31:37 +02:00
Joas Schilling decd196162
Make the info available if the avatar was uploaded or generated
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-01 10:56:22 +02:00
John Molakvoæ (skjnldsv) cbe54e096b
Only show checkbox on hover/focus + accessibility fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-01 10:52:01 +02:00