mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 01:51:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
14181 commits 219 branches 562 tags 474 MiB
Commit graph

2936 commits

Author SHA1 Message Date
J. Ryan Stinnett
3afc455f3c Extract each phase to a separate function 2019-02-06 18:00:58 +00:00
Bruno Windels
d501ce0553 increase debouncing of filtering because its quite laggy atm 2019-02-06 17:25:56 +00:00
J. Ryan Stinnett
a61de03a88 Remove left over TODO 2019-02-06 16:32:22 +00:00
J. Ryan Stinnett
b20f1d1240 Convert forgot password to phases like the other flows 2019-02-06 16:30:53 +00:00
J. Ryan Stinnett
8aff6b2e45 Add your account header to reset password 2019-02-06 16:14:21 +00:00
J. Ryan Stinnett
8e12c4a3b8 Normalize URL naming for reset password 2019-02-06 15:58:31 +00:00
J. Ryan Stinnett
8c6dc002f3 Add new footer text to reset password 2019-02-06 15:46:25 +00:00
J. Ryan Stinnett
5d0798ed24 Tweak field labels on reset password 2019-02-06 15:16:54 +00:00
J. Ryan Stinnett
ccf7e75c95 Group fields into rows on reset password 2019-02-06 15:10:16 +00:00
Bruno Windels
0ab6ab639e render badge on custom tag in LLP 2019-02-06 11:21:50 +00:00
Bruno Windels
7b367e267b move sublist badge aggregation code to RoomNotifs to reuse for tags/comm 2019-02-06 10:51:29 +00:00
Bruno Windels
137ff984c7 rather unsophisticated attempt at trimming common prefixes for avatar 2019-02-05 19:12:34 +00:00
Bruno Windels
604020dd59 add selectable custom tags below tag panel 2019-02-05 17:39:02 +00:00
Bruno Windels
bdc7936130 move help & communities button out of tag panel 
so we can shove the custom tag buttons between them
in the next commit
 2019-02-05 17:36:33 +00:00
J. Ryan Stinnett
6549ae1ce5 Remove unused props from login 2019-02-05 16:11:32 +00:00
J. Ryan Stinnett
02a20fa668 Tweak login wording to match design 2019-02-05 15:36:00 +00:00
J. Ryan Stinnett
dbe14c5527 Enable phases for login, but start on the login phase by default 2019-02-05 14:43:29 +00:00
J. Ryan Stinnett
4e152f82e7 Remove server types from login 2019-02-05 14:30:45 +00:00
David Baker
74d460b4ca
Merge pull request #2571 from jryans/auth-disable-custom-urls 
Ensure we show registration form when custom URLs are disabled
 2019-02-05 10:54:52 +00:00
David Baker
8598c4f9a0
Merge pull request #2568 from matrix-org/bwindels/fixcollapsesearchterm 
Fix: search term disappears when collapsing and expanding left panel
 2019-02-05 10:45:07 +00:00
J. Ryan Stinnett
a73e3dcd4c Remove unused props from registration 2019-02-05 07:11:29 +00:00
J. Ryan Stinnett
5432b09478 Default to registration phase when custom URLs disabled 2019-02-05 05:25:13 +00:00
Travis Ralston
eac50aa800 Remove old user and room settings 
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.

In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.

Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.

Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
 2019-02-04 13:40:21 -07:00
Bruno Windels
a6d7f6a4c7 remove unused variable 2019-02-04 18:52:10 +00:00
Bruno Windels
bdc3e1173d preserve SearchBox searchTerm state when collapsing 2019-02-04 18:51:41 +00:00
Bruno Windels
3d393b654b clear min-height on ScrollPanel::componentDidUpdate to catch all cases 2019-02-04 18:27:22 +00:00
Travis Ralston
8307af6871
Merge pull request #2563 from matrix-org/travis/remove-e2e-beta-dialog 
Remove warning about encryption being beta
 2019-02-01 15:12:25 -07:00
