mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
34841 commits 217 branches 561 tags 411 MiB
Commit graph

3070 commits

Author SHA1 Message Date
Travis Ralston
3f4ee9742a Simple rendering of voice messages in the timeline 
Fixes https://github.com/vector-im/element-web/issues/17138
 2021-05-03 11:41:14 -06:00
Šimon Brandner
7faf9eb4cc
Use styling for CallPreview 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-03 15:39:37 +02:00
Šimon Brandner
fe5fb1885f
Add styling for CallPreview and make it fixed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-03 15:39:24 +02:00
Šimon Brandner
b8cb72345c
Remove unnecessary margin 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-03 15:39:00 +02:00
Ayush PS
b42872daa4 Fixed the Dial Pad and finalized the changes 2021-05-02 22:10:15 +05:30
Jaiwanth
f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
Michael Telatynski
158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Travis Ralston
6764b8d645 Change symbol names 2021-04-28 09:29:31 -06:00
Michael Telatynski
5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-28 10:52:23 +02:00
Michael Telatynski
c0f11fd316 Fix communities spaces beta card layout 2021-04-28 09:35:25 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Michael Telatynski
505b200a87 fix beta pill styling 2021-04-28 08:05:25 +01:00
Travis Ralston
c4d85c457b Add progress effect to playback waveform 2021-04-27 22:59:16 -06:00
Travis Ralston
c2d37af1cb Move playback to its own set of classes 
This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline.

Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need.

The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag.

Waveform calculations have also been moved into the base component, deduplicating the math a bit.
 2021-04-27 22:23:57 -06:00
Ayush PS
8660ab000e Merge branch 'develop' into DialPad 2021-04-28 08:55:44 +05:30
Aaron Raimist
31ff05a862 Merge branch 'develop' into warn-on-access-token-reveal 2021-04-27 19:25:38 -05:00
Aaron Raimist
6754a0b483
Switch to <details> 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-27 19:12:22 -05:00
Ayush PS
7509481bb9 Added the LTR support for the dialpad 2021-04-28 02:46:43 +05:30
Travis Ralston
c1bb0bb0b8 Add a delete button 2021-04-27 15:02:15 -06:00
Travis Ralston
30e120284d Add simple play/pause controls 2021-04-27 15:02:15 -06:00
Travis Ralston
e079f64a16 Adjust pixel dimensions 2021-04-27 15:02:15 -06:00
Travis Ralston
32e3ce3dea Handle basic state machine of recordings 2021-04-27 15:02:15 -06:00
Michael Telatynski
4f02dc9050 delint 2021-04-27 17:19:34 +01:00
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Michael Telatynski
c5f653245a Show Spaces beta card in Labs & My Communities view 
the image is temporary
 2021-04-27 16:29:42 +01:00
J. Ryan Stinnett
33617b0375
Merge pull request #5701 from SimonBrandner/fix-pip-color 
Fix VoIP PIP frame color
 2021-04-27 14:42:20 +01:00
Šimon Brandner
9b2eb8ebc0
Set box-shadow opacity to 20% 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 15:27:11 +02:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067 
Fix issues with space hierarchy in layout and with incompatible servers
 2021-04-27 11:21:15 +01:00
Šimon Brandner
dacb161a64
Fix the look of video feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 12:03:01 +02:00
Šimon Brandner
e79f94d01e
Somewhat fix the local video issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 20:49:11 +02:00
Robin Townsend
3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend
d3db5fe77f Vectorize mini avatar uploader spinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:09 -04:00
Michael Telatynski
489b4be6cf Fix space hierarchy css not applying as it should 2021-04-26 15:48:33 +01:00
J. Ryan Stinnett
9401a6d6dc
Merge pull request #5916 from SimonBrandner/image-view-zoom 
Dynamic max and min zoom in the new ImageView
 2021-04-26 15:46:26 +01:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Ayush PS
