Commit Graph

2471 Commits

Author SHA1 Message Date
Christoph Wurst dd459bbb7a
Remove OC.scaleFixForIE8
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-08 16:17:16 +02:00
Roeland Jago Douma 8932a51b91
Extract translated strings of compiled handlebars
Follow up to #11615

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-05 12:32:48 +02:00
Roeland Jago Douma 363ec1d3c3
Remove leftover '
Followup to #11583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 16:02:09 +02:00
Roeland Jago Douma b0fd31496b
Move OC.Share to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:45 +02:00
Roeland Jago Douma cd7c17482e
Move systemtags to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Morris Jobke c8e617b07c
Set nonce for loading the zxcvbn
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-03 17:05:01 +02:00
Morris Jobke 48f483a352
Add missing compiled mimetype list - see #10135
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-01 15:54:02 +02:00
Jan-Christoph Borchardt 9b8e884b19
Change wording of 'Copy URL' to more understandable 'Copy link'
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-10-01 11:02:12 +02:00
Roeland Jago Douma 7e5b7f75ba
Bump templates to handlebars 4.0.12
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-28 21:17:08 +02:00
Morris Jobke d867f9f091
Merge pull request #11037 from nextcloud/trash-webui-dav
Use trashbin dav endpoint to list trash in webui
2018-09-28 16:03:24 +02:00
Roeland Jago Douma c9e93b8084
Compile contactmenu handlebars templates
Fixes #11029
For https://github.com/orgs/nextcloud/projects/18

Ship the compiled handlebars templates. This makes it possible to have a
scricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-27 20:33:58 +02:00
Robin Appelman 073fddcc28
fix trashbin infoparsers interfering with other dav clients
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:56 +02:00
Robin Appelman 91066954a8
pass existing data to info parsers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:30 +02:00
Joas Schilling dda0dfd5f1
Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names
Better shared-by info for conversations without names
2018-09-19 13:45:31 +02:00
Joas Schilling a2c8b3f00b
Merge pull request #11151 from nextcloud/davclient-js-decode
fix js files client for user names with spaces
2018-09-13 11:17:29 +02:00
Joas Schilling d062c8687b
Merge pull request #11036 from nextcloud/fix/10903/users-undefined-maxautocompleteresults
fix check for more users  in sharing dialogue
2018-09-13 09:49:43 +02:00
Joas Schilling a1c969a170
Merge pull request #10840 from webfoersterei/refactor/5530-urandom-check
Refactor secure randomness check
2018-09-13 09:29:42 +02:00
Arthur Schiwon b628ec4701
adjust and extend js unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-12 17:49:48 +02:00
Joas Schilling 7f0de11bd5
Better shared-by info for conversations without names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-11 12:57:36 +02:00
Arthur Schiwon 4893e1765f
don't user a higher paging size than max autocomplete entries are set
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-10 23:15:46 +02:00
Arthur Schiwon e7b0f8b001
fix check for more users
after a refactor users et al were undefined. The check condition was moved.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-10 23:15:42 +02:00
Robin Appelman 4491a41a72
fix js files client for user names with spaces
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-10 22:37:01 +02:00
Daniel Calviño Sánchez c14c6e5ccf Make possible to pick both files and folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:40:12 +02:00
Daniel Calviño Sánchez f080fa55ac Store the mime type filter always as an array
This will make easier to check if both directories and files should be
pickable.

