gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,147 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

2066 Commits

Author SHA1 Message Date
Keyvan Fatehi a9ed2e20cb Confirm redactions with a dialog 
Closes #277
Closes #1805

Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-18 18:58:24 -07:00
Luke Barnard be02ac3bc6 Fix people section again 
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
 2017-03-17 12:14:44 +00:00
Luke Barnard 49be954d31 Better CSS for redactions 
See https://github.com/vector-im/riot-web/issues/3390

Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events.
 2017-03-16 17:03:16 +00:00
David Baker ad306dd999 CSS for add phone number in UserSettings 2017-03-16 14:59:13 +00:00
Luke Barnard f8298b2482 Fix the people section 
This does two things:
 - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355
 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956
 2017-03-16 11:36:57 +00:00
David Baker c4d3d66f31 Support for phone number registration/signin, mk2 
Changes from https://github.com/vector-im/riot-web/pull/3381
 2017-03-14 14:45:54 +00:00
Luke Barnard 32b9ee7f6f Copyright 2017-03-14 14:07:10 +00:00
Luke Barnard e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus 
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
 2017-03-14 14:01:47 +00:00
David Baker 4e6541b404 Merge pull request #3385 from vector-im/luke/fix-screen-after-login 
Refactor screen set after login
 2017-03-14 13:47:55 +00:00
Matthew Hodgson df22c90016 fix kick dialog CSS 2017-03-13 00:47:20 +00:00
Matthew Hodgson ffba088192 fix CSS for ChatCreateOrReuseDialog 2017-03-13 00:03:53 +00:00
Matthew Hodgson d639eb1049 beautify all error msgs 2017-03-12 23:26:26 +00:00
Matthew Hodgson 0a0293d8fb fix focus on cancel button 2017-03-12 20:13:53 +00:00
Matthew Hodgson 4ad825e4fe fix up cancelbutton CSS 2017-03-12 20:04:07 +00:00
Matthew Hodgson 611bb3a857 beautiful error on roomdirectory fail 2017-03-12 20:04:02 +00:00
Richard van der Hoff e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)" 
This reverts commit 271fedd1e9.

This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.
 2017-03-09 20:41:11 +00:00