Bruno Windels
45e982ac13
Merge pull request #2557 from matrix-org/bwindels/e2eicons 
Add e2e icon to room header/composer/member info, more ...
 2019-02-01 22:02:28 +00:00
Travis Ralston
016bd028ba Remove warning about encryption being beta 2019-02-01 14:56:29 -07:00
J. Ryan Stinnett
68ec63d25e
Merge pull request #2562 from jryans/rm-guest-bar 
Remove guest warning bar
 2019-02-01 15:46:43 -06:00
J. Ryan Stinnett
88fc2fb47a Annotate guest state as class on home page 2019-02-01 15:33:05 -06:00
J. Ryan Stinnett
3bfd603dab Remove guest warning bar 2019-02-01 15:28:16 -06:00
Bruno Windels
987b119731 also update e2e icon once the room becomes encrypted 2019-02-01 19:14:11 +01:00
Travis Ralston
728748c9cd Disable old settings, making tabbed settings the default 
This is intentionally not removing the labs flag or other supporting structures of the old settings to make a revert as easy as possible in the event that needs to happen. All of the cruft left behind (TempTab, temp styles, labs flag, old components, etc) will be removed in the very near future.
 2019-02-01 10:29:13 -07:00
Bruno Windels
9134548558 update room status bar warning icon 2019-02-01 17:52:57 +01:00
Bruno Windels
e55dbfc6fe don't show e2e icon in unencrypted rooms upon loading the room 2019-02-01 17:52:27 +01:00
J. Ryan Stinnett
22178f2d7c
Merge pull request #2548 from jryans/auth-reg-disabled 
Add error message when registration is disabled
 2019-02-01 08:59:44 -06:00
J. Ryan Stinnett
e414fe434c Add full stop 2019-02-01 08:32:47 -06:00
J. Ryan Stinnett
918d4490c7 Add more detail to error message 2019-02-01 08:31:54 -06:00
J. Ryan Stinnett
fb39ba1ffc
Merge pull request #2547 from jryans/auth-well-known-state 
Ensure correct server URLs with .well-known and server type
 2019-02-01 08:28:33 -06:00
J. Ryan Stinnett
e6b6133c7a
Merge pull request #2552 from jryans/spell-homeserver 
Spell homeserver correctly
 2019-02-01 08:26:17 -06:00
Bruno Windels
8abb7ebc65 monitor device verification in RoomView and update e2eStatus 2019-02-01 14:35:03 +01:00
J. Ryan Stinnett
68ae72f855 Spell homeserver correctly 2019-01-31 18:52:39 -06:00
Travis Ralston
4036e52c24 Fixed settings dialog header; Adjust padding on dialog 
Some recent changes to dialogs changed how this works and altered the look of the settings dialogs. This fixes that and makes it so that the header and content scroll independently.

Fixes https://github.com/vector-im/riot-web/issues/8329
Fixes https://github.com/vector-im/riot-web/issues/8328
 2019-01-31 15:52:22 -07:00
J. Ryan Stinnett
bc4a603672 Add error message when registration is disabled 2019-01-31 16:02:42 -06:00
Bastian
23971b3d0d Refactor to use HtmlUtils for linkifying and sanitizing 
Signed-off-by: Bastian <matrix@noxware.de>
 2019-01-31 22:36:08 +01:00
J. Ryan Stinnett
f58055c778 Skip .well-known discovery for free server type 2019-01-31 12:01:58 -06:00
J. Ryan Stinnett
6597db6328 Simplify login server URL state 2019-01-31 12:01:17 -06:00
J. Ryan Stinnett
2f006939f2 Use mx_AuthBody prefix for consistency 2019-01-31 10:06:35 -06:00
J. Ryan Stinnett
eafd7e12d0 Validate login phone number on blur 2019-01-31 10:05:39 -06:00
J. Ryan Stinnett
cfe19d710b Avoid hsName for auth headers which can be outdated 
`hsName` uses only the default HS, so that can easily be outdated if the HS URL
is customized.
 2019-01-31 10:05:39 -06:00