This also removes an unused assignment to the mime type.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:23:47 +02:00
Daniel Calviño Sánchez 66f2b155ce Fix empty mime type filter
When the mime type is an empty array no filter should be applied.
However, the filter was loosely compared to an empty array, but as
arrays are objects then it became an implicit strict equality comparison
which always failed due to being different objects. Now the length of
the array is compared instead, and also moved outside the loop as it is
not needed to check it for each file.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 14:02:50 +02:00
Daniel Calviño Sánchez 4508a12188 Prevent default action from being executed when the button is disabled
When "enter" is pressed in the file picker a "click" event is triggered
on the primary action button. However, in some cases, like when the file
picker is in "Choose" mode and the current directory in the file picker
is the root folder, the primary action button is disabled. In those
cases pressing enter should not trigger a click action on the button and
be ignored instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-30 10:25:09 +02:00
Joas Schilling 1edf345d4d
Use empty alt tag for avatars since there is always the name next to it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-26 18:29:02 +02:00
Timo Förster 006e150c87 Change check if secure randomness is possible.
Signed-off-by: Timo Förster <tfoerster@webfoersterei.de>
2018-08-24 23:12:02 +02:00
Morris Jobke 8761856a71
Merge pull request #10838 from nextcloud/header-fixes-and-public-note
Header fixes and public note
2018-08-24 22:21:55 +02:00
John Molakvoæ (skjnldsv) 13230f180a
Fix jsunit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 22:05:48 +02:00
Daniel Calviño Sánchez 7ce520e83e
Add support for rooms in the list of candidates to share with UI
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-24 18:06:48 +02:00
John Molakvoæ (skjnldsv) 421daf6ab0
Fix public share link order
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 17:40:05 +02:00
John Molakvoæ (skjnldsv) ddd18aa375
Fix public link order and fix skip to content
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 16:54:01 +02:00
John Molakvoæ (skjnldsv) 3cb52b868a
Fix header calculation and better public design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 15:45:39 +02:00
John Molakvoæ (skjnldsv) ba66cad1b4
Fix keyboard menu element event detection
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-22 09:54:40 +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
Morris Jobke 6d749bf021
Merge pull request #10700 from nextcloud/fix/10516/sharepermissions
Fix share dialog sidebar in share views
2018-08-20 17:14:12 +02:00
Morris Jobke 37869d9b2f
Merge pull request #10628 from nextcloud/feature/10154/app-directory-permission-check
Adds a permission check for app directories
2018-08-20 17:08:18 +02:00
Michael Weimann 7aed47f776
Adds tests for the memory checks
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-20 15:24:10 +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 1d2bc9c45e
Adds tests for the setup memory limit checks
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
Arthur Schiwon be873c234b
adapt jsunit test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-16 23:08:15 +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
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
Arthur Schiwon e89567eb53
Take base permissions from DAV, fixes #10516
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-15 15:27:31 +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) 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
Michael Weimann ebcfe33d0d
Extends the setup check js tests
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-09 19:48:39 +02:00
Michael Weimann b2e60e365d
Adds a setup check for app directory permissions.
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-09 19:47:55 +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 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
schoonc b0917dfac9
Removed unused variable isFile 2018-08-09 00:30:42 +03: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
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 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
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
Daniel Kesselberg 6b9093ce6d Set emptyText depending on filepicker type
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-07-31 22:49:01 +02:00
Joas Schilling 3f45ab97da
Improve URL detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-31 17:11:46 +02:00
Roeland Jago Douma bc83656604
Reword share comment feature
Fixes #10403

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-31 14:20:22 +02:00
Julius Härtl 1f635bb892
Use small loading indicator for avatars smaller than 32px
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-25 14:26:27 +02:00
Morris Jobke a96137ef0b
Merge pull request #10310 from nextcloud/accessibility-header
Accessibility fixes for header and global elements
2018-07-25 00:07:37 +02:00
Kevin Ndung'u fe25092312 Remove deprecated keyboard events & properties
Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com>
2018-07-24 19:02:56 +02:00
Daniel Calviño Sánchez 911093549e Make possible to enable "sending password by Talk" from the share menu
Until now the password to be sent by mail was set by enabling a checkbox
in the share menu and then entering the password in an input field shown
below. Now, when Talk is enabled, another item is added to the share
menu to do the same for a password to be sent by Talk.

Sending the password by mail and sending it by Talk are mutually
exclusive actions, so when one of the checkboxes is enabled the other
one is automatically disabled.