3201ed2f0f Added color scheme for the numbers 2021-04-26 01:40:10 +05:30
Šimon Brandner
1a906c95da
Merge branch 'develop' into image-view-zoom 2021-04-24 09:14:30 +02:00
Šimon Brandner
dad7a22055
Initial code for dynamic minZoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-24 08:03:39 +02:00
Travis Ralston
82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06:00
Šimon Brandner
fbb8cfb188
Rework how media element are handled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-23 19:41:55 +02:00
Šimon Brandner
c54aa86532
Merge branch 'develop' into feed 2021-04-23 18:32:05 +02:00
Šimon Brandner
cf21658e30
Use suggested box-shadow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-23 18:29:10 +02:00
Robin Townsend
3d7842d696 Remove old FormButton CSS 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-23 10:25:04 -04:00
Robin Townsend
0f84b3dff3 Align checkboxes with names in add rooms to space dialog 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-23 10:25:04 -04:00
Robin Townsend
024cf7f66c Cut off long names in add rooms to space dialog 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-23 10:24:50 -04:00
Šimon Brandner
2d17ba445a
Increase drop shadow alpha to 0.45 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-23 15:33:10 +02:00
Šimon Brandner
ec908bc8be
Merge branch 'develop' into fix-pip-color 2021-04-23 14:40:58 +02:00
Šimon Brandner
d757b7d788
Merge branch 'develop' into fix-pip-color 2021-04-23 14:10:29 +02:00
Robin Townsend
cc5a7671a7 Keep invite button separate from space info 
60828913d2 caused the space info and
invite buttons to have no separation when you are the only person in a
space, since the margin was set on the face pile, which may be absent.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-22 11:39:58 -04:00
Michael Telatynski
d9dac7b261
Merge pull request #5898 from matrix-org/t3chguy/fix/16976 
Iterate the spaces face pile design
 2021-04-22 09:29:00 +01:00
Michael Telatynski
ca07b1ed04
Update res/css/views/elements/_FacePile.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-04-22 09:06:53 +01:00
Michael Telatynski
c0f8098a86
Merge pull request #5890 from matrix-org/t3chguy/fix/17006 
Fix alignment issue with nested spaces being cut off wrong
 2021-04-22 08:32:54 +01:00
Michael Telatynski
90cd5d0472 Remove old redundant hover effect 2021-04-22 08:18:28 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Travis Ralston
cc095c85bf Dark theme support 2021-04-21 16:24:17 -06:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states 
This moves most of them out of the context menu.
 2021-04-21 16:24:17 -06:00
Travis Ralston
91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Šimon Brandner
951fda4c3d
Merge branch 'develop' into show-username 2021-04-21 18:08:50 +02:00
Šimon Brandner
9658a760c8
Use timestamp color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-21 17:41:21 +02:00
Šimon Brandner
eee1294374
Make both have the same baseline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-21 17:37:25 +02:00
Germain Souquet
c5a1bb2d2c fix sticky tags header in room list 2021-04-21 10:44:20 +01:00
Germain
68fb9a78c4
Merge pull request #5874 from matrix-org/gsouquet-room-events 2021-04-21 09:09:01 +01:00
Michael Telatynski
c30b62ef35 Fix alignment issue with nested spaces being cut off wrong 2021-04-20 11:12:47 +01:00
Šimon Brandner
faca498523
Don't use gap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 11:12:16 +02:00
Michael Telatynski
542890f5e8
Merge pull request #5885 from SimonBrandner/dumb-change 
A tiny change to make the Add existing rooms dialog a little nicer
 2021-04-20 08:53:33 +01:00
Šimon Brandner
548cd38a5c
Remove weird margin from the file panel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 08:22:43 +02:00
Šimon Brandner
910a3e5f31
A little nicer spacing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-19 20:59:54 +02:00
Šimon Brandner
b52d6e3d97
A tiny change to make the dialog a little nicer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-19 20:52:40 +02:00
Šimon Brandner
61a260cd40
Format mxid 2021-04-18 20:02:22 +02:00
Travis Ralston
a821ece128
Merge pull request #5869 from matrix-org/travis/voice/pulse-2 
Pulse animation for voice messages recording state
 2021-04-16 09:41:33 -06:00
Travis Ralston
7878e1cd57
Merge pull request #5870 from matrix-org/travis/voice/disable-composer 
Properly disable composer access when recording a voice message
 2021-04-16 07:36:53 -06:00
Šimon Brandner
2cfd4659e1
Add separate mx_CallView_content class 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-16 12:50:23 +02:00
Travis Ralston
3e24d6f8ac Change animation speed 2021-04-15 10:49:39 -06:00
J. Ryan Stinnett
495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option 
Render msgOption only if showReadReceipts is enabled
 2021-04-15 17:24:13 +01:00
