Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view
2021-02-23 20:42:16 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963
2021-02-12 16:30:01 +01:00
Jason Robinson
23140a84ff
Remove host signup config strings, make translatable instead
...
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson
d75e2d19dc
Remove unnecessary host_signup.png
2021-02-09 11:33:16 +02:00
Jason Robinson
5fe3c83f27
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-09 11:18:51 +02:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock
2021-02-08 15:26:50 +01:00
Šimon Brandner
9a97b40ce9
Remove old icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:17 +01:00
Šimon Brandner
cdb0d1c12e
Move and use icons from widget dir
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:10 +01:00
Jason Robinson
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
Michael Telatynski
0e94d08d9a
Update SSO Twitter social branding to match guidelines
2021-02-02 17:29:19 +00:00
Michael Telatynski
1ba0999915
Update SSO Facebook social branding to match guidelines
2021-02-02 17:19:18 +00:00
Michael Telatynski
2c2cf4c073
Update google branding
2021-01-29 11:42:34 +00:00
Michael Telatynski
34ae766893
Wire up MSC2858 brand attribute
...
For better brand adherance.
Also removes old support for https IdP icons.
2021-01-27 16:15:47 +00:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 08:12:32 +01:00
Šimon Brandner
58b2c18cf5
This somehow works
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00
Jason Robinson
158036ccf9
Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-01-15 16:12:53 +02:00
Jason Robinson
e8c716f33e
First stage of host signup flow now sits here
...
Need to make things configurable, image and text for the first step should be configurable.
Also missing privacy related words, though they should be configurable too.
2021-01-11 15:47:21 +02:00
Šimon Brandner
7d120f7183
Simplifie svg
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-09 09:33:11 +01:00
Šimon Brandner
4538274e74
Added send message icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-09 09:25:29 +01:00
David Baker
4b43929aa3
Add in-call dialpad for DTMF sending
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
2021-01-04 20:01:43 +00:00
David Baker
452fbb076b
Add a dialpad UI for PSTN lookup
...
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
2020-12-23 19:02:01 +00:00
Šimon Brandner
f771b7ac98
Added zoom button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:37:31 +01:00
Šimon Brandner
3c306bc54b
Added icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 12:54:55 +01:00
David Baker
6916b5d7c6
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-03 17:57:22 +00:00
David Baker
5b7ad079d2
Add SVGs
2020-11-26 14:55:07 +00:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
David Baker
729d59160d
Rename buttons in CSS & remove unused
2020-11-23 15:27:37 +00:00
David Baker
eca1851f02
Rename voip buttons
2020-11-23 15:21:18 +00:00
David Baker
49bd66c377
Change fullscreen button to expand button in PIP view
...
and fix call controls which didn't appear in video call
2020-11-19 16:36:23 +00:00
David Baker
50965e41eb
Remove call bar
...
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
2020-11-19 15:15:31 +00:00
David Baker
41e885dd67
Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview
2020-11-18 14:28:03 +00:00
David Baker
a2d58e2f1f
Make new in-call UI work
...
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
* PIP view has no buttons, and not moveable yet
* No call status in room view yet
* Room status bar is still there currently
2020-11-18 14:22:38 +00:00
Michael Telatynski
edb5e10506
Iterate registration to simplify it based on usertesting
2020-11-11 17:04:10 +00:00
Michael Telatynski
af71b0735d
Change icon for the Create Event bubble tile
2020-11-04 17:24:03 +00:00
Michael Telatynski
4afa610ee1
Add variant of default home page for justRegistered
2020-11-02 17:24:47 +00:00
Michael Telatynski
fa9490b02b
Add skeleton UI for Room List when no rooms
2020-11-02 17:22:45 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Michael Telatynski
0004dd4475
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-10-22 21:40:05 +01:00
Michael Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +01:00
Michael Telatynski
4184923e5e
fix default widget icons
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:49:56 +01:00
Michael Telatynski
ba21c6ed36
Iterate on Widget icons and resizing handles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 15:56:53 +01:00
Michael Telatynski
ada6d1aa46
Iterate PR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01:00
J. Ryan Stinnett
3d0db1b022
Change invite icon
2020-10-07 20:08:59 +01:00
Travis Ralston
bfbbf44dfc
Add a note to use the desktop builds when seshat isn't available
...
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
2020-09-16 17:23:37 -06:00
Michael Telatynski
cef533b83e
Update ellipsis svg
2020-09-09 13:09:21 +01:00
Michael Telatynski
8d66dce68d
Update copy and use svg for ellipsis
2020-09-09 12:50:48 +01:00
Michael Telatynski
0fe6ce1842
Stage svgs
2020-09-08 15:43:40 +01:00
Michael Telatynski
11e349d6c8
Update e2e iconography
2020-09-08 15:42:31 +01:00
Travis Ralston
13e9f7b912
Update home icon
2020-08-27 13:18:52 -06:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
...
Communities v2 prototype: Tag panel selection changes
2020-08-26 10:22:50 -06:00
Travis Ralston
20c562c208
Change user avatar to a home icon
2020-08-25 21:46:26 -06:00
Travis Ralston
7c1a9993e3
Add new create group dialog
2020-08-25 21:08:24 -06:00
Michael Telatynski
4381bdfdbf
fix typo
2020-08-14 18:53:56 +01:00
Michael Telatynski
90d99239bb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2
2020-08-14 18:10:59 +01:00
Michael Telatynski
4ec602b960
Make cutout in the decorated room avatar transparent rather than fixed
2020-08-14 10:20:59 +01:00
Michael Telatynski
b8a260bb84
Change add room action for rooms to context menu
2020-08-13 16:18:26 +01:00
Michael Telatynski
df75024a21
Switch out the globe icon and colour it depending on theme
2020-08-13 15:16:31 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
...
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
9e429ee669
Remove rebranding toast
...
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.
Fixes https://github.com/vector-im/element-web/issues/14931
2020-08-11 14:27:53 +01:00
Jorik Schellekens
271eeeabee
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting
2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
71af4580e8
Convert jump to unread button
2020-07-31 20:39:17 +01:00
J. Ryan Stinnett
7aaa4997c2
Convert jump to bottom button
2020-07-31 20:33:15 +01:00
J. Ryan Stinnett
f28bce36e1
Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons
2020-07-31 18:23:57 +01:00
J. Ryan Stinnett
1a33104877
Use thinner chevron for network, adjust placement
2020-07-31 18:15:51 +01:00
Travis Ralston
968fbd5cba
Merge branch 'develop' into travis/echo/audit
2020-07-30 10:18:30 -06:00
J. Ryan Stinnett
e917c0d92e
Replace all chevrons with a single icon
...
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.
Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.
Fixes https://github.com/vector-im/riot-web/issues/14663
2020-07-30 16:49:46 +01:00
Travis Ralston
c5574219bb
Implement dialog for resending local echo transactions
2020-07-29 20:36:04 -06:00
J. Ryan Stinnett
2f20cbd5ad
Remove all unreferenced images
...
This removes all images we no longer reference in the app. This should be safe,
as Webpack only adds images to the build output if they are referenced.
2020-07-29 17:52:41 +01:00
Jorik Schellekens
f64ef65f97
Use StyledRadioGroup
2020-07-28 17:13:58 +01:00
Jorik Schellekens
d55699211e
Update copy icon on pre block and share dialogues
2020-07-27 15:13:02 +01:00
Michael Telatynski
007f63b5bb
Update the SVGs with 24x24 fixed Figma ones
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 15:30:06 +01:00
Michael Telatynski
b6cd8065f8
Re-export top right header button svg masks to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 14:39:02 +01:00
Travis Ralston
556da7fe5c
Swap out Modular for EMS
2020-07-14 15:47:03 -06:00
Bruno Windels
aeadf64ccf
change icon on invite button
2020-07-14 19:40:17 +02:00
Nad Chishtie
1b9d918a92
Add new e2e icons
2020-07-13 21:20:55 +01:00
Michael Telatynski
33422f1744
Switch out Labs spinner to be the Flow-generated from Design
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:39:57 +01:00
David Baker
503159c1c8
Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'
...
Add in-app rebranding toasts & prompts
See merge request new-vector/element/element-web/matrix-react-sdk!1
2020-07-10 17:09:17 +00:00
David Baker
8701e9293e
Add in-app rebranding toasts & prompts
...
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
2020-07-10 15:32:34 +01:00
Bruno Windels
7390baf451
Merge branch 'develop' into element
2020-07-08 18:09:38 +02:00
Bruno Windels
7da2b5d92f
fix muted video icon center
2020-07-08 18:06:11 +02:00
Bruno Windels
571bd30898
update call icons
2020-07-08 18:02:30 +02:00
Jorik Schellekens
b3f50b6e17
Enable options to favourite and low priority rooms
2020-07-07 23:14:04 +01:00
Bruno Windels
df072a12b2
room settings icons
2020-07-07 12:30:02 +02:00
Bruno Windels
1ef73958f3
change hide community icon in context menu
2020-07-07 12:16:31 +02:00
Bruno Windels
af333db6ae
change settings icons
2020-07-07 12:16:03 +02:00
Bruno Windels
8fd9dbf1d8
moar icon changes
2020-07-06 18:28:54 +02:00
Bruno Windels
5735c6d8f5
update favorite icon
2020-07-06 16:12:17 +02:00
Bruno Windels
08c44333cf
Update develop
2020-07-06 09:29:23 +02:00
Bruno Windels
262b1edaa3
new icons
2020-07-03 18:03:28 +02:00
Michael Telatynski
0cbc506ad6
add missing svg
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:26:50 +01:00
Michael Telatynski
fe4cf9f9b4
Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2
2020-06-30 21:16:37 +01:00
Michael Telatynski
6b2ba8caed
Add svgs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 00:27:32 +01:00
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