Note that the icon set for the field, "icon-passwordtalk", does not
currently exist; it simply mimics the "icon-passwordmail" (which does
not exist either) used for the field of the password protect by mail to
get the right padding in the menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 14:45:42 +02:00
John Molakvoæ (skjnldsv) 0274507cb1
Acceptance and mobile navigation fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 11:01:11 +02:00
Roeland Jago Douma b41d0d32e2
Merge pull request #10218 from nextcloud/share-comments
allow to add a personal note to a share
2018-07-24 09:12:03 +02:00
John Molakvoæ (skjnldsv) 705439ca7b
Do not bind reset password link if an url is set
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-23 15:01:03 +02:00
John Molakvoæ (skjnldsv) da0bdd1391 Design structure fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 16:09:13 +02:00
John Molakvoæ (skjnldsv) 58debbe42c
Tests fixes and design bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:21 +02:00
Julius Härtl e302cadae2
Don't use shorthand syntax for functions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-21 15:02:21 +02:00
John Molakvoæ (skjnldsv) d4de77afb9
No remote note and various fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:21 +02:00
John Molakvoæ (skjnldsv) 3a11c26cb4
Public fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv) c71d3dc9bf
Public share
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +02:00
Bjoern Schiessle 967a97904f
fix post url
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv) fc2767bbbb
Autoresize + autoloader
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv) 0a7e34f6c8
Popovermenu migration
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv) 4e08d8342e
UI set share note!
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv) 8d3f58c391
Jsunit fixes 1
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) d6b718584e
Sidebar fix
Fix sidebar and scrollbar on content
Sidebar fixes, and sidebar-width + header-height variables

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-20 23:37:00 +02:00
John Molakvoæ (skjnldsv) 7f0d60fefc
Enter key on menu registration
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-20 23:19:55 +02:00
Jan-Christoph Borchardt 6d083c4de9
Make left sidebar toggle also work with keyboard
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-07-20 23:19:55 +02:00
Morris Jobke 07271087b0
Fix style of the user facing whats new popup
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-17 14:02:14 +02:00
Morris Jobke 82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name
sharedWithDisplayName & sharedWithAvatar
2018-07-13 17:29:57 +02:00
Morris Jobke 14314584ba
Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-users
Display What's New info to users
2018-07-13 17:25:51 +02:00
Morris Jobke 83b1de4493
Fix unit tests - follow up to #10197
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 22:02:45 +02:00
Morris Jobke 3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares
implement federated group sharing
2018-07-11 21:44:48 +02:00
Roeland Jago Douma 5262d60e94
Merge pull request #10197 from nextcloud/feature/9410/improve-opcache-feedback
Improve opcache feedback
2018-07-11 19:27:09 +02:00
Joas Schilling 72d17ff02c
Improve url detection in comments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 16:23:56 +02:00
Cthulhux f6f49c77f7
opcache module check
Improved the speed of isOpcacheProperlySetup() (instant return instead of continuing when we're already failed), added a check for the opcache extension itself. Potentially fixes #9410

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 16:08:40 +02:00
Bjoern Schiessle f0aaf62b24
fix js tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:49 +02:00
Bjoern Schiessle 2abc705632
start to get fed group shares into the share dialog
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:47 +02:00
Arthur Schiwon ca6094f390
wire the frontend
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 20:29:00 +02:00
Arthur Schiwon 772bbd99be
Backend work to provide NC whats New info to users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 14:33:08 +02:00
Roeland Jago Douma 6a0c54d5bf
Add warning to setup checks if the default mailer is still php
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Marius Blüm f824ff500d
Fix code integrity check-warning link
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-06-29 11:33:29 +02:00
Morris Jobke 61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
Add user locale/region setting
2018-06-29 08:03:43 +02:00
Georg Ehrke fd41192bb4
fix OC.getLocale()
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:49 +02:00
Thomas Citharel bf6bfad76b
OC.getLocale() now returns Locale and no longer Language
Added OC.getLanguage() to get Language
<html lang=''> still gets language, though according to IETF BCP47 locale should be good.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:40 +02:00
Joas Schilling e1936a49e7
Fix "parsing" of email-addresses in comments and chat messages
\\b matches any non-word character, including \@ and \-
In order to not detect urls in the middle of email-addresses,
we need to check for white space characters and beginning of the
message instead.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-27 13:04:05 +02:00
Robin Appelman 8ed50d4b63
prefill userid for login after password reset
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-21 15:18:07 +02:00
Roeland Jago Douma 8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware
Public share middleware & controller
2018-06-21 10:09:20 +02:00
John Molakvoæ (skjnldsv) 938553ab07
IE11 css vars compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:21:54 +02:00
Roeland Jago Douma 31392c2443
Move public auth page over
Now this is in core so the basics (that 99% of the app will want to
use) looks always the same.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
Morris Jobke d82ef72161
Merge pull request #9197 from nextcloud/fix-avatar-center
Fix avatar generator centering
2018-06-15 16:16:13 +02:00
John Molakvoæ (skjnldsv) ed4309ce41
Unify colour algorithm output
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 18:46:04 +02:00
Morris Jobke 9c4aecb539
Merge all setup checks into one controller
* renamed hasMissingIndexes to missingIndexes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 15:25:08 +02:00
Morris Jobke cd87a40eb3
Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks
Merge tips & tricks section into setup checks
2018-06-13 13:18:40 +02:00
Morris Jobke 4a0b7aaf6c
Merge tips & tricks section into setup checks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 12:05:38 +02:00
Morris Jobke 624d191ef6
Fix wrong hint about missing indexes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-13 11:56:43 +02:00
Morris Jobke 393d9aae74
Add a hint that some indexes are not added yet
* gives the admin a chance to discover the missing indexes and improve the performance of the instance without digging through the manual
* nicely integrated in the setup checks where this kind of hints belong to
* also adds an option to integrate this from an app based on events
* fix style of setting warnings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-06 16:55:01 +02:00
Roeland Jago Douma 4b70c9f89d
Add referrer policy setup check
Fixes #9122

Based on https://www.w3.org/TR/referrer-policy/ and
https://scotthelme.co.uk/a-new-security-header-referrer-policy/

Setting a sane Referrer-Policy will tell the browser if/when to send
referrer headers when accessing a link from Nextcloud. When configured
properly this results in less tracking and less leaking of (possibly)
sensitive urls

* Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-04 09:21:35 +02:00
Julius Härtl 10b33cd5d0
Add placeholder to input in OCdialog prompt
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 14:02:25 +02:00
Julius Härtl 33b65faba0
Allow to specify custom text on admin password confirmation dialogs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 14:01:58 +02:00
Maxence Lange 2e3517eb00 display details on sharing panel
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2018-05-21 01:24:45 +02:00
Maxence Lange 0009adae80 SharedWithDisplayName + SharedWithAvatar
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-21 01:24:45 +02:00
Roeland Jago Douma d607e7b924
Move the webui over to the new dav endpoint
We should use the new dav endpoint everywhere now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-08 23:02:19 +02:00
Morris Jobke 43c1e51a5f
Merge pull request #9151 from UncleAlbie/dialog-sort
Sort files in dialog by name.
2018-05-07 18:39:24 +02:00
Roeland Jago Douma 0771dad57f
Do not add sharePermission logic in JS
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 12:14:37 +02:00
Morris Jobke 0bae516c66
Merge pull request #9224 from nextcloud/accessibility-improvements
Add labels for Contacts menu and Settings, thanks to @MarcoZehe
2018-04-19 14:47:17 +02:00
Daniel Calviño Sánchez f8e3b572c8 Remove no longer needed escaping of special characters
The escaping of special characters was needed when the ids of the
permission checkboxes for shares were based on the "shareWith" field.
Since they are based on the "shareId" field the escaping is no longer
needed, as the "sharedId" is expected to always contain compatible
characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-18 17:03:45 +02:00
Daniel Calviño Sánchez 1466586033 Fix ids of permission checkboxes for shares
The ids of permission checkboxes for shares were generated using the
"shareWith" field of the share. The "shareWith" field can contain spaces
(as spaces are allowed, for example, in user or circle names), so this
could cause the id attribute of the HTML element to contain spaces too,
which is forbidden by the HTML specification.

It is not just a "formal" issue, though; when the list was rendered, if
the id contained a space the selector to get the checkbox element was
wrong (as it ended being something like
"#canEdit-view1-name with spaces") and thus the initial state of the
checkbox was not properly set.

Besides that, "shareWith" can contain too single quotes, which would
even cause the jQuery selector to abort the search and leave the UI in
an invalid state.

Instead of adding more cases to the regular expression to escape special
characters and apply it too when the ids are created now the ids of
permission checkboxes for shares are based on the "shareId" field
instead of on "shareWith", as "shareId" is expected to always contain
compatible characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-18 15:25:23 +02:00
Jan-Christoph Borchardt df3c1ac283
Add proper ARIA attributes and structure to header for accessibility, thanks to @MarcoZehe
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-04-18 15:07:42 +02:00
Patrik Novotný e977246d7c Sort files in dialog by name.
Signed-off-by: Patrik Novotný <patrik.novotny@gmx.com>
2018-04-18 08:44:40 +02:00
John Molakvoæ (skjnldsv) 6cb40cf0c4
Fix js tests with placeholder
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-13 10:20:51 +02:00
Jan-Christoph Borchardt 04f47a7653
Merge pull request #8535 from nextcloud/new-color-generator
New color generator algorithm
2018-04-12 14:37:53 +02:00
Morris Jobke d3f2b6aef4
Merge pull request #8820 from nextcloud/mtime-sort
Sorts filepicker files by modified date
2018-04-12 10:54:44 +02:00
Jan-Christoph Borchardt 8d27dce716
Merge pull request #9002 from nextcloud/whitespace
More whitespace: Increase header height from 45px to 50
2018-04-10 23:05:01 +02:00
John Molakvoæ (skjnldsv) 275b9868b2
Fixed documentation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-06 21:32:45 +02:00
John Molakvoæ (skjnldsv) bca8d83f02
New algorithm
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-06 21:32:44 +02:00
Julius Härtl 2e60f91ab1
Move external share saving to template
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 13:11:55 +02:00
Julius Härtl bbeb3402b6
Move styling and menu handling to publicpage.js
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 12:21:39 +02:00
Julius Härtl 4a3538bbd8
Fix app menu, popovers and searchbox
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-04 15:05:58 +02:00
Daniel Calviño Sánchez 203bf51543 Keep showing the working icon while there are pending operations
Before, whenever a pending operation (getting the suggestions,
confirming a share or selecting a recipient) finished the working icon
was hidden and the confirm button was shown again, even if there were
other pending operations (the most common case is typing slowly on the
input field, as several operations to get the suggestions could pile if
the server response is not received fast enough). Now, the working icon
is not hidden until the last pending operation finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:35:26 +01:00
Daniel Calviño Sánchez a2c52cd6a5 Extract code to restore the UI after confirming a share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:35:23 +01:00
Daniel Calviño Sánchez 9a0fbe307d Discard cached suggestions when adding a share
The suggestions depend on the results returned by the server, but also
on the sharees already shared with. Due to that adding a share changes
the suggestions, so now the cached suggestions are discarded when a
share is added.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:34:14 +01:00
Daniel Calviño Sánchez 6eb5cc5412 Reuse last suggestions if the same parameters are used
When a share is confirmed the suggestions are got to check if there is
an exact match. Usually the suggestions were already got with the same
parameters in order to fill the autocomplete dropdown, so to avoid a
superfluous request now the last suggestions are reused when got again,
although only if the same parameters as the last time are used.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:31:08 +01:00
Daniel Calviño Sánchez 10a4f8e45e Confirm a share also by pressing enter on the input field
Besides confirming a share by clicking on the confirm button now it is
possible to do it by pressing enter on the input field.

Clicking on the confirm button implicitly hides the autocomplete
dropdown. On the other hand, pressing enter on the input field does not,
so the autocompletion must be disabled and closed when the confirmation
begins and then enabled again once it finishes. Otherwise the
autocomplete dropdown would be visible and it would be possible to
interact with it while the share is being confirmed.

The order in which the input field and the autompletion are disabled is
important. Internally, the autocompletion sets a timeout when the input
field is modified that requests the suggestions to the server and then
shows them in the dropdown. That timeout is not cancelled when the
autocompletion is disabled, but when the input field loses its focus and
the autocompletion is not disabled. Therefore, the input field has to be
disabled (which causes it to lose the focus) before the autocompletion
is disabled. Otherwise it could happen that while a share is being
confirmed the timeout ends, so an autocompletion request is sent and
then, once the share is successfully confirmed and thus the
autocompletion is enabled again, the request is received and the
autocomplete dropdown is shown with the old suggestions. Strange, but
possible nevertheless ;-)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:05 +01:00
Daniel Calviño Sánchez 9371b61c4d Add a share when clicking on the confirm button
Clicking on the confirm button now adds a share, but only if there is
just a single exact match. If there are no exact matches or there is
more than one exact match no share is added, and the autocomplete
dropdown is shown again with all the suggestions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:05 +01:00
Daniel Calviño Sánchez 5e2a8cca1b Return also exact matches besides all suggestions
"_getSuggestions" returned all the suggestions from the server, which
are composed by exact matches and partial matches. Now the exact matches
are also returned on their own parameter. This will be used by the
button to confirm a share.