Travis Ralston
f0d1e7c565 Document the lamp effect 2021-04-15 10:04:15 -06:00
Šimon Brandner
aad22903a7
Remove overflow: hidden 
This line doesn't seem to do anything * shrug

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-15 18:02:48 +02:00
Travis Ralston
6b3ac20d76 Cleanup 2021-04-15 09:53:15 -06:00
Germain Souquet
02debd12f6 Hide RoomSublist when empty rather than unmounting them 2021-04-15 16:11:45 +01:00
Travis Ralston
bf70666f9b
Merge pull request #5873 from matrix-org/travis/dnd 
Labs: Add quick/cheap "do not disturb" flag
 2021-04-15 08:38:17 -06:00
Germain
36e729a626
Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation 2021-04-15 08:27:28 +01:00
Travis Ralston
eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag 
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
 2021-04-15 00:47:09 -06:00
Travis Ralston
fedb5b9f63 Fix disabled state of the composer 2021-04-14 20:12:10 -06:00
Travis Ralston
595225b98b A different animation option for pulsing record icons 2021-04-14 15:14:52 -06:00
Travis Ralston
e77d3bea04 Pulse animation option for voice record button 2021-04-14 15:12:21 -06:00
Šimon Brandner
ba0384f381
Render msgOption only if showReadReceipts is enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-14 11:43:42 +02:00
Germain
87b87bfad4
Merge pull request #5855 from matrix-org/gsouquet-irc-layout 2021-04-14 09:21:34 +01:00
Germain Souquet
cd48a8f3ab merge .mx_ReplyThread declaration in _IRCLayout.css 2021-04-14 08:15:32 +01:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view 
Improve image view
 2021-04-13 19:01:27 -06:00
Germain Souquet
e520f7462c Fix emotes left spacing in replies for the IRC layout 2021-04-13 11:21:47 +01:00
Germain Souquet
2aebf103ed always display message timestamp in IRC layout replies 2021-04-13 11:20:53 +01:00
Travis Ralston
106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00
RiotRobot
a008c3d4e6 Merge branch 'master' into develop 2021-04-12 14:56:05 +01:00
Michael Telatynski
3faf7280fe
Merge pull request #5845 from matrix-org/t3chguy/fix/16844 
Don't hide notification badge on the home space button as it has no menu
 2021-04-12 14:49:35 +01:00
RiotRobot
8af81ea90f Revert "Change to inset" 
Safari doesn't support `inset`.

This reverts commit b3706b682e.
 2021-04-12 14:37:11 +01:00
J. Ryan Stinnett
19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
650421eefb Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
8a1180bd50 Rename toggle to view 2021-04-12 13:19:13 +01:00
J. Ryan Stinnett
0e5e48584f Change to inset 2021-04-12 13:18:03 +01:00
J. Ryan Stinnett
7f796640f6 Remove blur effect 2021-04-12 13:11:27 +01:00
J. Ryan Stinnett
798a891d83 Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 12:28:42 +01:00
Michael Telatynski
a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00
Šimon Brandner
7f496c7bf5
Add comment: same on all themes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:04:07 +02:00
Travis Ralston
01c5f84f60 Merge branch 'develop' into travis/reset-passphrase 2021-04-08 18:07:46 -06:00
Germain Souquet
1d75726a75 Honour prefers reduced motion for read receipts 2021-04-08 11:05:45 +01:00
Germain Souquet
8d60d85570 replace velocity-animate with CSS transitions 2021-04-08 10:36:14 +01:00
Šimon Brandner
adb0877591
Merge branch 'develop' into feed 2021-04-07 19:17:35 +02:00
Travis Ralston
6e6a26f86a
Merge pull request #5710 from SimonBrandner/resizable-call-view 
Resizable CallView
 2021-04-07 11:02:46 -06:00
