David Baker
f4460ca78f
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2
2020-06-26 13:12:06 +01:00
Andrew Morgan
6ea5dc7b7c
Change the look of the spinner
2020-06-26 01:19:38 +01:00
David Baker
6ce8584337
Implement first screen (recovery key / passphrase choice)
2020-06-23 15:04:39 +01:00
Travis Ralston
58671f014b
Merge pull request #4765 from matrix-org/travis/room-list/show-less
...
Add a 'show less' button to the new room list
2020-06-17 10:24:50 -06:00
Travis Ralston
d2831ffb0c
Merge pull request #4758 from matrix-org/travis/room-list/sticky
...
Sticky and collapsing headers for new room list
2020-06-17 08:28:38 -06:00
Travis Ralston
bcebef7e56
Add a globe icon to public rooms
...
For https://github.com/vector-im/riot-web/issues/14039
2020-06-16 12:13:12 -06:00
Travis Ralston
84e60ee439
Add a 'show less' button to the new room list
2020-06-15 20:00:09 -06:00
Travis Ralston
4186070489
Support list collapsing and jumping
...
Fixes https://github.com/vector-im/riot-web/issues/14036
2020-06-15 19:47:43 -06:00
Travis Ralston
0755b4c148
Add a context menu to rooms in the new room list
...
The tag options are not implemented out of concern for diff size.
This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.
Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.
This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
2020-06-09 23:09:15 -06:00
Travis Ralston
5114c37b82
Add filtering and exploring to the new room list
...
This is per the designs. Animation doesn't feel required here.
Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
2020-06-08 20:33:21 -06:00
Travis Ralston
8e0247afe5
Add most of the UI for the new room list's menu button
...
Incomplete implementation: buttons don't work, some text is missing, etc
2020-06-07 22:06:41 -06:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
...
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325
Delete files.png and change UploadConfirmDialog to use svg used elsewhere
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist
711ddd42c9
Remove some unused images
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Michael Telatynski
d99babfe05
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
2020-06-02 21:51:05 +01:00
Michael Telatynski
702bbe3bcd
Add e2ee-default:false notice to Setting>Security
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:14 +01:00
Michael Telatynski
f40cfe4a3b
Implement new design with new iconography
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 15:00:27 +01:00
Jorik Schellekens
6d9d4ee547
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-05-20 13:46:17 +01:00
Michael Telatynski
d63008f9c5
Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0
...
Replace png flags and add Kosovo to country code dropdown
2020-05-13 09:58:10 +01:00
Michael Telatynski
004f75f289
Rename trash (custom).svg
as electron doesn't like serving files with spaces
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 16:16:47 +01:00
Michael Telatynski
3bb800bb81
Replace png flags with use of Twemoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:18 +01:00
Michael Telatynski
f0085a9feb
Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign
2020-05-07 09:56:21 +01:00
Jorik Schellekens
1b83faaa8d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-04-28 15:38:46 +01:00
Bruno Windels
e8e99c2646
Use color values for default avatar backgrounds
...
We still need to convert them to URLs for the notification icon,
so use a canvas (with a cache in front of it) to do that.
2020-04-27 19:35:38 +02:00
Michael Telatynski
e16f511527
Redesign redactions
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:07:39 +01:00
Jorik Schellekens
600a812227
Add brush icon for appearance setting tab
2020-04-23 12:20:10 +01:00
Michael Telatynski
a06401a83e
stage new artifacts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:57:00 +01:00
Michael Telatynski
cd65bdc799
Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
...
Conflicts:
src/components/views/rooms/RoomBreadcrumbs.js
src/components/views/rooms/RoomTile.js
2020-04-17 12:58:54 +01:00
Michael Telatynski
5c8ad71a15
add missing assets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:03:49 +01:00
Michael Telatynski
3612073852
Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:12:19 +01:00
Michael Telatynski
3628fd2ea2
add missing asset
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:18:33 +00:00
J. Ryan Stinnett
673fb792e5
Remove unused power level icons
2020-01-30 22:09:57 +00:00
Michael Telatynski
33b5d42c06
Be consistent about our settings svg, free the other one
2020-01-22 15:34:17 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons
...
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
2020-01-13 12:20:32 +00:00
Travis Ralston
ad33a2322e
Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids
...
Support 3PIDs (email addresses) in the invite dialog
2020-01-09 14:13:32 -07:00
Travis Ralston
2caebef7a1
Make the SVG smaller
2020-01-09 13:40:35 -07:00
Travis Ralston
94e9c6ac9f
Make the SVG smaller
2020-01-09 13:38:47 -07:00
Zoe
e9032a9f61
Move the lock icon within the feather-customised directory
2020-01-09 16:00:36 +00:00
Zoe
5d22561815
Display a padlock icon beside encrypted rooms in the room list
...
https://github.com/vector-im/riot-web/issues/11226
2020-01-09 15:42:31 +00:00
Travis Ralston
79ab69353c
Support searching for 3PIDs from the invite dialog
...
Part of https://github.com/vector-im/riot-web/issues/11199
2020-01-08 20:49:29 -07:00
Travis Ralston
ffd40c2c40
Initial editor for user list selection
...
For https://github.com/vector-im/riot-web/issues/11199
2020-01-07 12:13:40 -07:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info
2019-12-30 17:09:05 +01:00
Michael Telatynski
b2249d0561
Initial rejig
2019-12-19 20:09:05 +00:00
Michael Telatynski
6f5ac780fa
Use new image.svg placeholder for AvatarSetting in Rooms
2019-12-16 16:19:43 +00:00
Half-Shot
626ab17ed3
Styling
2019-12-09 13:22:45 +00:00
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons
...
Fix e2e icons
2019-11-21 19:01:17 +00:00
Bruno Windels
3cddcad5de
use correct icons with borders
2019-11-21 18:12:32 +01:00
Travis Ralston
fd12eb28e7
Move many widget options to a context menu
...
Part of https://github.com/vector-im/riot-web/issues/11262
2019-11-20 19:17:42 -07:00
Bruno Windels
b278531f2f
add IconButton as in design
2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc
use normal shield for verification requests
2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9
restyle e2e icons
2019-11-15 16:14:18 +01:00
Tulir Asokan
be829980f6
Split inline SVGs to their own files
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-20 12:13:32 +03:00
Travis Ralston
4b0596b6b7
Apply lipstick to hidden image design
2019-10-01 17:00:01 -06:00
Bruno Windels
80dd5a1b0a
add explore button next to filter field
2019-09-10 10:55:55 +02:00
Bruno Windels
65ddfc0a50
show format bar when text is selected
2019-09-04 16:35:03 +02:00
J. Ryan Stinnett
8926992feb
Add react button to action bar
...
This adds a (temporarily non-functional) react button to the action bar.
Part of https://github.com/vector-im/riot-web/issues/9753
2019-06-25 15:12:30 +01:00
Bruno Windels
52c4d7b6b0
fixup edit icon
2019-05-15 15:53:02 +01:00
Bruno Windels
edc100163f
Merge pull request #2952 from matrix-org/bwindels/message-edit-editor
...
Initial support for editing messages
2019-05-15 09:23:01 +00:00
Bruno Windels
6b932d58e6
remove cruft from edit icon
2019-05-15 10:10:29 +01:00
J. Ryan Stinnett
1421e8e06b
Tweak reply arrow and hover color
2019-05-15 09:12:53 +01:00
Bruno Windels
6599d605cd
wire up editor component (somewhat hacky)
2019-05-14 15:38:16 +01:00
J. Ryan Stinnett
739c8c0314
Promote reply button up to message action bar
...
This moves the reply action out of the existing options menu and up to the
message action bar for easier access.
2019-04-29 15:53:03 +01:00
J. Ryan Stinnett
8ef9fe951d
Update styling of message action bar for multiple buttons
...
This applies the new design for multiple buttons in the message action bar,
paving the way for more things to appear here.
In addition, this changes the existing options button to use the three vertical
dots icon. Some theme colors are also tweaked to align with what they were meant
to be from the unified palette.
2019-04-29 15:20:51 +01:00
J. Ryan Stinnett
37e09b5569
Add check and x icons for validation feedback
...
Adds icons from the Feather set with the same color as text. Tweaks validation
item spacing to match the design.
2019-04-25 14:29:09 +01:00
J. Ryan Stinnett
12f7d1715b
Remove BottomLeftMenu and supporting bits
...
The `BottomLeftMenu` component is not used in the new design. This removes the
component and also any images and sub-components that were only used by it.
2019-04-09 17:38:32 +01:00
YaoiFangirl420
9bd1ba60f5
Add option to rotate images
...
cf. https://github.com/vector-im/riot-web/issues/9257
Add rotate clockwise/counterclockwise buttons to <ImageView>
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-04 01:48:41 -07:00
David Baker
2055be36f1
Add the image
2019-03-05 16:49:12 +00:00
J. Ryan Stinnett
4b340450b9
Rename Feather icon directory to feather-customised
...
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
2019-02-27 10:42:10 +00:00
J. Ryan Stinnett
1a89a4e87d
Move logos out of feather dir
...
These clearly aren't from the Feather set.
2019-02-26 20:41:33 +00:00
J. Ryan Stinnett
3b3f0ea957
Move E2E icons out of feather dir
...
They appear to all be created by Nad, according to
https://github.com/matrix-org/matrix-react-sdk/pull/2557 .
2019-02-26 20:31:32 +00:00
J. Ryan Stinnett
567280ae3d
Remove unreferenced images
...
Now that images flow through a build step, it's easy to spot which ones aren't
actually used. To determine this, I built Riot with the hash in file names
disabled, and then used a directory compare tool to look for all images in the
SDK that did not make it into the Riot build.
Fixes https://github.com/vector-im/riot-web/issues/8158
2019-02-20 18:33:00 +00:00
J. Ryan Stinnett
5fb990eb5f
Convert Markdown button to SVG mask
...
This makes it easier to theme via CSS, which helps with the dark theme.
2019-02-18 18:26:52 +00:00
Nad Chishtie
eec761a921
Merge pull request #2633 from matrix-org/nadonomy/icon-diet
...
Skinnified more icons
2019-02-14 16:53:58 +00:00
David Baker
7845a63506
Remove 'welcome' from top-left menu
...
Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.
Reverts 116367fd69
2019-02-14 15:53:52 +00:00
Nad Chishtie
9aa3640e93
Tweaked more icons.
2019-02-13 19:44:45 +00:00
J. Ryan Stinnett
694a59afb7
Merge pull request #2628 from jryans/adjust-top-left-menu
...
Adjust top left menu items
2019-02-13 17:38:08 +00:00
J. Ryan Stinnett
ed0fc12f98
Tweak stroke width
2019-02-13 16:17:40 +00:00
J. Ryan Stinnett
116367fd69
Add welcome to top left menu for all
2019-02-13 16:13:32 +00:00
Nad Chishtie
4aa0f56b06
Normalised icon strokes to 1px
2019-02-13 16:11:18 +00:00
J. Ryan Stinnett
22789ada94
Add sign in to top left menu for guests
2019-02-13 16:01:13 +00:00
Matthew Hodgson
914b3e70d5
make warning triangle less random
2019-02-12 20:03:37 +00:00
J. Ryan Stinnett
69af0b82c8
Update avatar colors
2019-02-08 17:34:01 +00:00
J. Ryan Stinnett
5ab3c8b823
Add top left home menu item when home page configured
2019-02-08 13:48:51 +00:00
Bruno Windels
e2ce12f5c1
wip
2019-02-01 23:15:14 +01:00
Bruno Windels
ce5e56aaac
update icons in member info device section
2019-02-01 17:32:46 +01:00
Bruno Windels
48c0e5a3ac
update icons
2019-02-01 16:44:16 +01:00
Bruno Windels
88ad780b6b
update message e2e icons
...
also remove encrypted icon as header/composer already indicate encryption
2019-02-01 16:43:12 +01:00
Bruno Windels
f2928c184d
create warning/verified icon to use in header/composer/member info
2019-02-01 13:39:56 +01:00
J. Ryan Stinnett
de46e6aa0d
Use dropdown-arrow for all toggle arrows
2019-01-30 16:39:07 -06:00
Bruno Windels
6ffc5e093d
add icons to top left menu options
2019-01-29 16:56:07 +01:00
J. Ryan Stinnett
20bf683df8
Merge pull request #2517 from jryans/auth-server-type-selector
...
Add server type selector and style login flow
2019-01-28 22:11:14 -06:00
J. Ryan Stinnett
a6003dc638
Restore SVG indentation
2019-01-28 21:56:18 -06:00
Travis Ralston
d34390d230
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair
...
Implement flair tab in user settings
2019-01-28 20:37:22 -07:00
J. Ryan Stinnett
7edd99c48c
Change matrix.org logo to avoid fonts
2019-01-28 21:19:49 -06:00
Travis Ralston
3d59cf996f
Icon for flair tab
2019-01-28 10:24:18 -07:00
J. Ryan Stinnett
0bee324e48
Add server type selector component
2019-01-28 08:52:20 -06:00
Travis Ralston
535d42684f
Initial structure for new room settings
2019-01-25 13:09:44 -07:00
Travis Ralston
f1c1caac62
Implement labs tab in new user settings
2019-01-24 08:52:45 -07:00
Travis Ralston
2a9f6186d7
Merge pull request #2491 from matrix-org/travis/usettings/tab/general
...
Implement the "General" tab of new user settings
2019-01-24 08:51:11 -07:00
Travis Ralston
f643d7a143
Finish the box for displayname/avatar changes
2019-01-23 09:27:04 -07:00
J. Ryan Stinnett
523d910c66
Use new dropdown arrow for language selector
2019-01-23 10:18:06 -06:00
Travis Ralston
94b1d739fb
Merge pull request #2476 from matrix-org/travis/modal-tab-settings
...
Basic structure for tabbed user settings
2019-01-23 07:52:44 -07:00
Bruno Windels
5dd5f4f1dc
add JumpToBottomButtom component
2019-01-22 14:49:04 +01:00
Travis Ralston
c3692aa9ae
Use the right icons, sizing, and font families for things
2019-01-21 16:51:43 -07:00
Bruno Windels
8c30d05eb8
Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental"
...
This reverts commit ece5cb1fcc
, reversing
changes made to 64a3d2521c
.
2019-01-17 10:29:37 +01:00
J. Ryan Stinnett
5b88b64950
Rework custom status context menu
...
This updates the custom status context menu to match the latest comps. A single
button is used for setting / clearing, depending on what is appropriate.
The state logic is also changed to depend on events and storage from js-sdk for
the committed status message. This makes it easy to distinguish the value being
edited from what's currently committed.
2019-01-15 10:54:29 -06:00
Bruno Windels
9e67dbf008
change icon
2019-01-08 14:35:26 +01:00
Bruno Windels
7227049c2a
add right panel toggle button to room header when in grid
2019-01-08 12:05:39 +01:00
Bruno Windels
290dc9d8fb
Merge branch 'experimental' into bwindels/roomgridview-experimental
2019-01-07 14:17:57 +01:00
Travis Ralston
8017f0a4a1
Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real
2019-01-03 16:00:23 -07:00
David Baker
f928be6f59
Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
...
This reverts commit ad47144355
.
2019-01-03 15:37:03 -07:00
David Baker
7d161de35b
Partial merge of develop to experimental
...
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
Nad Chishtie
d7473c4f4d
Various colour, contrast and legibility improvements.
2018-12-20 11:35:21 +00:00
Nad Chishtie
6c2d2f60cf
Polished left left panel.
2018-12-20 11:34:20 +00:00
Nad Chishtie
b61aa33e99
Tint input icon.
2018-12-20 11:33:53 +00:00
Travis Ralston
a1347add95
Merge branch 'develop' into travis/custom-status
2018-12-19 10:33:34 -07:00
Bruno Windels
b826b0d998
Add redesign feedback dialog + button in tag panel
2018-12-19 12:27:05 +01:00
Nad Chishtie
e09121556d
Use a more sane SVG.
2018-12-19 09:28:33 +00:00
Nad Chishtie
074c96cd3e
First pass of normalising icons.
2018-12-18 16:48:20 +00:00
J. Ryan Stinnett
acc2e98355
Add New Recovery Method dialog
...
Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.
The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00:00
Travis Ralston
c6f35428d7
Update checkmark icon
2018-12-13 09:37:54 -07:00
Bruno Windels
0ffd77762a
make menu option look somewhat better
2018-12-13 13:02:35 +01:00
Travis Ralston
a91963e5ee
Replace the avatar next to the composer with a status entry menu
...
The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out.
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 18:03:30 -07:00
Bruno Windels
9f5a0250bf
Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased
...
Redesign: restyle jump to first unread message & rework read marker logic (rebased)
2018-12-12 10:13:51 +00:00
Bruno Windels
ac9902e52a
apply redesign to topunreadmessagebar
...
with placeholder for message count
2018-12-11 15:43:00 +01:00
Bruno Windels
ccf65d5f3c
remove background from group room list header button
2018-12-10 17:45:47 +01:00
Bruno Windels
fe76287035
style communities button, make it visible again
2018-12-10 15:43:48 +01:00
Bruno Windels
741e106565
update animation image and location
2018-11-13 18:30:14 +01:00
Bruno Windels
9e95a1402c
Merge pull request #2269 from matrix-org/bwindels/roomlistpolish
...
Redesign: room list visual polish
2018-11-07 11:44:47 +00:00
Bruno Windels
665d424758
use svg icon in add room button
2018-11-05 14:25:28 +01:00
Bruno Windels
3cd32e2f44
update search icon(s)
2018-11-05 13:07:49 +01:00
Bruno Windels
1d77a67683
fix room list chevron
2018-11-05 10:09:05 +01:00
Bruno Windels
701dd6d33f
restyle search close button
2018-11-05 09:54:14 +01:00
Bruno Windels
8c62dddb32
one big commit, sorry
...
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
2018-10-24 13:50:58 +02:00
Bruno Windels
f7d59bc338
new icons
...
also remove green from the icons that are not present in new design yet
2018-10-23 18:09:21 +02:00
Bruno Windels
91ec96c8d3
Merge branch 'develop' into bwindels/redesign
2018-09-21 12:44:44 +02:00
David Baker
2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone
...
Support m.room.tombstone events
2018-08-29 18:38:48 +01:00
David Baker
c54578d529
Forgot the image file
2018-08-21 17:56:28 +01:00
David Baker
c4235ca20a
Add the image
2018-08-21 17:50:59 +01:00
Matthew Hodgson
9783b6100d
Merge branch 'develop' into matthew/dharma
2018-07-29 17:03:23 +01:00
Matthew Hodgson
efdc5430d7
merge develop
2018-07-09 17:50:07 +01:00
David Baker
7bce29db6e
Replace share icons
...
with ones that look a bit more like the actual logos those sites use now
2018-06-27 17:17:44 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
5cc2361737
change not_sent e2e lock to match colour of text
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:21:55 +01:00
Matthew Hodgson
3bf28a08ec
experiments in dharma
2018-05-25 03:17:29 +01:00
Matthew Hodgson
294565c47e
switch code schema to match slate-md-serializer
2018-05-23 14:12:36 +01:00
Richard Lewis
6df3371c6c
Add a "reload widget" button.
2018-05-22 19:14:54 +01:00
Matthew Hodgson
f981d7b729
unify buttons on the node type names, and make them work
2018-05-20 22:39:40 +01:00
Richard Lewis
0f0e89d394
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 12:49:30 +01:00
Matthew Hodgson
8ce4df7ce3
move non-Riot image resources over from riot-web
2018-04-12 00:25:07 +01:00