J. Ryan Stinnett
f5e3b90fc3 Clear out discovery errors on each try 2019-01-31 10:05:39 -06:00
J. Ryan Stinnett
36d162cb25 Validate server URLs on blur instead of change 2019-01-31 10:05:39 -06:00
Bruno Windels
73b16dd526
Merge pull request #2541 from matrix-org/bwindels/allowlhsexpandwithnarrowviewport 
Allow expanding the left panel manually when in narrow mode
 2019-01-31 12:01:58 +00:00
Bruno Windels
60f28266ae
Merge pull request #2538 from matrix-org/bwindels/community-redesign-cleanup 
Redesign: community page cleanup
 2019-01-31 12:01:08 +00:00
Bruno Windels
31ae35771d
Merge pull request #2536 from matrix-org/bwindels/disable-ilag 
Redesign: Disable ILAG
 2019-01-31 12:00:50 +00:00
Bruno Windels
0450f43267 clarify how lhs collapsed state is stored 2019-01-31 10:19:05 +01:00
Bruno Windels
3251a055c2 allow LoggedInView to override collapseLhs 
by updating prop through the dispatcher instead of
having it's own state that is OR'ed in.

before the state couldn't override the prop and you couldn't
expand the left panel anymore when MatrixChat
decided your viewport was too narrow
 2019-01-31 10:18:54 +01:00
J. Ryan Stinnett
de46e6aa0d Use dropdown-arrow for all toggle arrows 2019-01-30 16:39:07 -06:00
Bruno Windels
be0de104ff make group header as tall as top left menu/room header 2019-01-30 16:24:02 +01:00
Bruno Windels
5ac0e6ba07 replace join_room by view_room as deferred action, as join_room doens't change the page type in matrixchat 2019-01-30 15:45:42 +01:00
Bruno Windels
a0d44003e4 disable ilag 2019-01-30 15:03:11 +01:00
Bruno Windels
4d2a93eaaf
Merge pull request #2527 from jryans/auth-registration 
Style registration flow
 2019-01-30 11:27:45 +00:00
Travis Ralston
190b763c5d Render the home page when viewing the directory 
The only time this happens is if someone goes to #/directory without previously visiting a page (ie: fresh landing).
 2019-01-29 23:25:07 -07:00
J. Ryan Stinnett
379b940bfa Add server details edit link to registration 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
160cc4e156 Wire up server details next button 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
1f78b59a0e Add create your account header 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
23fc4417e8 Wire up server type selector, similar to login flow 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
ad76451655 Use render prefix for JSX methods in Login 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett
2f87d0c8cb Error on top to match login 2019-01-29 17:38:28 -06:00
Bruno Windels
0cce912cf6
Merge pull request #2519 from matrix-org/bwindels/roomdirectory-makeover 
Redesign: room directory makeover
 2019-01-29 19:21:42 +00:00
Travis Ralston
a16eb30cbc
Merge pull request #2518 from matrix-org/travis/rver-cap-support 
Iterate upon the room upgrade warning bar
 2019-01-29 11:29:17 -07:00
Bruno Windels
855dbd7d2b Merge branch 'experimental' into bwindels/roomdirectory-makeover 2019-01-29 18:33:03 +01:00
Bruno Windels
15a74cac15 Merge branch 'experimental' into bwindels/redesign-smallfixes 2019-01-29 18:30:08 +01:00
Travis Ralston
ad276c1fda Merge branch 'experimental' into travis/rsettings/tab/general 2019-01-29 09:11:21 -07:00
Bruno Windels
2db0a9c005 show Guest instead of random username when in guest mode 2019-01-29 16:29:30 +01:00
Bruno Windels
495f264ad5 prevent badge jumping when hovering over sublist 
this was caused by the layout growing wider than it could,
hence the overflow event being triggered.