Germain Souquet
7627ea13fe Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-04-07 09:54:12 +01:00
Germain Souquet
0312b55007 Remove status area UI defects when in-call 2021-04-06 11:00:32 +01:00
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons 
Show invite reasons
 2021-04-06 10:48:54 +01:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view 2021-04-04 11:35:26 +02:00
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed 
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-03 09:15:55 +02:00
Šimon Brandner
12a36d1a30
This is hopefully not true anymore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 10:44:40 +02:00
Šimon Brandner
e79254e7bf
Set opacity of lightboxes to 95 in light theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 09:07:36 +02:00
Šimon Brandner
535ae086b4
Make sender bold 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:31:42 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c Show invite reasons 
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-31 15:46:09 -04:00
Germain Souquet
a308a54183 Clicking jump to bottom resets room hash 2021-03-31 12:28:24 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
Travis Ralston
262475f96e Add a button to reset personal encryption state during login 2021-03-30 15:37:06 -06:00
Travis Ralston
54412878a1 Merge branch 'develop' into travis/voice-messages/waveform 2021-03-29 22:59:51 -06:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Michael Telatynski
af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
Michael Telatynski
d10241b1c4 Fix misalignment on the room search input caused by a 1px transparent border 2021-03-26 13:10:44 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text 
Tweak cross-signing copy
 2021-03-26 12:12:25 +00:00
Michael Telatynski
4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 11:13:39 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Michael Telatynski
09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Travis Ralston
1419ac6b69 Hook up a clock and implement proper design 2021-03-25 17:12:26 -06:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Michael Telatynski
4df197ac61 Tweak layout of the space room directory for better legibility 2021-03-25 14:09:56 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski
b6a57f73c6 Tweak border colours in spaces 2021-03-25 12:17:39 +00:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11 
Tweak and fix some space features
 2021-03-25 09:02:11 +00:00
Travis Ralston
449e028bbd Actually use a waveform instead of the frequency data 2021-03-24 23:31:02 -06:00
Travis Ralston
8ddd14e252 Early concept for rendering the frequency waveform 2021-03-24 22:17:45 -06:00
Ayush PS
1488457c33 Added the class -button-bg-color for all themes 2021-03-25 01:31:45 +05:30
Michael Telatynski
20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski
ee5d0d6842 Fix alignment bug with space panel on spaces with subspaces in Chrome 2021-03-24 17:05:21 +00:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp 
Labs feature: Early implementation of voice messages
 2021-03-24 09:56:34 -06:00
Michael Telatynski
65a7d0621d Add invite to space button to room intro 2021-03-24 15:30:03 +00:00
Michael Telatynski
a2a1e37fa3 Add prompt to bottom of room list to invite to space 2021-03-24 14:18:06 +00:00
Michael Telatynski
6e0ab86168 Small usability tweaks to the add existing to space dialog 2021-03-24 14:10:26 +00:00
Michael Telatynski
f7a3805eed Fix styling inconsistency in space room view 2021-03-24 14:02:25 +00:00
Michael Telatynski
fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Ayush PS
3df9557df2 Dial Pad UI fix 2021-03-24 14:00:09 +05:30
Germain Souquet
0db31dfeae fix: CIDER formatting buttons on Safari 2021-03-22 15:05:22 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10 
Improve discovery of rooms in a space
 2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9 
Spaces improve creation journeys
 2021-03-22 13:24:10 +00:00
Šimon Brandner
4bb279b632
Merge branch 'develop' into resizable-call-view 2021-03-22 07:57:52 +01:00
Tawfiek
90b8a66476 fix make btns in verify dailog respect system font 2021-03-21 14:11:45 +02:00
Jaiwanth
b2a72565d3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu 2021-03-19 20:28:10 +05:30
Michael Telatynski
1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
3718d550c5 Fix space creation menu shade width 2021-03-19 13:20:30 +00:00
Michael Telatynski
31ce19373b Fix space panel spacings 2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Michael Telatynski
17399c6be6
Merge pull request #5764 from matrix-org/t3chguy/spaces4.9 
Fix left panel resizing and lower min-width improving flexibility
 2021-03-18 11:34:55 +00:00