Luke Barnard 3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +00:00
David Baker 271fedd1e9 Support for phone number registration / signin (#3381) 
* WIP msisdn signin (css)

* Changed how highlights are done

to support keyboard based navigation

* Support for new InteractiveAuth registration

* CSS for msisdn auth entry component

* CSS tweaks for msisdn login

* Fix tests
 2017-03-09 10:58:58 +00:00
David Baker 23422fdb86 Merge pull request #3379 from vector-im/luke/css-visible-redactions 
CSS for redacted EventTiles
 2017-03-09 10:09:31 +00:00
Luke Barnard 7ff2871ad5 const 2017-03-09 10:04:15 +00:00
Luke Barnard cbc31a6c41 Remove redundant thing 2017-03-09 10:03:23 +00:00
Luke Barnard 6a1118218b Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari 
Height:100% for welcome pages on Safari
 2017-03-08 17:07:53 +00:00
Luke Barnard eddf33a689 Refactor screen set after login 2017-03-08 14:57:13 +00:00
Luke Barnard 08852c6174 Merge pull request #3376 from vector-im/luke/refactor-room-tile 
`view_room` dispatch from `onClick` RoomTile
 2017-03-07 16:20:31 +00:00
Luke Barnard 2bf96d4887 Merge pull request #3350 from vector-im/luke/css-statusbar-v-balance 
Hide statusAreaBox_line entirely when inCall
 2017-03-07 13:29:56 +00:00
Luke Barnard 9d96baa613 Alter comments on height: auto 
Having tested Riot with the middlePanel having a height of 100%, it seems to be OK.
 2017-03-07 10:22:45 +00:00
Luke Barnard a7db42d184 CSS for redacted EventTiles 2017-03-07 09:21:50 +00:00
Luke Barnard 3d67234372 `view_room` dispatch from `onClick` RoomTile 
So that RoomTile does less, and if other things should happen onClick, they happen in the same place as the `view_room` for clarity.
 2017-03-06 17:55:12 +00:00
Luke Barnard b1f14ba979 Merge pull request #3351 from vector-im/luke/css-spinner-height 
Set padding-bottom: 0px for .mx_Dialog spinner
 2017-03-03 18:01:08 +00:00
Luke Barnard a1462946cd `padding: 0px` 2017-03-03 13:54:26 +00:00
David Baker ae27667f48 Merge pull request #3333 from vector-im/dbkr/register_ui_auth 
Support InteractiveAuth based registration
 2017-03-03 13:37:46 +00:00
David Baker c6da4d93f1 Merge pull request #3334 from turt2live/travis/notifs 
Expose notification option for username/MXID
 2017-03-02 18:26:53 +00:00
Luke Barnard 024fea0687 Set padding-bottom: 0px for .mx_Dialog spinner 
This was causing https://github.com/vector-im/riot-web/issues/3226
 2017-03-02 17:39:02 +00:00
Luke Barnard cfbcffac5a Hide statusAreaBox_line entirely when inCall 
This is to keep things vertically balanced.

Fixes https://github.com/vector-im/riot-web/issues/3269
 2017-03-02 16:57:52 +00:00
Luke Barnard 640c486bde Merge pull request #3190 from vector-im/luke/mels-toggle-scss 
Float the toggle in the top right of MELS
 2017-03-02 15:19:57 +00:00
Luke Barnard 66e93c8a8c Fix for vector-im/riot-web#3298 - height:100% for welcome pages on Safari 2017-03-01 10:04:48 +00:00
Matthew Hodgson 8a7ec27dc7 fix whitespace in urlpreview title 2017-02-28 00:16:43 +00:00
turt2live 9afbe8e3fc Change wording in notification description 2017-02-27 15:47:21 -07:00
turt2live 9b42fbe42f Expose notification option for username/MXID 
For those unfortunate people that get pinged constantly.
 2017-02-27 15:32:58 -07:00
Matthew Hodgson ae145ff32e oops, fix #3270 properly 2017-02-27 22:25:22 +00:00
David Baker a8e99109b1 Support InteractiveAuth based registration 
Passes in a function to make a register URL rather than just
passing in the URL base
 2017-02-24 11:45:28 +00:00
Richard van der Hoff 038f5767f2 Add a comment 2017-02-23 14:37:46 +00:00
Richard van der Hoff e2cec7b69c More aggressive rageshake log culling 
Also bump the client-side timeout on the upload from 3 mins to 5 mins, to see
if it helps people on slower connections.
 2017-02-23 14:22:03 +00:00
Will Hunt 37f320c4a4 Don't overflow directory network options 2017-02-21 12:25:29 +00:00
Matthew Hodgson 67a7ed1e34 fix spacing of permalinks to info events 2017-02-20 01:49:11 +02:00
Matthew Hodgson eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 2017-02-20 01:48:10 +02:00
Matthew Hodgson f91f5cb65e fix RTE dark theme 2017-02-20 01:27:05 +02:00
Matthew Hodgson 5951e8fb27 don't try to darktheme scalar for now 2017-02-20 01:18:48 +02:00
Matthew Hodgson be79ccccf6 fix dark theme room join bar 2017-02-20 01:15:54 +02:00
Matthew Hodgson aba121aab0 fix cursor 2017-02-19 04:13:29 +02:00
David Baker 75f2ba6b19 CSS for ban / kick reason prompt 
For https://github.com/matrix-org/matrix-react-sdk/pull/710
 2017-02-17 17:29:57 +00:00
David Baker 03dd25624f Allow forgetting rooms you're banned from 
From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
 2017-02-17 15:52:07 +00:00
Richard van der Hoff 75097471b6 Merge pull request #3227 from vector-im/dbkr/add_unban_button 
CSS for un-ban button in RoomSettings
 2017-02-17 12:46:13 +00:00
David Baker 8224d7fc60 Oops - remove empty CSS selector 2017-02-16 15:14:53 +00:00
Luke Barnard fc0e460222 Remove z-index property on avatar initials 
This seemingly doesn't do anything and upsets things when avatars overlap (i.e. for the new typing avatars).

See https://github.com/matrix-org/matrix-react-sdk/pull/699
 2017-02-16 11:42:32 +00:00
Luke Barnard 827692b9b0 Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning 
Reposition certain icons in the status bar
 2017-02-15 15:56:41 +00:00
Luke Barnard bfad7612c6 Re-position certain icons in the status bar 
Also, make sure the typing avatars line up with the arrow to jump to the bottom of the timeline.
Also, get rid of any height jumps when a call starts. border 1px hidden does not add any height to an element, it is effectively the same as none.
 2017-02-15 15:45:24 +00:00
David Baker f1f54c95ab Copyright 2017-02-14 18:11:36 +00:00
David Baker 5ecf560675 CSS for un-ban button in RoomSettings 2017-02-14 17:56:42 +00:00
David Baker 324e596e28 CSS for kick/ban confirmation dialog 2017-02-14 13:42:06 +00:00
David Baker c6ccfa0616 Copyright 2017-02-13 16:15:27 +00:00
David Baker 9e2793dfed Style for split-out interactive auth 
For https://github.com/matrix-org/matrix-react-sdk/pull/691
 2017-02-13 16:10:43 +00:00
Matthew Hodgson 6a7daaf6c4 remove GA, given it's increasingly useless given Riot/Desktop doesn't use it, plus it obviously has privacy implications. It may get re-added as opt-in in future, so we're not sailing entirely blind on how folks use the app, or we may switch to Piwik etc instead. 2017-02-10 17:21:02 +00:00
Luke Barnard 78aaf6b47e Use the teamToken threaded through from react sdk 
The bottom left menu now uses the same teamToken that the rest of the components use. This will require changes to react-sdk: https://github.com/matrix-org/matrix-react-sdk/pull/684
 2017-02-10 09:56:15 +00:00
Luke Barnard 36b08fece7 Float the toggle in the top right of MELS 
This is so that it stays put when the MELS is toggled.

Added style for a line that appears below "collapse" to indicate start of events.

Not possible to put "collapse" next to the expanded events because of read receipts.
 2017-02-09 15:17:03 +00:00
Matthew Hodgson f2a6d2cc5a fix selector color 2017-02-09 12:01:00 +00:00
Matthew Hodgson 22b7b8efea tweak sending color some more 2017-02-09 11:02:42 +00:00
Matthew Hodgson e392d6c16b fix CSS for import/export buttons 2017-02-09 02:00:23 +00:00
Matthew Hodgson 2eec9b10ef fix dark skin event sending color 2017-02-09 01:42:36 +00:00
Matthew Hodgson 64f0beb1eb fix https://github.com/vector-im/riot-web/issues/3136 2017-02-09 01:33:26 +00:00
Matthew Hodgson f6b6673a41 fix selection text colour in dark theme 2017-02-09 01:20:30 +00:00
Matthew Hodgson d8042b193b be more specific on flex 2017-02-09 00:10:57 +00:00
Matthew Hodgson 5f745ff733 hopefully fix TopRight layout bug 2017-02-09 00:10:45 +00:00
Matthew Hodgson bac142ad26 fix tintability of home button 2017-02-08 23:28:30 +00:00
Matthew Hodgson caa30a742b fix table visuals in dark skin 2017-02-08 23:19:05 +00:00
Luke Barnard 5b239adfb8 Fix bug with home icon not appearing when logged in as team member 2017-02-07 14:58:25 +00:00
Luke Barnard fa552ad5af Merge branch 'develop' into luke/rts-welcome-pages 2017-02-07 12:41:52 +01:00
Luke Barnard 35bc384c51 Set team token in state on mount 2017-02-07 11:39:31 +00:00
Luke Barnard d490bd8638 Use home.html rather than welcome.html 2017-02-07 11:35:17 +00:00
Luke Barnard 8d4f81ff67 Remove redundant inline style 2017-02-07 11:34:49 +00:00
Luke Barnard 648204b6f9 Use import 2017-02-07 11:34:34 +00:00
Luke Barnard 3f49f020cf Copyright 2017-02-07 11:19:01 +00:00
Richard van der Hoff 7ceaabb166 RightPanel: remove superfluous divs 2017-02-03 12:00:33 +00:00
Richard van der Hoff 67e14ff363 Merge branch 'develop' into rav/hotkey-ux 2017-02-03 11:43:32 +00:00
Matthew Hodgson 0050e1557d fix darktheme for close button 2017-02-03 02:06:50 +00:00
Matthew Hodgson 654a025a9f fix button width for unkdevdialog 2017-02-03 02:06:50 +00:00
Richard van der Hoff a64e1cb936 Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc 
Allow mxc: URLs for icons in the NetworkDropdown
 2017-02-02 19:53:46 +00:00
David Baker 3903954bf2 Allow mxc: URLs for icons in the NetworkDropdown 
For https://github.com/vector-im/riot-web/issues/3086
 2017-02-02 19:35:36 +00:00
Matthew Hodgson 4c3a723aa8 make TopRightMenu more intuitive 
should fix https://github.com/vector-im/riot-web/issues/2827
 2017-02-02 18:42:03 +00:00
Matthew Hodgson c4a590f6af CSS for empty timelinepanels 2017-02-02 16:18:20 +00:00
David Baker 00c26088b1 Merge pull request #3110 from vector-im/luke/css-reg-icons 
Handle icons with width > height
 2017-02-02 14:29:23 +00:00
Luke Barnard e77709bc71 Merge branch 'develop' into luke/rts-welcome-pages 
Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-02 14:03:21 +00:00
Luke Barnard a2622a556c Remove SdkConfig dep 2017-02-02 14:01:12 +00:00
Luke Barnard 6a9e5deb7b Remove commented code 2017-02-02 14:00:21 +00:00
Luke Barnard 20a7e3adf9 Migrate existing pages over to RTS 
See matrix-org/riot-team-server#14
 2017-02-02 13:58:22 +00:00
Matthew Hodgson c6def48fe0 try to make joining rooms more obvious 2017-02-02 13:32:36 +00:00
Luke Barnard f2e62ff439 Use RTS URL passed through 2017-02-02 11:58:20 +00:00
Luke Barnard 874e32699a Handle icons with width > height 
Icons with width > height will now only assume a max-height of 100% as opposed to a height of 100%. This is so they don't overflow the width of 300px.
 2017-02-02 11:30:14 +00:00
Luke Barnard 4a34bee2dc Use localStorage `mx_team_token` to decide welcome page 2017-02-02 11:12:43 +00:00
Matthew Hodgson b137c82a7a tweak CSS for UnknownDeviceDialog to support scrollable content 2017-02-02 00:25:18 +00:00
Matthew Hodgson 23060a6833 fix ugly blue border on roomtiles 2017-02-01 22:24:23 +00:00
Luke Barnard 40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-01 11:34:24 +00:00
Matthew Hodgson 6369d76a74 poor man's dark theme for MD codeblocks 2017-01-27 18:18:23 +01:00
Luke Barnard 6374526f3c Merge pull request #3081 from vector-im/luke/css-login-support 
Add CSS for a support box in login
 2017-01-27 16:36:53 +00:00
Luke Barnard 78105bb4db Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo 
Allow a custom login logo to be displayed on login
 2017-01-27 16:34:39 +00:00
Luke Barnard 87db89b67a Replace inline styles for logos with css 
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
 2017-01-27 16:30:44 +00:00
Luke Barnard 02d6a10f67 Allow a custom login logo to be displayed on login 
This is to allow team logos to be shown when a user registers with a team email.
 2017-01-27 16:08:14 +00:00
Luke Barnard 029602fc73 Fix the width of input fields within login/reg box 
This is so they do not expand outside of the login area. (280px = 300px - 2px - 18px, 2px for borders, 18px for padding)
 2017-01-27 16:04:24 +00:00
Luke Barnard 5aa9592c71 Add CSS for a support box in login 
This box can be used to provide useful hints during registration/login.
 2017-01-27 16:02:33 +00:00
David Baker bb70622b55 Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour 
Set BaseAvatar_image bg colour = #fff
 2017-01-26 16:34:01 +00:00
Kegan Dougal b16fa4171a Close the dialog box after sending bugs 2017-01-26 13:42:37 +00:00
David Baker 7850f7e505 Fix badge spam: attempt 2 (#3073) 2017-01-26 12:58:29 +00:00
Richard van der Hoff f29e0bfe6d Revert "Merge pull request #3067 from vector-im/matthew/fix-badge-spam" 
This reverts commit f9db7f017d, reversing
changes made to 71b149de76.

This caused `number is not defined`
 2017-01-26 12:16:44 +00:00
David Baker f9db7f017d Merge pull request #3067 from vector-im/matthew/fix-badge-spam 
only recalculate favicon if it changes
 2017-01-26 11:44:11 +00:00
David Baker 71b149de76 Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails 
CSS tweak for email address lookup
 2017-01-26 11:34:51 +00:00
Matthew Hodgson ba5e7d4013 fix event-encrypting-color in dark theme 2017-01-26 00:54:00 +01:00
Matthew Hodgson 9797c2fb4b fix electron too 2017-01-26 00:31:52 +01:00
Matthew Hodgson 972a391296 only recalculate favicon if it changes 2017-01-26 00:28:22 +01:00
David Baker 4e41accc56 CSS tweak for email address lookup 
CSS tweak for https://github.com/matrix-org/matrix-react-sdk/pull/653
 2017-01-25 18:52:21 +00:00
Kegan Dougal 0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. 2017-01-25 16:51:26 +00:00
Luke Barnard 0021fb37f3 Set BaseAvatar_image bg colour = #fff 2017-01-25 14:27:25 +00:00
Kegsay 80c1ec0502 Merge pull request #3000 from vector-im/kegan/rageshake 
Implement bug reporting logic
 2017-01-25 10:34:05 +00:00
Kegan Dougal eaff0abfb0 Add link to Chrome issue status for fixing line numbers 2017-01-25 10:28:13 +00:00
Kegan Dougal e225d3e370 Preserve ordering of flush()es by not letting subsequent flush()es race 2017-01-24 17:05:01 +00:00
Kegsay 9a933e2ce5 Merge pull request #3045 from vector-im/kegan/rageshake-ui 
Add css for bug report dialog
 2017-01-24 15:47:49 +00:00
Kegan Dougal efbea0e942 Add css for bug report dialog 2017-01-24 14:45:16 +00:00
Luke Barnard 307c4f3dd1 Increase the max-height of the expanded status bar 
This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped.

Fixes #3041
 2017-01-24 14:02:44 +00:00
Kegan Dougal 6f3b70dbb0 Use Q promises and isPending to make logic simpler 2017-01-24 12:43:18 +00:00
David Baker 6db5329d9c Merge pull request #2971 from vector-im/dbkr/add_searching_known_users 
CSS for 'searching known users'
 2017-01-24 10:51:13 +00:00
Luke Barnard ea82b90d35 Merge pull request #2981 from vector-im/luke/feature-animated-status-bar 
Animate status bar max-height and margin-top
 2017-01-23 23:08:23 +00:00
Matthew Hodgson 706ffbec3c add riot logos 2017-01-23 19:01:35 +01:00
Kegan Dougal f3df86872b Fix tightlooping when flush()ing without any logs 
The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.

This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
 2017-01-23 17:37:57 +00:00
Luke Barnard b7204bf868 Use primary bg color on statusArea 2017-01-23 13:33:39 +00:00
Luke Barnard c4d246cd72 Merge branch 'develop' into luke/feature-animated-status-bar 2017-01-23 13:31:48 +00:00
Luke Barnard b582cf0a5f Remove CSS for StatusBar mid-timeline 2017-01-23 13:30:39 +00:00
Luke Barnard 57126efe86 Reposition typing avatars relative to "is typing" 2017-01-23 10:24:23 +00:00
Kegan Dougal 2ecf65f057 Keep the logs if no store exists 2017-01-23 09:28:48 +00:00
Matthew Hodgson d907421ad4 crappy CSS for UnknownDeviceDialog 2017-01-22 01:25:32 +01:00
Matthew Hodgson ef519231d6 fix mute button colors 2017-01-20 21:16:58 +00:00
Matthew Hodgson 83272f5cc5 fix badge color again 2017-01-20 21:11:28 +00:00
Matthew Hodgson 5b1fea46cb fix badge color 2017-01-20 21:09:49 +00:00
Matthew Hodgson a9c575b4d0 fix a bunch of dark-theme buttons 2017-01-20 21:00:33 +00:00
Luke Barnard a24b568b73 Merge pull request #2998 from vector-im/luke/css-typing-avatars 
CSS for avatars that appear when users are typing
 2017-01-20 17:43:36 +01:00
lukebarnard afcf9de8d4 Handle avatars with initials 2017-01-20 17:35:01 +01:00
lukebarnard 9ffedf5e7d space after colons 2017-01-20 17:00:59 +01:00
lukebarnard 956deca844 Add bg-color border to typing avatars 2017-01-20 16:59:41 +01:00
Kegan Dougal ea063ab8b0 Address race conditions when flushing logs 2017-01-20 14:46:19 +00:00
Kegan Dougal 378126e746 Add another store to keep last modified times 
This makes it easier to get a list of all the log IDs. It also makes it possible
to order the logs by the *LAST* log line and not the first as was the case
previously, which is important in the case of long-running tabs.
 2017-01-20 14:00:30 +00:00
Kegan Dougal 41c6294be2 Remove clearAll from consume(): we want duplicate logs on multiple reports 2017-01-20 13:02:57 +00:00