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

8420 commits

Author SHA1 Message Date
Nextcloud bot
82854b5042
[tx-robot] updated from transifex 2018-08-18 00:12:35 +00:00
Arthur Schiwon
e4720b6056
and the user popover needs a higher z-index, to make it visible again 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-16 13:26:51 +02:00
Julius Härtl
d79943f498
Merge pull request #10608 from nextcloud/header-menu-fixes 
Fix header menu & contact popover
 2018-08-16 09:50:25 +02:00
Julius Härtl
a4e042c706
Merge pull request #10695 from nextcloud/sharing-public-settings-fixes 
Fix password enforce on public links
 2018-08-16 09:38:58 +02:00
John Molakvoæ (skjnldsv)
c435bfe703
Disabled checkboxes and design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-16 07:31:17 +02:00
John Molakvoæ
8809dc764b
Merge pull request #10701 from nextcloud/bugfix/noid/timepicker-zindex 
Fix timepicker z-index to be above the sidebar
 2018-08-15 17:13:10 +02:00
Julius Härtl
e171d004e6
Fix timepicker z-index to be above the sidebar 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-15 16:44:10 +02:00
Bjoern Schiessle
dfec66ca02
only warn about data lose on password reset if per-user keys are used 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-08-15 15:08:34 +02:00
John Molakvoæ (skjnldsv)
b9c448d855
Fix password enforce on public links 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 11:51:25 +02:00
John Molakvoæ (skjnldsv)
0e23193b32
Added feedback on autocomplete ui 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 08:59:06 +02:00
John Molakvoæ (skjnldsv)
5e867d6415
Fix footer and public min-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 08:38:20 +02:00
Nextcloud bot
62a9ec12bc
[tx-robot] updated from transifex 2018-08-15 00:13:40 +00:00
Roeland Jago Douma
4b3587b5f8
Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layout 
switches the oc dialog button row to flex
 2018-08-14 09:20:25 +02:00
Nextcloud bot
ba4c42abaa
[tx-robot] updated from transifex 2018-08-14 00:12:05 +00:00
Michael Weimann
db31bf8a64
switches the oc dialog button row to flex 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-13 21:51:58 +02:00
Nextcloud bot
ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Nextcloud bot
4cdad9b69f
[tx-robot] updated from transifex 2018-08-11 00:12:30 +00:00
Roeland Jago Douma
674d5f2924
Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header 
Apply flex-basis to right header
 2018-08-10 14:55:06 +02:00
John Molakvoæ (skjnldsv)
846b8572ed
Tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-10 13:54:21 +02:00
Roeland Jago Douma
7191d676ab
Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update 
Redirect to the same page after an update
 2018-08-10 11:14:03 +02:00
Christoph Wurst
3254b85c12
Merge pull request #10546 from nextcloud/popover-tokens 
Popovermenu fix and token settings design fixes
 2018-08-10 09:38:27 +02:00
Nextcloud bot
103a2c30fb
[tx-robot] updated from transifex 2018-08-10 00:12:26 +00:00
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
Julius Härtl
c954eb1d12
Apply flex-basis to right header 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-09 16:46:43 +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
Julius Härtl
4823b2746e
Redirect to the same page after an update 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-09 15:19:58 +02:00
John Molakvoæ (skjnldsv)
fc4f122881
Align to the left 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:47:50 +02:00
John Molakvoæ (skjnldsv)
1d05e457d6
Typo 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:46:08 +02:00
John Molakvoæ (skjnldsv)
fd806366ca
Fix header menu & contact popover 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:42:59 +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
John Molakvoæ (skjnldsv)
4ba40385a4
POpovermenu fix and token settings design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-06 10:48:07 +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