Šimon Brandner
431a2c033d
Merge branch 'develop' into feed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-17 16:13:40 +01:00
Travis Ralston
51dca8d13d Fix positioning of stop square 2021-03-16 23:54:33 -06:00
Travis Ralston
9aa5348c7f Show a stop button to stop the recording 2021-03-16 23:43:59 -06:00
Travis Ralston
b5d32d92f3 Wire up a simple record button 2021-03-16 22:58:44 -06:00
Šimon Brandner
c96d2621a0
Set max-width and MIN_ZOOM 
This might have some side effects but as far as I can tell they shouldn't be too problematic

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 19:57:14 +01:00
Michael Telatynski
0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8 
Iterate space panel visually and functionally
 2021-03-16 17:41:14 +00:00
Michael Telatynski
5ce3a05867
Update _SpacePanel.scss 2021-03-16 16:34:28 +00:00
Michael Telatynski
688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski
11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski
baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel 
so they don't steal horizontal space from each other
 2021-03-16 11:13:39 +00:00
Šimon Brandner
787a62846e
Merge branch 'develop' into resizable-call-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-16 07:55:56 +01:00
Šimon Brandner
8f6f9cd6fa
Remove some unnecessary CSS and set MIN_ZOOM to 95 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 20:37:39 +01:00
Šimon Brandner
9c313854d0
Increase defautl size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-15 19:23:40 +01:00
Michael Telatynski
62983ca48e Fix space panel alignments when no scrollbar is present 2021-03-15 12:57:35 +00:00
Michael Telatynski
f9eace1729 Rebuild alignment of the menu buttons and notification badges 2021-03-15 11:59:46 +00:00
Šimon Brandner
b27a8e3c3a
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-14 08:30:28 +01:00
Travis Ralston
4811154f25 Remove now-unused assets and CSS from CompleteSecurity step 2021-03-12 15:24:16 -07:00
Michael Telatynski
6210614ce7 Rebuild space panel layout to resolve weirdness with selections and nesting 2021-03-12 17:37:15 +00:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
Michael Telatynski
235bafab23
Merge pull request #5752 from matrix-org/t3chguy/unused-css1 
Remove unused common CSS classes
 2021-03-11 14:07:52 +00:00
Michael Telatynski
081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 
Rebuild space previews with new designs
 2021-03-11 14:06:31 +00:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login 
Rework cross-signing login flow
 2021-03-11 12:53:55 +00:00
Michael Telatynski
c2e05c647e
Remove unused common CSS classes 2021-03-11 11:56:53 +00:00
Michael Telatynski
6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Travis Ralston
a7debdd946 Fix tinting for download icon 
As shown in https://github.com/vector-im/element-web/issues/16546
 2021-03-10 12:32:18 -07:00
Šimon Brandner
bb13dc49a6
Make CallView use CallFeed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-10 12:18:57 +01:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5 
Spaces suggested rooms support
 2021-03-10 10:56:17 +00:00
Michael Telatynski
3ac4cb49fc Tweak styling of manage rooms in space ux 2021-03-09 14:16:29 +00:00
J. Ryan Stinnett
dffe0e93e3
Merge pull request #5717 from 2580ayush2580/ayush258013 
Fix clicking on the avatar for opening member info requires pixel-perfect accuracy
 2021-03-09 11:39:04 +00:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source 
Display decrypted and encrypted event source on the same dialog
 2021-03-09 11:36:53 +00:00
Michael Telatynski
81e1f36c4b Tidy up TemporaryTile now that it isn't temporary 2021-03-09 11:19:41 +00:00
Matthew Hodgson
72f28240aa fix AccessibleButton layout some more 2021-03-08 23:28:54 +00:00
Matthew Hodgson
c543f0a2d0 fix AccessibleButton label positioning now they can wrap 2021-03-08 22:29:08 +00:00
Matthew Hodgson
b3cd6fcc9b vertically align labels in AccessibleButtons if their height is pushed out by wrapped text elsewhere 2021-03-08 17:59:02 +00:00
Travis Ralston
52621946de
Merge pull request #5723 from matrix-org/travis/uploads 
Refresh UI for file uploads
 2021-03-08 08:52:51 -07:00
Travis Ralston
761ced13f2
Merge pull request #5719 from matrix-org/travis/file-representation 
UI refresh for uploaded files
 2021-03-08 08:52:43 -07:00
Travis Ralston
d35afe6fbb
Merge pull request #5699 from matrix-org/travis/message-states 
Improve message sending states to match new designs
 2021-03-08 08:52:26 -07:00