The overflow event is only supported in FF and we fire the
manual check often enough that the overflow gradient still
reliably (dis)appears when needed.
 2019-01-29 16:20:39 +01:00
Bruno Windels
818061d53b show invite count in invite sublist header 2019-01-29 16:20:25 +01:00
Bruno Windels
7c0f463c91 fix lint 2019-01-29 15:40:19 +01:00
Bruno Windels
9f1b4ac4cc room directory makeover 2019-01-29 15:34:58 +01:00
Bruno Windels
012e358147
Merge pull request #2515 from matrix-org/bwindels/roomlistjslayout-bisbis 
Redesign: switch layout when filtering room sublists
 2019-01-29 09:32:32 +00:00
Bruno Windels
529c48d1b0 avoid whitespace and expand all matching section when filtering 2019-01-29 10:01:55 +01:00
Bruno Windels
cc2b6f9524
Merge pull request #2470 from matrix-org/bwindels/css-scrollbars 
Make native scrollbars prettier
 2019-01-29 08:20:21 +00: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
Travis Ralston
f8de4ba2b0 Iterate upon the room upgrade warning bar 
This lessens the warning for unstable-but-not-official versions while still communicating that the version is unstable. In the future, we may want to make this state dismissable.
 2019-01-28 17:21:33 -07:00
J. Ryan Stinnett
c84198afd1 Disable phases for now 2019-01-28 17:49:24 -06:00
J. Ryan Stinnett
34e2979f98 Add Modular server config screen 2019-01-28 17:32:56 -06:00
J. Ryan Stinnett
c914db53ca Remove unused component ref 2019-01-28 16:52:10 -06:00
J. Ryan Stinnett
d96e814a92 Add link to edit server details 2019-01-28 16:13:19 -06:00
J. Ryan Stinnett
398ded4a91 Switch to two phase login 2019-01-28 14:58:21 -06:00
Travis Ralston
db34666583 Implement leave room button and URL preview settings 2019-01-28 13:54:56 -07:00
Travis Ralston
a1e3887a74
Merge branch 'experimental' into travis/settings/positive 2019-01-28 08:25:40 -07:00
Bruno Windels
55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout 
Redesign: new layout algorithm for room sublists.
 2019-01-28 14:55:31 +00:00
J. Ryan Stinnett
b1f698586e Style SSO login like a button 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
306380d647 Update HS / IS URLs when changing server types 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
cd280ca79f Username is one word 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
350c24c503 Initial wiring of server type selector 2019-01-28 08:52:20 -06:00
J. Ryan Stinnett
fa4ad21e0a Remove dead code for !withToggleButton in ServerConfig 2019-01-28 08:52:20 -06:00
David Baker
b4f02844a8 Merge remote-tracking branch 'origin/experimental' into dbkr/sas 2019-01-28 09:36:39 +00:00
J. Ryan Stinnett
20b7debcaf Remove support for team servers 2019-01-25 16:13:30 -06:00
Bruno Windels
cb9ebf8b8b rerender roomlist when banner gets shown/hidden, to update the layout 2019-01-25 18:47:57 +01:00
Travis Ralston
cb6f415a05 Be more positive with setting labels 
Fixes https://github.com/vector-im/riot-web/issues/6435

This is done through an on-the-fly inverter for the settings. All the settings changed are boolean values, so this should be more than safe to just let happen throughout the SettingsStore. Typically a change like this would be done in the individual handlers (similar to how setting names are remapped to different properties or even different storage locations on the fly), however doing that for this many settings would be a huge nightmare and involve changing *all* the layers. By putting a global "invert this" flag on the setting, we can get away with doing the inversion as the last possible step during a read (or write).