Note that until now the order of the suggestions was "exact users,
partial users, exact groups, partial groups, exact..."; this commit also
changes that order to become "exact users, exact groups, exact...,
partial users, partial groups, partial...". This is not a problem, as
the suggestions were used in the autocomplete dropdown, and this new
order is arguably better than the old one, as all exact matches appear
now at the beginning.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 89b0e34d9b Extract code to filter suggestions to its own function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 1c440519c2 Show an error when getting the suggestions succeeds with failure content
Instead of silently failing now an error is shown to the user when the
ajax call to get the suggestions succeeds yet it returns failure content
(for example, if an "OCSBadRequestException" was thrown in the server).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez ed1452d7a0 Use "showTemporary" instead of explicitly hiding the notification
"OC.Notification.hide" expects the notification to be hidden to be
passed as an argument. As it was being used to show a temporary
notification the combination of "OC.Notification.show" and
"OC.Notification.hide" was replaced by a single call to
"OC.Notification.showTemporary".

The timeout could have been specified in the options of the call, but it
was left to the default value (7 seconds) for consistency with other
notifications.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez fcef15af80 Move stub setup outside the test method
Stubs should be restored outside the test method in which they are used
to ensure that they are properly restored no matter the result of the
test (for example, if an exception is thrown).

Besides that, this will make possible to reuse the stub in other sibling
tests without having to explicitly setup it in them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez d606219576 Extract code to get suggestions to its own method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 3980364b6d Add autocompletion tests for each type of share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 8af9c553e6 Add tests for exact search results already shared with
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 375eab9df3 Add tests for emails and circles already shared with
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez 6fef01c481 Adjust search term to test
As the server response is faked the search term is ignored in the tests.
However, it is clearer to use a search term that would make the server
return what the faked response contains.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:03 +01:00
Jan-Christoph Borchardt ce7775acd0 Replace information icon with confirmation button in share input
The confirmation button right now is just an icon; its behaviour will be
added in the following commits.

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-03-20 19:09:03 +01:00
Daniel Calviño Sánchez ed4b4458eb Use the display name in the avatar for a circle share
Before, the avatar for a circle share was generated using the
"share_with" field as the seed for "imageplaceholder". Due to this, when
the "share_with" field is set to the circle ID the character shown in
the avatar was just a random character instead of the first character of
the display name. Now the "share_with" is still used as the seed for the
colour, but the display name is used as the text of the avatar.