Matthew Hodgson
c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson
1427aa4203 fix mx_EncryptionInfo_spinner padding in dialogs 2021-03-08 04:41:51 +00:00
Travis Ralston
757597e55f Fixed review concerns 2021-03-05 16:29:14 -07:00
Travis Ralston
08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston
711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
David Baker
e5b03488d8 Fix widget resizing 
There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.

Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.

Fixes https://github.com/vector-im/element-web/issues/16473
 2021-03-05 17:52:51 +00:00
Travis Ralston
017c2af663 Merge branch 'develop' into travis/message-states 2021-03-05 09:29:39 -07:00
Travis Ralston
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui 
File drop UI fixes and improvements
 2021-03-04 20:30:45 -07:00
Travis Ralston
65ac063a09
Merge pull request #5715 from 2580ayush2580/ayush258012 
Fix Bottom border of state counters is white on the dark theme
 2021-03-04 20:28:52 -07:00
Travis Ralston
d7310bc5b3 Remove dead classes 2021-03-04 20:17:29 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files 
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
 2021-03-04 20:07:48 -07:00
Ayush Kumar
dd792c3d73 Fix Clicking on the avatar for opening member info requires pixel-perfect accuracy 2021-03-04 19:24:35 +05:30
Jason Robinson
f2d2a048e1 Ensure HostSignupDialog border colour matches light theme 
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
 2021-03-04 11:07:14 +02:00
Ayush Kumar
1cb19554eb Fix Bottom border of state counters is white on the dark theme 2021-03-04 14:03:02 +05:30
Panagiotis
6d792cc08c feat: use <details> to hide encrypted block 2021-03-03 23:48:39 +02:00
Panagiotis
ae08f74336 feat: improve "view source" 
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
 2021-03-03 22:38:30 +02:00
Šimon Brandner
0e5297fcb0
Fix local feed size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-03 16:44:43 +01:00
Michael Telatynski
77cf4cf7a4
Merge pull request #5706 from matrix-org/t3chguy/spaces4.4 
Space room hierarchies
 2021-03-03 15:25:00 +00:00
Michael Telatynski
a8ff0fa75f
Merge pull request #5705 from matrix-org/t3chguy/spaces4.3 
Iterate Space view and right panel
 2021-03-03 13:37:40 +00:00
Michael Telatynski
85985db441 add comment 2021-03-03 11:50:41 +00:00
Šimon Brandner
2e535d2a99
Fix CSS to make it work with resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:33:34 +01:00
Šimon Brandner
a3f7e5f031
Add CallViewForRoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:32:25 +01:00
Šimon Brandner
f86e6fe643
Add resize CallViewForRoom CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:32:13 +01:00
Travis Ralston
c74224a1b7 Merge branch 'develop' into travis/message-states 2021-03-02 10:40:49 -07:00
Michael Telatynski
49fc053b94
Merge pull request #5704 from matrix-org/t3chguy/spaces4.2 
Initial Space Room View and Creation UX
 2021-03-02 17:17:39 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check 
Add multi language spell check
 2021-03-02 14:38:21 +00:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski
ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +00:00
Michael Telatynski
faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Michael Telatynski
926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski
8efe7dcaa1 Decorate Right Panel cards with Space header for when viewing it in that context 2021-03-02 09:54:32 +00:00
Michael Telatynski
7b7c89e854
Merge pull request #5702 from matrix-org/t3chguy/spaces4.1 
Iterate Space Panel
 2021-03-01 23:56:54 +00:00
Travis Ralston
12161f9da2
Merge pull request #5700 from SimonBrandner/fix-read-receipts-in-compact 
Fix read receipts for compact layout
 2021-03-01 16:37:59 -07:00
Travis Ralston
9cec382865 Change sending->sent state to match new designs 
For https://github.com/vector-im/element-web/issues/16424
 2021-03-01 16:25:19 -07:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski
483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski
89386b9b2e fix missing closing brace 2021-03-01 17:06:56 +00:00
Michael Telatynski
ea61b18c18 Iterate Space Panel alignments 2021-03-01 17:02:02 +00:00
Michael Telatynski
ce64863326 Annotate User Menu handle with currently selected space 2021-03-01 15:53:16 +00:00
Michael Telatynski
d679708058 Fix styling of disabled options in an Iconized menu 2021-03-01 15:40:46 +00:00
Šimon Brandner
9ffef8f072
Fix VoIP PIP frame color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-01 13:44:22 +01:00
Michael Telatynski
d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2 
Space Store and Space Panel for Room List filtering
 2021-03-01 09:42:04 +00:00