To speed up calculations of the default values, we cache all the inverted values into a lookup table similar to how we represent the defaults already. Without this, the DefaultHandler would need to iterate the setting list and invert the values, slowing things down over time. We invert the value up front so we can keep the generic inversion logic without checking the level ahead of time. It is fully intended that a default value represents the new setting name, not the legacy name.

This commit also includes a debugger for settings because it was hard to visualize what the SettingsStore was doing during development. Some added information is included as it may be helpful for when someone has a problem with their settings and we need to debug it. Typically the debugger would be run in conjunction with `mxSendRageshake`: `mxSettingsStore.debugSetting('showJoinLeaves') && mxSendRageshake('Debugging showJoinLeaves setting')`.
 2019-01-24 20:57:40 -07:00
Travis Ralston
5dc75e2d3c Have the settings dialog be fixed in size 
This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well.
 2019-01-24 19:12:09 -07:00
David Baker
8c412b85ee
Merge pull request #2496 from matrix-org/dbkr/target_blank 
Add target="_blank" to links that don't have it
 2019-01-24 18:15:18 +00:00
David Baker
ade43c4e5b Lint 2019-01-24 17:19:04 +00:00
David Baker
4bcb9f12d4 Add target="_blank" to links that don't have it 
This is now more of a problem in the Electron app because of
https://github.com/electron/electron/issues/8841 but is still
annoying in the webapp if you're taken away from your chat client.

