TriHard
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity
18,798 Commits
2 Branches
0 Tags
2 GiB
Commit Graph

15003 Commits (451d9a17520346275494f8bf72b6a89663d2bfc8)

Author SHA1 Message Date
Aevann1 56a7347fc1 add confirmation for chat msg deletion 2022-09-14 13:25:00 +02:00
Aevann1 41212779a9 make troon/trannie/tranny get replaced by :marseytrain: instead of (((unicode))) emoji 2022-09-14 13:19:47 +02:00
Aevann1 566c5b19e3 fuck sake 2022-09-14 13:02:46 +02:00
Aevann1 a6ce6135d8 fix 2022-09-14 13:00:46 +02:00
Aevann1 c2f397df40 show the original file in /marseys 2022-09-14 12:55:35 +02:00
Aevann1 804c2b4e23 allow hole jannies to move posts in their hole to /h/chudrama 2022-09-14 12:45:28 +02:00
Aevann1 a567e71767 smaller expanded image on desktop 2022-09-14 11:52:23 +02:00
Aevann1 135bd2c60c remove unnecessary gay shit 2022-09-14 11:20:59 +02:00
Aevann1 65d396a499 kofi 2022-09-14 10:28:01 +02:00
Aevann1 4de53229d0 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-14 10:01:28 +02:00
Aevann1 5587b415dc fix kofi webhook 2022-09-14 10:01:25 +02:00
geese-suck a800363d70
Update assetcache.html 2022-09-13 21:28:38 -07:00
geese-suck e52685843e
Update classic.css 2022-09-13 21:28:17 -07:00
Aevann1 f91684702f sneed 2022-09-14 03:00:04 +00:00
outruncolors 3ebccf35d1
Add order page (#353) 
* Add order page route

* Initial backend post route

* Move to static and prevent logged in users

* Update files/routes/static.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Make requested changes

* Last snake changes

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-13 21:21:25 -05:00
Aevann1 14c72fb99e sneed 2022-09-14 02:00:02 +00:00
Aevann1 94e032c5fe sneed 2022-09-13 22:03:14 +00:00
gooseman caf495516b completely rehaul classic theme 
classic dark to come when i feel like it lol
 2022-09-13 14:55:59 -07:00
Aevann1 1939396d69 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 22:48:24 +02:00
Aevann1 c13a1524fa dramacoin -> coin 2022-09-13 22:46:08 +02:00
Aevann1 333e6dc712 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 20:18:02 +00:00
Aevann1 4f290d1fab sneed 2022-09-13 20:17:28 +00:00
Aevann1 1f79a563bf dramacoins -> coins 2022-09-13 22:13:58 +02:00
Aevann1 df2de5f087 rearrange 2022-09-13 21:44:06 +02:00
Aevann1 16a8012ccd Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 20:06:59 +02:00
Aevann1 a7236cd807 fix typo 2022-09-13 20:06:57 +02:00
Aevann1 906c8b5138 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 18:03:15 +00:00
Aevann1 73ae8f6e65 give a badge to permenantly marsified users 2022-09-13 20:02:08 +02:00
Aevann1 e4e42c6b2c give 250 DC to marsey creators 2022-09-13 20:00:11 +02:00
Aevann1 af66453f2b fix NaN on gifting on mobile 2022-09-13 19:45:00 +02:00
Aevann1 dff5bcefcf add loop.index to vote tables 2022-09-13 19:35:33 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 d69a853c77 sneed 2022-09-13 16:00:04 +00:00
Aevann1 bab57fd48b Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 17:22:20 +02:00
Aevann1 e69827e6e0 kofi integration (testing on devrama) 2022-09-13 17:22:18 +02:00
Aevann1 3eab2e84d2 sneed 2022-09-13 14:00:02 +00:00
Aevann1 55029de8b1 sneed 2022-09-13 13:00:02 +00:00
Aevann1 eb50e7a791 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 13:05:15 +02:00
Aevann1 9f6ec11cd4 remove unnecessaryu block from bootstrap.js 2022-09-13 13:05:13 +02:00
Aevann1 429cf81c71 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-13 11:00:56 +00:00
Aevann1 d3e8a7f86c perserve asset_submission fields on error 2022-09-13 13:00:47 +02:00
Aevann1 cfc7570143 sneed 2022-09-13 11:00:04 +00:00
Aevann1 0e198ffcdb remove unused var 2022-09-13 12:52:32 +02:00
Aevann1 cda73fe9d4 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2709344?context=8#context 2022-09-13 12:47:50 +02:00
Aevann1 f88aa5de14 cosmetic change 2022-09-13 12:44:21 +02:00
Aevann1 39dfd05a27 move "donate" up 2022-09-13 12:31:26 +02:00
Aevann1 94ed6a2d38 blocking adjustments 2022-09-13 12:27:28 +02:00
Aevann1 f11dcf031b give notif on bagde removal 2022-09-13 12:27:09 +02:00
Aevann1 7edc44ff6f fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2713626?context=8#context 2022-09-13 11:59:40 +02:00
Aevann1 0c3cf0128a "That" -> "This" 2022-09-13 11:59:29 +02:00
Aevann1 71f4e511d6 sneed 2022-09-13 11:42:53 +02:00
Aevann1 799f8a465b delete duplicate sidebar images 2022-09-13 11:28:38 +02:00
Aevann1 0302270e16 more detailed pin/unpin messages 2022-09-13 11:01:30 +02:00
Aevann1 cc5b476f3c Revert "wtf?" 
This reverts commit 8ff5edc8e9.
 2022-09-13 09:23:23 +02:00
Aevann1 8ff5edc8e9 wtf? 2022-09-13 09:19:54 +02:00
Aevann1 3db7be4d61 casino constitency 2022-09-13 08:59:39 +02:00
Aevann1 5b7dc29445 sneed 2022-09-13 06:00:02 +00:00
Aevann1 53ba5e0a12 sneed 2022-09-13 04:00:04 +00:00
Outrun Colors fec1ba8438
Use correct number and not index for color 2022-09-12 22:29:19 -05:00
Outrun Colors a7ab4523de
Skip winners on 0 and 00 2022-09-12 22:14:55 -05:00
Outrun Colors 947d097087
Make poker chips a circle 2022-09-12 21:04:32 -05:00
Aevann1 da5db208f6 sneed 2022-09-13 02:00:02 +00:00
Aevann1 84d76187c9 sneed 2022-09-13 01:19:26 +00:00
Aevann1 76aaca0039 sneed 2022-09-13 01:19:22 +00:00
outruncolors 7d8cfe5576
Add Roulette (#351) 
* Add roulette file

* Rename variable to avoid name collission

* Add basic route and create new template for game

* More work on the roulette template

* Initial connection of front-end roulette to back-end roulette

* Add to cron job

* Pass bets to the front end

* Update front-end looks

* Add stackable poker chips for bets

* Minor last changes

* Handle minimum bets

* Add bet table
 2022-09-12 20:07:39 -05:00
Aevann1 e0d32c7105 dont send me a notif 2022-09-12 19:52:07 +02:00
Aevann1 94c69dc137 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 19:40:55 +02:00
Aevann1 8ca494f7c2 add limits in oauth apps page 2022-09-12 19:40:53 +02:00
Aevann1 8613b867a5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 17:34:26 +00:00
Aevann1 192e79f359 add grillcastyes 2022-09-12 19:34:12 +02:00
Aevann1 da98858e24 sneed 2022-09-12 17:00:03 +00:00
Aevann1 8299c48464 sneed 2022-09-12 15:00:02 +00:00
Aevann1 b3d2fca506 remove kf replacing 2022-09-12 13:59:49 +02:00
Aevann1 3425da05e3 remove marsey.cat from trusted domains 2022-09-12 13:59:11 +02:00
Aevann1 7c1b6eac77 same as last commit 2022-09-12 13:51:56 +02:00
Aevann1 a4f2260787 fix "until" missing from badge description 2022-09-12 13:51:26 +02:00
Aevann1 c96d6097b1 Revert "mass trim emojis" 
This reverts commit 706f3e9440.
 2022-09-12 13:12:01 +02:00
Aevann1 784e96fc1c ping chiobu whenever some1 mentions his name 2022-09-12 13:06:46 +02:00
Aevann1 5b736da19c change marseyemperor 2022-09-12 13:05:20 +02:00
Aevann1 b7013698c2 change resize for marseys from 300px to 250px 2022-09-12 13:05:16 +02:00
Aevann1 d7c3ddf474 add created_utc column to all tables 2022-09-12 12:19:35 +02:00
Aevann1 4abf75edc0 add error codes 2022-09-12 11:52:07 +02:00
Aevann1 7e811b47fb reporting improvement 2022-09-12 11:48:01 +02:00
Aevann1 2ffe0d527e notif color consistency 2022-09-12 11:36:49 +02:00
Aevann1 be2ff53d85 mass trim badges 2022-09-12 11:31:04 +02:00
Aevann1 46e7be0c0b mass trim sidebar images 2022-09-12 11:28:12 +02:00
Aevann1 706f3e9440 mass trim emojis 2022-09-12 11:20:03 +02:00
Aevann1 7d3c67d1c2 sneed 2022-09-12 08:00:04 +00:00
Aevann1 3dc755e5a0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705957?context=8#context 2022-09-12 09:53:01 +02:00
Aevann1 56c4f8ccf0 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705881?context=8#context 2022-09-12 09:34:12 +02:00
Aevann1 d6a0426d89 change name of hat 2022-09-12 09:26:32 +02:00
Aevann1 6601d0d6be sort alphabetically 2022-09-12 09:22:35 +02:00
Aevann1 512cedc2b6 fix prev commit 2022-09-12 09:19:50 +02:00
Aevann1 ee756bf4b6 minor submission changes 2022-09-12 09:17:57 +02:00
Aevann1 c057d1baf1 cosmetic change 2022-09-12 09:11:18 +02:00
Aevann1 5b0b0f6ebb refactor original hats and marseys 2022-09-12 09:06:50 +02:00
Aevann1 5804a93b11 cosmetic change 2022-09-12 07:38:02 +02:00
Aevann1 2e31b52366 for consistency's sake, don't use {sub.name} inside strings anymore 2022-09-12 07:25:04 +02:00
Aevann1 eb69b039a0 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705620?context=8#context 2022-09-12 07:23:16 +02:00
Aevann1 cc0f2059c3 more descriptive success messages 2022-09-12 07:23:08 +02:00
Aevann1 41dac65e9c fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2702071?context=8#context 2022-09-12 07:05:11 +02:00
Aevann1 3302c97bcb Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-12 07:01:38 +02:00
Aevann1 cce159dc84 ping mccox whenever someone mentions his name 2022-09-12 07:01:37 +02:00
Aevann1 022e754a34 sneed 2022-09-12 05:00:05 +00:00
Aevann1 73ff78d0f5 fix 1st part of this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2705204?context=8#context 2022-09-12 06:38:04 +02:00
Aevann1 950bb0b9cb sneed 2022-09-12 04:00:02 +00:00
Aevann1 f21848e4ff sneed 2022-09-12 01:00:02 +00:00
Aevann1 dbad75a53f sneed 2022-09-11 22:00:03 +00:00
Aevann1 f9dda990e1 sneed 2022-09-11 18:00:02 +00:00
Aevann1 a5dae68b12 sneed 2022-09-11 17:00:03 +00:00
Aevann1 d01dd203e1 sneed 2022-09-11 16:00:01 +00:00
Aevann1 c015c6ee48 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-11 14:39:10 +00:00
Aevann1 1e49bb9e2c make submitted hats prices 1000 when animated 2022-09-11 16:35:34 +02:00
Aevann1 4fd3ebc967 useless commit 2022-09-11 16:32:04 +02:00
Aevann1 fbe7089d2a more detailed success message description 2022-09-11 16:32:00 +02:00
Aevann1 9253d8d8b4 sneed 2022-09-11 14:00:03 +00:00
Aevann1 6e60147435 update 2 marseys 2022-09-11 15:49:58 +02:00
Aevann1 ce0b141325 specify the type of color code we want 2022-09-11 12:04:21 +02:00
Aevann1 691857b805 cosmetic change 2022-09-11 11:59:39 +02:00
Aevann1 0e299656b2 cosmetic change 2022-09-11 11:49:19 +02:00
Aevann1 99f6d8d468 cosmetic change 2022-09-11 11:48:35 +02:00
Aevann1 00ad36a98b cosmetic change 2022-09-11 11:46:37 +02:00
Aevann1 b0fd3dc5b6 cosmetic change 2022-09-11 11:45:25 +02:00
Aevann1 b840a69f02 cosmetic change 2022-09-11 11:44:12 +02:00
Aevann1 40558765db cosmetic change 2022-09-11 11:41:52 +02:00
Aevann1 0c1ea35137 make highlights consistent 2022-09-11 11:16:45 +02:00
Aevann1 4bec67c15a small cosmetic change 2022-09-11 11:14:53 +02:00
Aevann1 09422ebf29 highlight unread DMs in /notifications/messages 2022-09-11 11:06:09 +02:00
Aevann1 9c8bc0fdd6 allow ppl blocked by someone to visit that someone's profile 2022-09-11 10:57:06 +02:00
Aevann1 14961d856f trim non-animated marseys and increase width to 300px 2022-09-11 10:49:46 +02:00
Aevann1 8127af07ca update marseysipping 2022-09-11 09:35:21 +02:00
Aevann1 b0057483c8 link the admigger upload threads in the admin panel for easier access 2022-09-11 09:11:10 +02:00
Aevann1 fac017bea1 "rDrama.net Casino" -> "Casino" 2022-09-11 09:03:52 +02:00
Aevann1 fda1f1e562 allow asset submitters to remove their pending shit 2022-09-11 09:03:34 +02:00
Aevann1 aefc3703ce remove unnecessary id 2022-09-11 08:46:49 +02:00
Aevann1 cd79a86b99 same as last commit 2022-09-11 08:45:43 +02:00
Aevann1 5546bf56f3 same as last commit 2022-09-11 08:41:48 +02:00
Aevann1 3e6a3ef52d expose the pngs 2022-09-11 08:41:28 +02:00
Aevann1 98192c7b00 add white border to images in /sumbit 2022-09-11 08:33:36 +02:00
Aevann1 9c473d899f fix pcm casino 2022-09-11 06:49:33 +02:00
Aevann1 4edeb5ed2b same as last commit 2022-09-11 06:11:25 +02:00
Aevann1 3b515e0e33 fix notifs margins 2022-09-11 06:10:29 +02:00
Aevann1 1cb41bfe1f groomercord screenshots dont belong on the sidebar 2022-09-11 06:03:11 +02:00
Aevann1 fd6e8fc4b1 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2694340?context=8#context 2022-09-11 05:59:11 +02:00
Aevann1 afd185cd44 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-11 05:57:25 +02:00
Aevann1 d794816943 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2694421?context=8#context 2022-09-11 05:57:22 +02:00
Aevann1 501abd8082 sneed 2022-09-11 03:00:03 +00:00
Aevann1 0bc816328c nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger nigger 2022-09-11 04:29:22 +02:00
Aevann1 ea17fa53c9 stop the error spam 2022-09-11 04:27:27 +02:00
Aevann1 eb9f0e7605 remove duplicate sidebar img 2022-09-11 04:12:11 +02:00
Aevann1 b2b73b2658 sneed 2022-09-11 04:11:06 +02:00
Aevann1 28ab86c310 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-11 04:05:52 +02:00
Aevann1 20c5ad015b relax ratelimits in casino 2022-09-11 04:05:50 +02:00
Aevann1 4ab7fba8e0 sneed 2022-09-11 02:00:05 +00:00
Aevann1 cefd68755d stop the print spam 2022-09-11 03:56:47 +02:00
Aevann1 ae90eb1cf2 simplify house checking logic 2022-09-11 03:53:16 +02:00
Aevann1 1fb897a309 move notif messages tab 2022-09-11 03:46:18 +02:00
Aevann1 55c20a67f5 remove hq images that dont fit requirements 2022-09-11 03:28:26 +02:00
Aevann1 4a128e5ab3 sneed 2022-09-11 01:00:02 +00:00
Aevann1 89ddac56b9 sneed 2022-09-11 00:00:02 +00:00
Aevann1 acf73d00ef sneed 2022-09-10 23:00:02 +00:00
Aevann1 c9b9a49cad sneed 2022-09-10 22:00:02 +00:00
Aevann1 af5d392fc0 sneed 2022-09-10 21:06:47 +00:00
outruncolors d57a569125
[DO NOT MERGE] Casino changes (#350) 
* Merge up

* Create composable template for casino games

* Big changerinos

* Only allow double down sometimes

* Add drawing capability

* Make everything pretty

* Add leaderboard

* Update files/routes/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/casino.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Update files/helpers/twentyone.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Add some stuff

* Rehab screen

* Default sets for no games

* Stupid revert

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-10 16:01:34 -05:00
Aevann1 89a162c2f2 sneed 2022-09-10 21:00:02 +00:00
Aevann1 a90d710177 sneed 2022-09-10 20:00:01 +00:00
Aevann1 593aa416e9 sneed 2022-09-10 18:48:59 +00:00
Aevann1 571adad79a Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-10 18:48:34 +00:00
Snakes b8675977b6
Show sidebar on all posts, including unholed. 2022-09-10 14:46:10 -04:00
Snakes a0bd960b19
Add hat template link to submit_hats. 2022-09-10 14:45:10 -04:00
Aevann1 db08162dc1 sneed 2022-09-10 18:00:03 +00:00
Aevann1 3b81192f03 sneed 2022-09-10 17:00:02 +00:00
Aevann1 6815e3fddb sneed 2022-09-10 16:00:02 +00:00
Aevann1 87bcc958fa sneed 2022-09-10 15:00:03 +00:00
Aevann1 5338801eed sneed 2022-09-10 14:00:01 +00:00
Aevann1 89ab532425
Update asset_submissions.py 2022-09-10 15:46:56 +02:00
Aevann1 48e1c653db 2 folders instead of prefixes 2022-09-10 13:07:58 +02:00
Aevann1 4d7a53d6ea cosmetic fix 2022-09-10 11:44:06 +02:00
Aevann1 18a530a330 wtf 2022-09-10 11:41:59 +02:00
Aevann1 ee630e55c9 testing 2022-09-10 11:40:57 +02:00
Aevann1 332ab2cbdf fix is_available 2022-09-10 11:37:43 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 8f0b2ea9c3 test on devrama 2022-09-10 11:31:51 +02:00
Aevann1 c968b1a4df remove element instead of hiding it 2022-09-10 11:31:43 +02:00
Aevann1 327176d31b show most recent replies in /notifications at the top 2022-09-10 11:06:34 +02:00
Aevann1 c99343e9e0 bump hole price to 100k (per poll) 2022-09-10 11:03:21 +02:00
Aevann1 5824385589 more commas in leaderboard 2022-09-10 11:01:53 +02:00
Aevann1 57247b2fbc more commas 2022-09-10 10:47:16 +02:00
Aevann1 8b5b6a2429 fix sorting 2022-09-10 10:45:37 +02:00
Aevann1 b99cc4a8aa remove surgical tools I forgot in the patient's body 2022-09-10 10:42:17 +02:00
Aevann1 e7352bb1c6 remove a banner 2022-09-10 10:34:10 +02:00
Aevann1 1a6fbd1f29 sneed 2022-09-10 08:04:59 +00:00
Aevann1 da5742e0bc sneed 2022-09-10 08:04:54 +00:00
Aevann1 bbfdaf0dbe sneed 2022-09-10 08:04:50 +00:00
Snakes 1b3c042552
Change notification bell colors for messages. 
Messages bell is now an orange-ish gold. To avoid confusion with the
yellowish-goldish modactions bell, modactions are now green.
 2022-09-10 03:56:37 -04:00
Snakes 7586dfdbc8
asset_submissions: respect hat case-sensitivity. 
Unlike Marsey names and tags, we display hat names & descriptions
with respect for capitalization. The filesystem and database treat
hat names as case-sensitive too, so there's no risk of conflict.
 2022-09-10 03:56:37 -04:00
Snakes 0950dc81b8
Move asset submission routes out of static.py. 2022-09-10 03:56:37 -04:00
Aevann1 c1aae95d16 restore "notify followers" checkbox 2022-09-10 09:00:45 +02:00
Aevann1 34aaed8045 add commas to numbers 2022-09-10 08:43:38 +02:00
Aevann1 b6cd2a839e same as last commit 2022-09-10 08:22:59 +02:00