mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-29 06:42:07 +00:00
Code Issues Projects Releases Wiki Activity
3833 commits 10 branches 99 tags 157 MiB
Commit graph

494 commits

Author SHA1 Message Date
Nicolas Lœuillet
66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist
f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout 
Fix password layout
 2016-11-23 09:53:18 +01:00
Nicolas Lœuillet
0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Jeremy Benoist
be2725db40
Add migration for new FOSUser version 2016-11-22 21:25:05 +01:00
Jeremy Benoist
5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist
9624b3adfa
These files aren’t used anymore 
Translation were moved to the global one
 2016-11-22 21:23:58 +01:00
Jeremy Benoist
176e0ea3ca Merge pull request #2317 from wallabag/restricted-access 
Added authentication for restricted access articles
 2016-11-22 19:12:53 +01:00
Nicolas Lœuillet
d51093a7d9
Added documentation and missing translations 2016-11-22 17:32:24 +01:00
Nicolas Lœuillet
d64bf7953b
Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
Bertrand Dunogier
7aab0ecf2f Added authentication for restricted access articles 
Fix #438. Thank you so much @bdunogier
 2016-11-22 14:01:46 +01:00
Nicolas Lœuillet
c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Thomas Citharel
944b8d6175 Merge pull request #2613 from wallabag/fix-overlap 
Fix card action overlap
 2016-11-22 10:27:14 +01:00
Jeremy Benoist
eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
Jeremy Benoist
625bb56181 Merge pull request #2624 from Rurik19/master 
Fix #2056 update config.yml
 2016-11-21 13:14:31 +01:00
Nicolas Lœuillet
98253436e9
Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Yuriy Evdokimov
05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov
5e7fdfc8dd Fix #2056 update config.yml 
Resolves refresh token lifetime issue
 2016-11-21 11:13:40 +05:00
Jeremy Benoist
c1683778ab
Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Jeremy Benoist
77e2898ad4
Fix card action overlap 
On smaller resolution
 2016-11-20 10:14:19 +01:00
Jeremy Benoist
3c969d3990
Add missing translations 2016-11-20 09:39:25 +01:00
Nicolas Lœuillet
995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
ee122a7528 Added a simple search engine 
Fix #18
 2016-11-19 19:17:30 +01:00
Jeremy Benoist
68003139e1
Merge remote-tracking branch 'origin/master' into 2.2 
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
 2016-11-19 15:30:49 +01:00
Nicolas Lœuillet
8fdadee3a5
Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet
e10e6ab34e
Replace http status with a string 
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
 2016-11-18 15:55:16 +01:00
Nicolas Lœuillet
10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Nicolas Lœuillet
5d2971cadd
Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Jeremy Benoist
9e2440fe15
Fix migration 2016-11-17 08:05:15 +01:00
Nicolas Lœuillet
a42f38d9fb
Added a configuration to define the redirection after archiving an entry 
Fix #496
 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
94f2057ffe
Added CSS class on links 2016-11-16 09:17:12 +01:00
Thomas Citharel
10a1ffae53
Fix keyboard navigation on quickstart view 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 22:23:50 +01:00
Thomas Citharel
c930992348 fix next/prev page 2016-11-15 21:55:16 +01:00
Thomas Citharel
5637a26e9a Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! 
Also better indentation for js files (changed editorconfig for them).

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 21:55:10 +01:00
Nicolas Lœuillet
16ef7607f4 Reorganized JS folders for shortcuts 2016-11-15 21:54:50 +01:00
Thomas Citharel
af61cb80eb es6 imports 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 21:54:41 +01:00
Nicolas Lœuillet
f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet
49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet
3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet
80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet
1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Nicolas Lœuillet
8a9604aafe Added unmark.it sharing 
Fix #668
 2016-11-09 18:18:49 +01:00
Jeremy Benoist
8d7b4f0eff
Display a bigger image in case of image content 
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
 2016-11-08 22:17:46 +01:00
Jeremy Benoist
7005b425e0
Remove the left margin of tag 
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
 2016-11-08 22:15:37 +01:00
Jeremy Benoist
41c2178685 Merge pull request #2548 from wallabag/pinboard 
Add Pinboard import
 2016-11-08 14:19:40 +01:00
Nicolas Lœuillet
db3838545c
Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist
9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Nicolas Lœuillet
a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Nicolas Lœuillet
2db9142bfc Merge pull request #2460 from wallabag/ui-changes 
UI Changes
 2016-11-04 08:49:52 +01:00