Exception is the SSO link, as commented (issue filed at
https://github.com/vector-im/riot-web/issues/8247).

Fixes https://github.com/vector-im/riot-web/issues/8226
 2019-01-24 16:19:18 +00: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
Bruno Windels
067a861f80 integrate layout/distributor with RoomList 2019-01-24 15:43:49 +01:00
J. Ryan Stinnett
41c79a93c0
Merge pull request #2489 from jryans/auth-text-and-links 
Update text and links in authentication flows
 2019-01-23 18:40:55 -06:00
J. Ryan Stinnett
dccc9dc42f Fix linting error 2019-01-23 18:11:34 -06:00
Travis Ralston
3f897468a6 Add a ToggleSwitch and use it for SettingsFlag 
Also bring in the compact timeline option.

Without minor CSS changes, the old user settings are completely unusable with this change. As such, minimal effort has been put in to have it be useful. Similarly, the changes drop the use of radio groups and the old theme selector was the only one that used it. See the comments for more details on how/why this was mitigated the way it was.
 2019-01-23 15:50:41 -07:00
J. Ryan Stinnett
9f5f552be1 Move LanguageSelector to views 
It's too simple to be called a structure.
 2019-01-23 16:14:03 -06:00
J. Ryan Stinnett
f4bbfc4aeb Remove unneeded style from forgot password 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
df76a312c2 Add header text to forgot password 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
8241f09b12 Update registration header text 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
f069833ad9 Update text to change auth flows 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
9b3d674a92 Rename links for changing auth flow 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
e0e873d0a8 Remove create account from forgot password 2019-01-23 15:50:44 -06:00
J. Ryan Stinnett
2f89af4fa0 Update login header text 2019-01-23 15:50:44 -06:00
David Baker
6a90625d36 Merge remote-tracking branch 'origin/experimental' into dbkr/sas 2019-01-23 17:32:18 +00:00
Travis Ralston
19de6694ca Bring in the change password section 
This also changes the layout slightly in the user settings, but nothing detrimental.
 2019-01-23 09:28:53 -07:00
J. Ryan Stinnett
05254f0e82 Tweak language selector to match design 2019-01-23 10:18:06 -06:00
J. Ryan Stinnett
f9793fa567 Extract language selector styles 2019-01-23 10:18:06 -06:00
J. Ryan Stinnett
36ebd91f07 Move language selector to auth header 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
J. Ryan Stinnett
575cd1e37b Add modal look to authentication flows 
This changes the auth screens to use the modal-like style of the redesign.

This does not attempt to style the actual body content of each screen.  Instead,
it covers the header area with logo, footer links, and overall modal container
only.
 2019-01-22 20:44:49 -06:00
Travis Ralston
5ef9015133 Add labs flag for tabbed settings 2019-01-22 10:28:33 -07:00
Travis Ralston
0deb210fd8 Collapse DOM around tab label icon 2019-01-22 09:54:35 -07:00
Bruno Windels
d803005d1c
Merge pull request #2478 from matrix-org/bwindels/jumptobottommakeover 
Redesign: pull jump to bottom button out of room status bar
 2019-01-22 16:39:54 +00:00
Bruno Windels
7301d6a3c3 set default size of 350px for left panel 2019-01-22 16:40:11 +01:00
Bruno Windels
e5de33ab77 hide RoomStatusBar when not needed again 
as it will be shown a lot less now, having the layout
jump up and down won't be so much of a problem.
 2019-01-22 14:50:31 +01:00
Bruno Windels
14592b5b57 use JumpToBottomButton in RoomView 2019-01-22 14:50:16 +01:00
Bruno Windels
de4cda4572 remove unread messages and jump to bottom from RoomStatusBar 2019-01-22 14:50:06 +01:00
Bruno Windels
3c8bd3fc78
Merge pull request #2456 from matrix-org/bwindels/extendtypingbartiming 
Avoid "jumpiness" with inline typing indicator
 2019-01-22 11:04:25 +00:00
Bruno Windels
5d45d5dfac formatting 2019-01-22 11:37:09 +01:00
David Baker
ba1aa2037d Merge remote-tracking branch 'origin/experimental' into dbkr/delint_compatpage_loggedinview 2019-01-22 10:13:27 +00:00
Travis Ralston
a488304410 Appease the linter 
Appease the linter round 2

Appease the linter round 3

Appease the linter round 4

Appease the linter round 5
 2019-01-21 18:41:49 -07:00
J. Ryan Stinnett
1d01ac398c Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
3bd765f63f Rename LoginPage, Header, Footer views to Auth* 2019-01-21 19:11:43 -06:00
J. Ryan Stinnett
c7354f483b Rename LoginBox to AuthButtons 
This component displays login and register buttons. It's currently used in the
composer when viewing a room as a guest.

The name is confusing because the login flow uses are very similarly named
`mx_Login_box` as a wrapping around forms, which is totally different than these
buttons.

Additionally, the components is moved to `views/auth` since it is very simple
and auth related.
 2019-01-21 19:11:43 -06:00
Travis Ralston
15a56fa90b Improve the profile section a bit and add a highlight to the temp tab 2019-01-21 17:27:43 -07:00
Travis Ralston
a8ec40a8b0 Add a temporary tab for visiting the old settings 
For debugging purposes
 2019-01-21 16:51:43 -07:00
Travis Ralston
a7e3d7df28 Make the tabs look like the design 2019-01-21 16:51:43 -07:00
Travis Ralston
15709040e7 Make tabs be their own panels 2019-01-21 16:51:43 -07:00
Travis Ralston
5adfc09237 Bring in TabbedView nearly verbatim from prior work 
Sourced from https://github.com/matrix-org/matrix-react-sdk/pull/1644 and related PRs.
 2019-01-21 16:51:43 -07:00
Travis Ralston
0e42c0892e Early modalization of UserSettings 
Basically just shove it into a modal and call it good.
 2019-01-21 16:51:43 -07:00
J. Ryan Stinnett
29be3ee4b5 Rename login directory to auth 2019-01-21 17:45:55 -06:00
J. Ryan Stinnett
e714b2aed2 Remove Status theme-specific hacks 2019-01-21 13:59:22 -06:00
David Baker
bd011de1e5 De-lint CompatabilityPage & LoggedInView 
and remove from errorfiles
 2019-01-21 19:32:57 +00:00
Bruno Windels
5aff76b49d use css scrollbar styles to make native scrollbars prettier 2019-01-21 19:06:49 +01:00