Šimon Brandner
188b728f53
Fix read receipts for compact layout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-28 13:32:17 +01:00
Travis Ralston
678ec52035 Merge branch 'develop' into fix-4963 2021-02-26 14:41:28 -07:00
Travis Ralston
4e27b00cf3 Move call buttons to the room header 
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
 2021-02-26 13:46:39 -07:00
Šimon Brandner
3a643e5b9d
Remove unnecessary changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 11:46:54 +01:00
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner
3bed37463f
Remove unnecessary code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 11:38:05 +01:00
Šimon Brandner
11c5aa02d2
Remove mx_RoomView_container 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 11:19:45 +01:00
Šimon Brandner
819a0b013f
min-width 
We need to allow the container to be smaller

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 11:08:31 +01:00
Šimon Brandner
e90ae2ea75
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 08:18:05 +01:00
Šimon Brandner
172cc01f7d
Add background animation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 08:12:10 +01:00
Šimon Brandner
f0c26846c7
Fix formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 08:11:58 +01:00
Šimon Brandner
1a7f9091b4
Animate icon size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 07:51:03 +01:00
Šimon Brandner
1c48804d96
Remove unnecessary class 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 19:28:08 +01:00
Šimon Brandner
26b70b6228
Remove label background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 18:32:04 +01:00
Šimon Brandner
a3001f77e4
Remove rounded corners of the drop area 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 18:30:39 +01:00
Šimon Brandner
ad85764a8e
Fix timeline expansion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 18:23:32 +01:00
Šimon Brandner
c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Šimon Brandner
1955fff08c
CSS cleanup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:50:50 +01:00
Šimon Brandner
dc283241aa
Remove wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:28:42 +01:00
Šimon Brandner
273753a42a
Fix hex formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:25:34 +01:00
Šimon Brandner
5a9e1a1482
Fix close icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:10:54 +01:00
Šimon Brandner
d58c17ff3b
Show grabbing cursor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 07:50:53 +01:00
Šimon Brandner
25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner
983895289c
Update info 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 20:04:25 +01:00
Šimon Brandner
81698a2714
Fix pointer-events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 19:31:19 +01:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts 
Fix read receipts?
 2021-02-24 11:21:42 -07:00
Šimon Brandner
83e1a7a707
Add more button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 18:13:12 +01:00
Šimon Brandner
a6bb203a4b
Redo icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:43:33 +01:00
Šimon Brandner
fafb8d43a3
Fix padding according to the design 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:16:58 +01:00
Šimon Brandner
8454a2d440
Remove padding on lightboxes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 12:52:08 +01:00
Šimon Brandner
6aac8f1735
Change padding a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:20:28 +01:00
Šimon Brandner
899ce1f605
Partially fix overflow issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:15:59 +01:00
David Baker
bcc567cd86
Merge pull request #5676 from SimonBrandner/fix-portrait 
Fix portrait videocalls
 2021-02-24 09:26:57 +00:00
Šimon Brandner
ab79deb88f
Update the looks a bit more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 08:11:53 +01:00
Šimon Brandner
768d268189
Fix css 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 07:54:36 +01:00
Robin Townsend
40b684d7de Vectorize spinners 
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-23 20:22:09 -05:00
Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Šimon Brandner
3f0e8e4afc
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:16:52 +01:00
Šimon Brandner
64945d4ccf
Add a comment and use rems 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:14:36 +01:00
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01:00
J. Ryan Stinnett
667c94b387
Merge pull request #5643 from SimonBrandner/move-icons 
Tweak code block icon positions
 2021-02-23 14:53:28 +00:00
J. Ryan Stinnett
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes" 
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
 2021-02-23 12:03:08 +00:00
Šimon Brandner
effb9666f2
Fix portrait videocalls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 20:10:30 +01:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner
5de99c7708
Fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:40:24 +01:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes 
Improve URL preview formatting and image upload thumbnail size
 2021-02-17 11:37:37 +00:00