This adds support for "share_with" fields set to the circle ID while
being backwards compatible with "share_with" fields set to the circle
name.

Note that when "share_with" fields is set to the circle name the colour
of the avatar is different in the list of suggested sharees and in the
list of current sharees, but that also happened before these changes
(due to a different seed being used in each place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-16 04:58:25 +01:00
Sagorika Das 6bac63adec sorts filepicker files by modified date
Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
2018-03-14 18:11:50 +05:30
Christoph Wurst b9720703e8 Add CSRF token controller to retrieve the current CSRF token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-03-08 16:48:50 +01:00
John Molakvoæ (skjnldsv) 72861f2dfb
Use correct variables
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-04 14:12:29 +01:00
John Molakvoæ (skjnldsv) 15a3caedc0
Create special option to toggle header menu container
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-04 14:12:29 +01:00
John Molakvoæ (skjnldsv) 67699f9506
Clean scss, use proper loading icon and menu position on narrow screens
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-04 14:12:28 +01:00
Roeland Jago Douma ad7ddbc068
Set autocomplete=new-password for mail share password
This avoids the browser to do autocompletion on the mail share password
field.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-28 13:47:06 +01:00
Morris Jobke 7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms
Let the admin configure the default share permissions
2018-02-27 13:44:34 +01:00
Morris Jobke 20ec0344a2
Fix JSDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-27 12:29:25 +01:00
Vincent Petry 7466468af1
Fix share capabilities JS tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle 1615312bf1
add share permissions to settings page
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle 7d0102bf73
expose capabilities in js
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Julius Härtl d07d66e24b
Add public template
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:52 +01:00
Morris Jobke 452e96e2a7
Merge pull request #8390 from dasisdormax/master
Add indeterminate state to share permission checkbox
2018-02-26 16:17:35 +01:00
Christoph Wurst 3992484323
Remove unused var in OC.Notification.showTemporary
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-02-19 11:00:58 +01:00
Maximilian Wende 7c453b2425
Update tests for indeterminate state, fix slashes not being escaped
Signed-off-by: Maximilian Wende <dasisdormax@mailbox.org>
2018-02-16 11:42:41 +01:00
Maximilian Wende 602f50b2d4
Fix indeterminate checkbox state not showing correctly
Also, the checkbox is updated to the correct state while a
permission change is in progress.

should fix issue #8371

Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
2018-02-15 22:41:09 +01:00
Maximilian Wende d4238a52b2
Add indeterminate state to 'can edit' share permission checkbox, see #8371
Signed-off-by: Maximilian Wende <dasisdormax@secure.mailbox.org>
2018-02-15 21:10:39 +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
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
Allan Nordhøy e81f30b124
Spelling: FreeType 2018-01-14 16:01:23 +01:00
Allan Nordhøy 13d8b7f190
Spelling: FreeType 2018-01-14 15:58:36 +01:00
Morris Jobke 33b82f34be
Merge pull request #7709 from nextcloud/fix-password-displayed-as-username-in-password-manager
Fix password displayed as username in Firefox password manager dialog
2018-01-11 15:21:35 +01:00
Morris Jobke a987f39565
Merge pull request #7650 from rpirritano/master
made small changes to login screen
2018-01-11 13:55:39 +01:00
Robert Pirritano a82c8f58cc
made small changes to login screen
added height back 70px back to footer and removed .htaccess file

Signed-off-by: Robert R Pirritano <rpirritano@gmail.com>
2018-01-11 12:37:47 +01:00
Thomas Citharel feb4dc383e Adds rel="noopener noreferrer" to _blank links inside comments
For more details, check out https://mathiasbynens.github.io/rel-noopener/ for instance

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-01-11 11:02:45 +01:00
Roeland Jago Douma 03a7d9bbfa
Merge pull request #7635 from Abijeet/bug-7106
Fixes password input being prompted every time.
2018-01-10 20:10:40 +01:00
Daniel Calviño Sánchez 9c22e99331 Add extra test cases for password confirmation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-10 16:42:25 +01:00
Abijeet b246ca96ff Added test cases for the fix for the password confirmation box appearing repeatedly.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-10 16:41:27 +01:00
Abijeet de5467811a Fixes password input being prompted every time.
Fixes #7106

- Echoing the current server time via a JS variable and storing the current time on page load in JS.
- Calculating the diff and taking it into account when deciding whether to show the password confirmation.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-08 23:47:52 +05:30
Arthur Schiwon 770c744e45
opens comments links in _blank 🙊
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 16:06:24 +01:00
Julius Härtl fd8f0788b1
Fix tests
The avatar plugin should not change the display element, since the
avatar is always shown by default and the display value is up to the
developers

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:36:06 +01:00
Julius Härtl 04a18098e4
Remove show() function since we always show the avatar container
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:36:06 +01:00
Morris Jobke 05bcdf937b
Merge pull request #7477 from nextcloud/date-time-picker-position-fix
Date time picker position fix & design fixes
2018-01-05 10:54:32 +01:00
John Molakvoæ (skjnldsv) 6127d19f54
Fixed default expire date and placeholder
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:26:01 +01:00
Daniel Calviño Sánchez 58d00bf6fb Fix password displayed as username in Firefox password manager dialog
When finishing the setup of Nextcloud through the WebUI (setting admin
user and database) Firefox offers to save the username and password.
However, the password was shown in both the username and password fields
of the Firefox password manager dialog.

The problem was that the password input element (in the HTML form) is
cloned in a text input element, which is used to show the password in
plain text when clicking on the "Show password" button. As it was a text
input immediately followed by a password input Firefox seemed to assume
that it had to be the username and ignored the real username field, no
matter the value set for the "autocomplete" attribute. Now the cloned
text input is added after the password input, so Firefox no longer
thinks that the cloned text input is the username field and the password
manager dialog shows the proper username instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-05 02:45:34 +01:00
splitt3r 6ca7a3e650 Fixed js typehint for showHtml method 2018-01-04 10:05:15 +01:00
John Molakvoæ (skjnldsv) bcad10075e
Share datepicker fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 14:02:45 +01:00
Arthur Schiwon 282567fced
format links in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:11:20 +01:00
blizzz 02b092f358
Merge pull request #7487 from nextcloud/no-password-confirm-with-sso
disable password confirmation with SSO
2018-01-03 11:48:45 +01:00
Morris Jobke 9d43724d45
Merge pull request #7526 from nextcloud/make-possible-for-apps-to-disable-the-navigation-bar-slide-gesture
Make possible for apps to disable the navigation bar slide gesture
2018-01-03 00:12:54 +01:00
Bjoern Schiessle 1bcbeb24bc
disable password confirmation with SSO
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-02 20:30:37 +01:00
Roeland Jago Douma 325637f4f3
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:27 +01:00
Roeland Jago Douma 328047f638
Also do callback on the failing function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Julius Härtl d497f79625
Fix fallback when image loading fails
With the new avatar endpoint there is no difference between unknown
users and errors when generating the placeholder avatar. Therefore the
avatar function will now show the old placeholder if both a user and
displayname was given as parameters.

In case there is no displayname provided we cannot build the proper
placeholder so the unknown user placeholder is shown.

The displayname is not required for the avatar anymore, so we can
get rid of the old code path for placeholders.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma 6b5e3a9365
Still call callback once avatar is loaded
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00