Jeremy Benoist
1e7b04d4ea
Use created_at as default sort 
With index (following https://github.com/wallabag/wallabag/pull/2534)
 2016-11-04 07:56:04 +01:00
Jeremy Benoist
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist
da41365579 Merge pull request #2180 from wallabag/download-pictures 
Download pictures
 2016-11-03 16:22:07 +01:00
Thomas Citharel
32508ef07a
avoid eslint warning by disabling line 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 14:23:09 +01:00
Thomas Citharel
d56d416d9b
Deal with more resolution issues 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 12:49:57 +01:00
Thomas Citharel
3221b2e413
Fix resolution issues and 'title' issues 
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 11:28:40 +01:00
Jeremy Benoist
3be554c78f Merge pull request #2519 from Jibec/master 
Translation update - French
 2016-11-02 07:48:10 +01:00
Nicolas Lœuillet
3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet
e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist
aedd6ca0fd
Add translations & migration 2016-10-31 13:29:33 +01:00
Jean-Baptiste
a0eddc598e Translation update - French 2016-10-30 12:09:08 +01:00
Jeremy Benoist
535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Nicolas Lœuillet
c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
Nicolas Lœuillet
f08ec5f88a Remove backquote in query 2016-10-28 11:14:14 +02:00
Nicolas Lœuillet
f24ea59ea4
Fixed migration and added tests 2016-10-28 10:55:39 +02:00
Jeremy Benoist
c68720d40e Merge pull request #2473 from pmichelazzo/master 
Portuguese (Brazilian) translation
 2016-10-25 11:41:24 +02:00
Nicolas Lœuillet
23406ca3f1
Added relation between API Client and User 
Fix #2062
 2016-10-24 21:56:28 +02:00
Nicolas Lœuillet
d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
f623516e10
SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Baptiste Mille-Mathias
d1b075509d Add relevant links to fetch content error pages. 
We link to the troubleshooting guide and give the mail link.
 2016-10-23 15:34:52 +02:00
Jeremy Benoist
5ce1528953
Fix migrations 2016-10-23 12:35:57 +02:00
Jeremy Benoist
5751b41491
Add migration for MySQL utf8mb4 2016-10-22 14:01:58 +02:00
Jeremy Benoist
fc79f1ffa8
Add verification check for MySQL version 
Must now be >= 5.5.4
 2016-10-22 13:41:03 +02:00
Jeremy Benoist
b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist
2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist
98efffc2a6
Fix emoji insertion in MySQL 
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
 2016-10-22 13:13:07 +02:00
Jeremy Benoist
206bade58a
Add ability to reset some datas 
- annotations
- tags
- entries
 2016-10-22 13:13:06 +02:00
Jeremy Benoist
817724a7b8
Re-add bottom pagination 
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
 2016-10-22 13:09:16 +02:00
Thomas Citharel
ab61dbc073
remove padding on small widths 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-22 13:08:12 +02:00
Thomas Citharel
34aa06a9b9
WIP 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-22 13:08:04 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes 
Some fixes
 2016-10-21 15:15:41 +02:00
Jeremy Benoist
2cbf0d05d4
Update translation for piwik_host 2016-10-21 10:45:39 +02:00
Jeremy Benoist
2297d60f10
If reload content failed, don’t update it 
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
 2016-10-20 22:49:46 +02:00
Paulino Michelazzo
5d6cffedb1 Update Portuguese (Brazilian) translation 
Adding the config.yml on the package.
 2016-10-19 19:25:48 +02:00
Paulino Michelazzo
99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
Paulino Michelazzo
3a3c6b866b Portuguese (Brazilian) translation 
This the Portuguese (Brazilian) for the Wallaby v2.
 2016-10-18 20:51:31 +02:00
Nicolas Lœuillet
f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet
ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Nicolas Lœuillet
5e469b91d9
Fixed hardcoded title for internal settings 
Fix #2458
 2016-10-17 09:14:05 +02:00
Jeremy Benoist
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs 
Fix tabs on material
 2016-10-16 21:06:23 +02:00
Jeremy Benoist
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width 
Fix baggy display on small screens
 2016-10-16 21:05:30 +02:00
Sven Fischer
5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +02:00
Thomas Citharel
d9a30ef301 Fix tabs on material 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-15 19:26:38 +02:00
Thomas Citharel
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist
f1c3f68e90
ApiDoc & Route annotation were conflicted 
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
 2016-10-15 16:46:42 +02:00
Thomas Citharel
8ecfdd7f8a Merge pull request #2450 from wallabag/new-improvement-view 
View improvements
 2016-10-15 15:38:49 +02:00
Thomas Citharel
08f5a5b6bd fix stylelint 2016-10-15 15:25:46 +02:00
Alexandr Danilov
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Thomas Citharel
76f2123def Merge pull request #2412 from wallabag/fix-postgres-migration 
Fix PostgreSQL migrations
 2016-10-15 14:42:46 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub 
API: ability to export entry in all available format (epub, pdf, etc...)
 2016-10-12 14:06:33 +02:00
Jeremy Benoist
fb8835cc8f Define a dev version for the master 
This is to be sure that user testing wallabag from the master will have the version defined as dev.
 2016-10-10 11:31:57 +02:00
Jeremy Benoist
4c79c51f99
Fix PostgreSQL migrations 2016-10-09 21:35:04 +02:00
Jeremy Benoist
e084778030
CS 2016-10-09 19:35:27 +02:00
Jeremy Benoist
28bb48905a
Optimize the way tag list is rendered 
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
 2016-10-09 18:55:22 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion 
Changed relation between API client and refresh token
 2016-10-08 13:31:54 +02:00
Jeremy Benoist
3f3a60879e
Add entry export in API 
Export isn't available for json & xml because user can use the default
entry endpoint instead.
 2016-10-08 12:59:19 +02:00
Jeremy Benoist
dd32c89ed6
Use default locale for user config 
When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
 2016-10-08 09:33:55 +02:00
Jeremy Benoist
ee32248f43
Ensure access_token are removed 
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
 2016-10-08 00:05:41 +02:00
Jeremy Benoist
6d204f5382
Add ability to use socket 
For Redis & MySQL
 2016-10-07 21:00:13 +02:00
Thomas Citharel
15f1352ef8
better tags on material 2016-10-05 14:06:55 +02:00
Thomas Citharel
645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00
Nicolas Lœuillet
5958597ba6
Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Thomas Citharel
c10adc1f76
typo and build on test 2016-10-04 15:59:56 +02:00
Thomas Citharel
6cb364a2c1
use airbnb base rules and update eslint 2016-10-04 15:30:05 +02:00
Nicolas Lœuillet
0c7f1ba796
Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel
46d78f87d9
fix icons 2016-10-04 14:48:22 +02:00
Thomas Citharel
9f7d154e34
Add eslint & stylelint tests (fix a few things) and move dependencies to dev 2016-10-04 12:14:28 +02:00
Jeremy Benoist
f440e28281
Update doc 
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
 2016-10-04 10:31:03 +02:00
Jeremy Benoist
9f3a1cd20c shaarli instead of Diaspora 2016-10-04 07:26:18 +02:00
Thomas Citharel
a494c33ef7
Basically, fix everything 
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
 2016-10-03 23:08:26 +02:00
Nicolas Lœuillet
0f70abd695
Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Nicolas Lœuillet
ab809de184 Merge pull request #2314 from wallabag/assets 
Assets work
 2016-10-03 09:09:45 +02:00
Jeremy Benoist
152fcccd44
Add users management UI 
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
 2016-10-02 11:08:53 +02:00
Jeremy Benoist
52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart 
Changed quickstart layout
 2016-10-02 11:06:03 +02:00
Jeremy Benoist
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Nicolas Lœuillet
a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
Jeremy Benoist
1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist
40e219622a
Customize errors templates 
All error goes to the same template which only display the error message and the status code.
 2016-10-01 14:58:48 +02:00
Thomas Citharel
0471e905b8
fonts & ligatures 2016-09-29 09:18:46 +02:00
Thomas Citharel
8f234d0156
remove autocomplete and bring fonts through npm 2016-09-28 18:59:15 +02:00
Thomas Citharel
c146f6940a
Assets work 
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
 2016-09-28 10:30:18 +02:00
Nicolas Lœuillet
084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
Nicolas Lœuillet
1ed965beb9
Remove CSS class who caused long loading on Firefox 
Fix #2302 #2281
 2016-09-27 20:52:30 +02:00
Jeremy Benoist
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist
ff1a5362f7 Add Instapaper import 
Also update ImportController with latest import (chrome, firefox & instapaper).
 2016-09-27 20:27:08 +02:00
Thomas Citharel
2c61db30b7
cs & fixes 2016-09-25 12:29:19 +02:00
Nicolas Lœuillet
32e95760f5 Merge pull request #2239 from wallabag/documentation-2.1 
Update documentation with new features for 2.1
 2016-09-20 14:29:16 +02:00
Mateusz Rumiński
b6fc1f2007 Update CraueConfigBundle.pl.yml 
fix misspell
 2016-09-19 23:16:37 +02:00
Mateusz Rumiński
1223c0811d Update CraueConfigBundle.pl.yml 
add missing translation
 2016-09-19 23:02:50 +02:00
Nicolas Lœuillet
e406a94ab6 Fixed version in documentation 2016-09-19 15:23:04 +02:00
Nicolas Lœuillet
8fed8d1bac Add documentation about article sharing 2016-09-19 15:20:46 +02:00
Jeremy Benoist
d7b4b2c72c
Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
Jeremy Benoist
da18a4682f Merge pull request #1941 from wallabag/v2-asynchronous-jobs 
Use asynchronous jobs for imports
 2016-09-19 07:15:40 +02:00
Jeremy Benoist
fbb319f064
Missing some migrations 
and CS
 2016-09-16 22:58:33 +02:00
Jeremy Benoist
ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Jeremy Benoist
ac87e0db2a
AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist
d4e366f6eb
Add missing translations 2016-09-13 22:38:05 +02:00
Jeremy Benoist
e01a3c98d6
Display how many messages are queue 
- update the docker-composer to add Redis
- add migrations
 2016-09-13 20:32:52 +02:00
Nicolas Lœuillet
d49c88f15a Remove footer part 2016-09-13 20:31:06 +02:00
Jeremy Benoist
b3437d58ae
Enable Redis async import 
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
 2016-09-11 21:58:56 +02:00