Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity
3,162 Commits 4 Branches 85 Tags 205 MiB
ed52474b51
Commit Graph

710 Commits

Author SHA1 Message Date
Thomas Citharel
1a3a3602d1
Change CLI delete user task to completly delete user by default 
And document the new option

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-13 14:36:55 +02:00
Thomas Citharel
cd5418825b
Make sure a person profile page returns 404 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-12 13:38:25 +02:00
Thomas Citharel
dad9623482
Make sure only proper pictures are uploaded 
Closes #384

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 19:29:12 +02:00
Thomas Citharel
c296381ed6
[Security] Fix events being editable by other users that organizers 
Closes #385

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 18:12:35 +02:00
Thomas Citharel
24238da393
Fix a typo in the path to picture on error template 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 17:07:10 +02:00
Thomas Citharel
75fc1f125a
Show a proper error message on creating/updating an event 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 16:09:45 +02:00
Thomas Citharel
9430f1145f
Fix profiles not administrators able to edit a group 
Related to #385

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 16:09:44 +02:00
Thomas Citharel
07a5d10421
Introduce support for custom nginx error pages 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-09 14:48:49 +02:00
Thomas Citharel
ed4042ed1e
Fix injecting metadata into HTML pages 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-08 10:41:30 +02:00
Thomas Citharel
f4b777c3d6
Make sure event update notification email gets sent to anonymous 
participants

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-08 08:53:25 +02:00
Thomas Citharel
9f9f58ce7d
Improve event update notification email 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-08 08:53:07 +02:00
Thomas Citharel
fbb1b2d607
Handle case when setting value is nil 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-08 08:19:59 +02:00
Thomas Citharel
77970b8091
Improve anonymous participation and confirmation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-07 17:05:15 +02:00
Thomas Citharel
9382e8fc74
Improve participation rejection email by adding bold 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-07 16:39:33 +02:00
Thomas Citharel
3a84e6dfa5
Improve anonymous participation confirmation email by adding bold 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-07 16:39:32 +02:00
Thomas Citharel
586d8c440d
Add languages to admin settings 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-07 16:38:24 +02:00
Thomas Citharel
02eac30c9b
Expose more statistics 
* differenciate local & all events/comments/groups
* add instance follows/followings

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-07 10:52:29 +02:00
Thomas Citharel
27a75cd0df
Improve some texts on account registration and email notification 
settings

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-06 15:36:19 +02:00
Thomas Citharel
05e5fc35d5
Improve profile registration 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-06 12:35:45 +02:00
Thomas Citharel
8eca9d9702
Make sure only organizer actor can comment if event comments are 
disabled

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-05 17:42:53 +02:00
Thomas Citharel
8ba23c858b
Fix issues in email change emails 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-05 14:46:08 +02:00
Thomas Citharel
a576d41b24
Fix typo in atom name 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-05 14:45:58 +02:00
Thomas Citharel
afb7d75307
Fix invitations 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-02 16:19:31 +02:00
Thomas Citharel
4896036cd1
Make sure event and group search only return the correct type 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-02 16:19:30 +02:00
Thomas Citharel
d41aa3b2fd
Disallow accessing identity page when logged in 
And disallow calls to fetchPerson when not our own profile or unlogged

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-02 09:53:32 +02:00
Thomas Citharel
beba4a16ea
Fix anonymous call to profile endpoint 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-01 19:10:18 +02:00
Thomas Citharel
e068326c4b
Fix duplicate events on homepage 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-01 17:51:07 +02:00
Thomas Citharel
aced4d039b
Fix posts and rework graphql errors 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-10-01 15:07:15 +02:00
Thomas Citharel
92367a5f33
Allow to report a group 
And multiple group tweaks

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-30 15:26:58 +02:00
Thomas Citharel
36cdcaa864
Send all event reminder notifications 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-30 10:45:01 +02:00
Thomas Citharel
dc8faa12bd
Sent notification that the event participation has been confirmed when 
anonymous

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-30 10:44:01 +02:00
Thomas Citharel
a600720062
Add local groups as statistics 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-30 10:42:19 +02:00
Thomas Citharel
49a5725da3
Improve and activate groups 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-29 10:25:00 +02:00
setop
bd3087d121
Fix geospatial clients 
add json plus to base client and rename to geospacial client
geospatial http client with json plug
 2020-09-21 14:46:07 +02:00
Thomas Citharel
aed2dadb35 Merge branch 'patch-1' into 'master' 
add debut statement to create activity

See merge request framasoft/mobilizon!563
 2020-09-21 11:53:55 +02:00
Thomas Citharel
b0e8a32d2a
Improvements to group page 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-21 11:18:49 +02:00
setop
31a2ede77f add debut statement to create activity 2020-09-12 00:42:35 +02:00
Thomas Citharel
69faeec14c
Allow to disable event creation 
And change the group toggle

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-02 15:08:47 +02:00
Thomas Citharel
952e592e2c
Show group address in group metadata 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-02 10:57:19 +02:00
Thomas Citharel
93728cb9d7
Add a noindex HTTP header on unlisted resources 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-02 10:57:18 +02:00
Thomas Citharel
489fd74545
Allow to refresh instance outbox when they accept subscription 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-02 10:57:18 +02:00
Thomas Citharel
c011a988a8
Fix relay outbox endpoint 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-09-02 10:50:22 +02:00
Thomas Citharel
aa7d919c98
Show user connection IP and date in admin 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-31 16:57:13 +02:00
Thomas Citharel
5f0497144a
Improve texts 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-31 14:25:21 +02:00
Thomas Citharel
45fa3e8ad0
Add login information to user 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-28 09:23:49 +02:00
Thomas Citharel
7c0b813dce
Fix getting remote IP behind reverse proxy 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-27 15:54:43 +02:00
Thomas Citharel
1984f71cbf
Add group admin profiles 
And other fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-27 12:12:54 +02:00
Thomas Citharel
4782221ef4
Allow to update a member role 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-20 10:54:58 +02:00
Thomas Citharel
bdb4350624
Add an authenticated fetch route for members 
If the member is remote, it redirects to original instance

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-19 11:29:02 +02:00
Thomas Citharel
6ae8de7560
Fix datetime unserialize on admin logs view 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-18 17:22:06 +02:00
Thomas Citharel
2ea6286d3f
Fix account suspension 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-18 17:21:58 +02:00
Thomas Citharel
156eba0551
Improve member adding and excluding flow 
Allow to exclude a member

Send emails to the member when it's excluded

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-18 14:37:31 +02:00
Thomas Citharel
3ca4291c9b
Remove the /events/explore route 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-12 17:55:38 +02:00
Thomas Citharel
1de802a36c Merge branch 'feature/sitemap' into 'master' 
Introduce sitemap and upgrade oban

See merge request framasoft/mobilizon!538
 2020-08-12 16:36:37 +02:00
Thomas Citharel
634c33c959
Add a mix task to generate a sitemap 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-12 16:35:46 +02:00
Thomas Citharel
c56fb710b6
Introduce Sitemaps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-12 16:29:34 +02:00
Thomas Citharel
9a0068dfea
Upgrade oban to 2.0 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-12 16:06:09 +02:00
Thomas Citharel
c09deb5bc6
Fix remote group visibility and use Mastodon's discoverable attribute 
Make sure actor visibility is :public or :unlisted

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-12 10:45:48 +02:00
Thomas Citharel
4fc1a984f9
Fix Tesla warning. 
No need to implement get/post functions here

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-11 10:13:25 +02:00
Thomas Citharel
163b189d75 Merge branch 'change-wording-on-email-change' into 'master' 
Fix some gettext issues with translations

See merge request framasoft/mobilizon!532
 2020-08-10 18:39:34 +02:00
Thomas Citharel
7162c30153
Fix some gettext issues with translations 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 18:30:15 +02:00
Thomas Citharel
e4e316b42b Merge branch 'change-wording-on-email-change' into 'master' 
Change wording on email modification notification sentence

See merge request framasoft/mobilizon!531
 2020-08-10 18:13:35 +02:00
Thomas Citharel
09c131c33b
Fix Schema.org SearchAction metadata 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 18:08:25 +02:00
Thomas Citharel
3263a84c51
Improve wording for emails 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 18:02:48 +02:00
Thomas Citharel
992e3af237
Add a VirtualLocation field to the event URL itself when location is not 
defined

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 16:22:15 +02:00
Thomas Citharel
3c077c59ad
Allow to search groups by location 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 15:40:24 +02:00
Thomas Citharel
b4f500532f
Allow to filter by begins_on and ends_on. Redirect explore to search 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 15:40:21 +02:00
Thomas Citharel
2198b2cb87
Allow to filter search by multiple tags 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 15:40:19 +02:00
Thomas Citharel
50666e5dd7
Fix AP Fetcher 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 15:40:19 +02:00
Thomas Citharel
3807ab1b63
Allow events to be searched by location and period 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-08-10 15:40:18 +02:00
Thomas Citharel
5a8745dc13 Merge branch 'patch-4' into 'master' 
fix instance_name option for `mix mobilizon.instance gen`

Closes #368

See merge request framasoft/mobilizon!526
 2020-08-10 14:39:51 +02:00
yalh
660eaf094c Adding listen-port option to mix mobilizon.instance gen 2020-08-04 21:46:17 +02:00
yalh
b24b6fd61a Trying to fix https://framagit.org/framasoft/mobilizon/-/issues/368 2020-08-04 21:22:38 +02:00
Thomas Citharel
8b6c7aa207
Insert spaces before stripping HTML when inserting search data 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-31 11:19:42 +02:00
Thomas Citharel
74031892c5
Fix a line no longer used 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-31 11:08:29 +02:00
Thomas Citharel
2eda4eca3e Merge branch 'fix-accepting-follows' into 'master' 
Fix accepting follows

See merge request framasoft/mobilizon!518
 2020-07-31 10:00:18 +02:00
Thomas Citharel
d268a16c4f
Fix trying to create signatures for remote actors 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-31 09:21:10 +02:00
Thomas Citharel
b9cdd2f02f
Prevent upserting local actor 
By comparing it's URI

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-31 09:01:27 +02:00
Thomas Citharel
d4cde716d4
Fix redirections on WebFinger 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-30 17:57:20 +02:00
Thomas Citharel
9c9f1385fb
Introduce group posts 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-30 16:55:35 +02:00
Thomas Citharel
e0fad9ddd1
Update Instance Actor when updating instance settings 
Also fix an issue when publishing activities to followers/group members

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-07 16:55:59 +02:00
Thomas Citharel
5fe829ae76 Merge branch 'fix-my-events-pagination' into 'master' 
Fix scheduler for participation notifications

See merge request framasoft/mobilizon!510
 2020-07-06 19:06:59 +02:00
Thomas Citharel
c7ad21262c
Fix scheduler for participation notifications 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-06 18:55:58 +02:00
Thomas Citharel
69841cbb45
Fix 3rd-party auth issues 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-06 17:33:40 +02:00
Thomas Citharel
9a080c1f10
Introduce support for 3rd-party auth (OAuth2 & LDAP) 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-07-06 15:42:59 +02:00
setop
2749b6b2d4
fix addok - country and region 2020-06-30 09:16:32 +02:00
Thomas Citharel
b11674fc9e
Fix opengraph issue 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-26 14:42:40 +02:00
Thomas Citharel
39c03301c9
Allow to properly move group resources 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-26 11:48:05 +02:00
Marie-Cécile Godwin
1d03bff1fd Make this file match the "gettext" requests 2020-06-24 19:00:34 +02:00
Thomas Citharel
83aa005faf
Drop HTMLSanitizeEx and fix title sanitizing 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-24 16:37:00 +02:00
Thomas Citharel
378a113002
Scheduler fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-24 11:37:22 +02:00
Thomas Citharel
4f961f958d
More email fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-23 18:40:56 +02:00
Marie-Cécile Godwin
16ca2c115c
Text amendments to sound more native English, switch to MBZ latest colour scheme, switch to Roboto font. 2020-06-23 18:13:53 +02:00
Marie-Cécile Godwin
fec8298d3d
Update "gettext" commands to reflect html file. 2020-06-23 18:13:39 +02:00
Marie-Cécile Godwin
2f9976b289
Text amendments to sound more native English, switch to MBZ latest colour scheme, switch to Roboto font. 2020-06-23 18:13:28 +02:00
Thomas Citharel
6981b54679
Fix instance terms when contact is undefined 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-23 10:58:48 +02:00
Thomas Citharel
f5241954bd
Improve Terms of Service 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-23 10:35:15 +02:00
Thomas Citharel
5759f2bc32
Comment fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-18 16:50:47 +02:00
Thomas Citharel
e030eab93d
Fix event stats participants / going incoherent 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-18 16:24:00 +02:00
Thomas Citharel
b61d12b5fd
Participation panel revamp and fixes 
Apollo is a pain in the ass with pagination & filters, so this removes
the tabs system and uses a <select> to filter instead

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-18 15:52:19 +02:00
Thomas Citharel
b5f295c5d9
UI improvements 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-17 15:55:21 +02:00
Thomas Citharel
7cd45a1351
Fixup 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-16 18:02:53 +02:00
Thomas Citharel
5cb3f478ae
Allow to change language 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-16 18:00:27 +02:00
Thomas Citharel
ef6a1a21ac
Even more fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 19:41:11 +02:00
Thomas Citharel
47297127a2
Improve comment section 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 16:50:01 +02:00
Thomas Citharel
d8bdc132e8 Merge branch 'use-ap-wrapper-instead-of-calling-directly-actors-context' into 'master' 
Use ActivityPub.get_or_fetch_actor_by_url/2 instead of directly Actors.get_actor_by_url

See merge request framasoft/mobilizon!469
 2020-06-15 11:59:35 +02:00
Thomas Citharel
5990633fb9
Use ActivityPub.get_or_fetch_actor_by_url/2 instead of 
directly Actors.get_actor_by_url

So that we can refresh actors when they're stale

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 11:45:58 +02:00
Thomas Citharel
d0bf64275e Merge branch 'improve-registration-page' into 'master' 
Improve registration page and add a rules option

See merge request framasoft/mobilizon!467
 2020-06-15 11:20:16 +02:00
Thomas Citharel
97197e3811
Improve registration page and add a rules option 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 11:01:49 +02:00
Thomas Citharel
9063772e35 Merge branch 'fix-comment-threads' into 'master' 
Fix comment threads display

See merge request framasoft/mobilizon!466
 2020-06-15 10:10:23 +02:00
Thomas Citharel
790f333e4a
Fix comment threads display 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 09:46:08 +02:00
Thomas Citharel
0ea5b27402
Fix events tests with public visibility 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-15 09:11:35 +02:00
Thomas Citharel
0fcbbaa80c
Fix searchable unlisted events 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-12 19:19:19 +02:00
Thomas Citharel
beb35a09c6
Introduce basic user and profile management 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-12 19:16:40 +02:00
Thomas Citharel
c61a54d802
Add a command to refresh a single actor or all actors 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-10 15:09:59 +02:00
Thomas Citharel
23a5ffd3a1 Merge branch 'exclude-happening-events' into 'master' 
Currently happening events are not future events

Closes #220

See merge request framasoft/mobilizon!460
 2020-06-10 10:03:36 +02:00
Thomas Citharel
0702878924 Merge branch 'install-fixes' into 'master' 
Install fixes

See merge request framasoft/mobilizon!459
 2020-06-10 09:58:25 +02:00
Thomas Citharel
c4cdfd9857
Currently happening events are not future events 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-10 09:44:01 +02:00
Thomas Citharel
da3673386c
Install fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-10 09:38:06 +02:00
Thomas Citharel
eaa791cb89
Update i18n, move release to fall 2020 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-10 09:08:10 +02:00
Thomas Citharel
503616fa60 Merge branch 'fix-lang-not-detected-on-fallback-pages' into 'master' 
Fix lang not detected on fallback pages

See merge request framasoft/mobilizon!456
 2020-06-09 18:00:42 +02:00
Thomas Citharel
ecbc5993c4
Fix lang not detected on fallback pages 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 17:45:41 +02:00
Thomas Citharel
ff5e27b0a0
Fix admin settings 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 17:41:08 +02:00
Thomas Citharel
ba6e656015
Fix geocoding 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 15:20:07 +02:00
Thomas Citharel
dac47d2abb
Add config option to allow anonymous reporting 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 14:07:49 +02:00
Thomas Citharel
2e64da11e3 Merge branch 'fix-online-address' into 'master' 
Fix online address validation

See merge request framasoft/mobilizon!450
 2020-06-09 11:27:45 +02:00
Thomas Citharel
2634c7f46b
Fix online address validation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 11:13:22 +02:00
Thomas Citharel
0da2ad44a5 Merge branch 'fix-activity-pub-fetch-issue' into 'master' 
Fix activitypub HTTPoison issue

See merge request framasoft/mobilizon!449
 2020-06-09 11:12:18 +02:00
Thomas Citharel
39ae24edb8
Fix activitypub HTTPoison issue 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 10:40:20 +02:00
Thomas Citharel
8310a3d4b9
Use correct locale for participation emails 
For anonymous participations we now use a locale parameter in metadata

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-09 10:32:26 +02:00
Thomas Citharel
7dbabcf15f
Add toggle to disable groups 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-08 16:47:57 +02:00
Thomas Citharel
428ce9e200
Fixup 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-08 15:04:53 +02:00
Thomas Citharel
e77cfe2e33
Provide metadata for tombstone 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-08 14:37:31 +02:00
Thomas Citharel
3e74f59ee8
Send Notifications when participation approval 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-08 13:59:27 +02:00
Thomas Citharel
09ad687403 Merge branch 'validate-number-of-places' into 'master' 
Validate number of places being a positive integer

Closes #286

See merge request framasoft/mobilizon!440
 2020-06-05 11:52:33 +02:00
Thomas Citharel
c56e299a09
Validate number of places being a positive integer 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-05 11:38:49 +02:00
Thomas Citharel
f627477662 Merge branch 'event-address-update-trigger-change' into 'master' 
Also send event updates if physical address changed

See merge request framasoft/mobilizon!438
 2020-06-05 11:02:46 +02:00
Thomas Citharel
44e08c4319
Add weekly notification 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-05 10:27:02 +02:00
Thomas Citharel
9e3107e3aa
Also send event updates if physical address changed 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-05 10:18:08 +02:00
Thomas Citharel
42f07c17e5
Disable mix docs for now 
Because of https://github.com/elixir-lang/ex_doc/issues/1172

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-04 10:58:27 +02:00
Thomas Citharel
5e6bdb92fb
Fix tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-03 16:55:34 +02:00
Thomas Citharel
4144e9ffd0
Introduce group basic federation, event new page and notifications 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-06-03 16:01:26 +02:00
Thomas Citharel
fa19270232
Fix DateTime comparison 
!420 used Date.compare/2 instead of DateTime.compare/2

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-04-14 17:50:17 +02:00
setop
01bdd7b344 fix compare begin and end dates 
this bug prevent from creating an event with the day of month of the begin date greater than the day of month of the end date, event if end date is effectively greater than begin date.

for example, if the begin date is '2020-04-28' and end date is '2020-05-13', these dates are valid but because 28 > 13, the validation fails.

this is better explained in this article ["Never compare dates in Elixir using < or >"](https://blog.leif.io/never-use-to-compare-dates/).

using Date.compare, as proposed in this PR fix the issue.
 2020-04-03 23:37:56 +02:00
Thomas Citharel
c732ec7f87
Add ability to add message for participation and improve participation 
management interface

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-03-06 09:00:48 +01:00
Thomas Citharel
39b7afd1cd
Blind key rotation and stale duration for profiles 
See https://blog.dereferenced.org/the-case-for-blind-key-rotation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-14 18:21:18 +01:00
Thomas Citharel
3a753312c1
Validate Date header in HTTPSignatures 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-14 09:22:17 +01:00
Thomas Citharel
9f007da286
Allow to edit account email and delete account 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-13 16:21:26 +01:00
Thomas Citharel
da879f5bcd
Fix event link construction in emails 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-10 09:59:20 +01:00
Thomas Citharel
18c8b7bc14
Fix event online URL AP attachment 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-07 18:41:36 +01:00
Thomas Citharel
94df5bd1be
Don't access remote events from non-federated instances when not logged 
in

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-07 16:28:49 +01:00
Thomas Citharel
39017b63a9
Add canonical link to the original event 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-07 16:25:30 +01:00
Thomas Citharel
9e3df495dc
Move configuration to traditional way 
⭐️ This is the way.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-02-06 16:12:13 +01:00
Thomas Citharel
2ed9050a90
Add anonymous and remote participations 2020-01-29 17:28:11 +01:00
rustra
3505736705 Fix Credo code readability issues 2020-01-28 20:15:59 +01:00
rustra
97651e88e9 Implement Credo software design suggestions 2020-01-28 19:18:33 +01:00
rustra
bc31e2f0c2 Fix mix format 2020-01-26 21:53:17 +01:00
rustra
8856cc2f55 Rename MobilizonWeb to Mobilizon.Web 2020-01-26 21:39:49 +01:00
rustra
b3f8d52bc9 Move API under GraphQL context 2020-01-26 21:15:04 +01:00
rustra
ba3ad713c0 Split GraphQL as separate context 2020-01-26 20:34:25 +01:00
rustra
3577fe42e1 Improve Federation boundaries 2020-01-24 22:02:10 +01:00
rustra
8ca5c0b320 Separate Web modules related to Federation 2020-01-23 01:03:33 +01:00
rustra
d1251280c5 Put HTTPSignatures, WebFinger and ActivityStream alongside with ActivityPub 2020-01-22 22:40:40 +01:00
rustra
cdb520a95b Split Federation as separate context 2020-01-22 02:14:42 +01:00
Thomas Citharel
fe4cf86838
Restrict follows to approved actors/instances 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-19 13:41:25 +01:00
Thomas Citharel
b911ecbb00
Fix comments URLs 
Also remote comments were marked as local

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-18 18:25:40 +01:00
Thomas Citharel
9485694392
Add a mix mobilizon.actors task to list actors tasks 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-18 15:57:15 +01:00
Thomas Citharel
d8c20feead
Use mix.exs version instead of config one 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-18 14:32:20 +01:00
Thomas Citharel
814c9ab53b
Move from Schema.org Place to AS Place with Schema.org properties 
See https://socialhub.activitypub.rocks/t/how-to-represent-places-in-an-event/413

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-18 11:03:04 +01:00
Thomas Citharel
846b4e9b77
Fix event html representation with no Accept header 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-18 10:15:58 +01:00
Thomas Citharel
822a522579
Handle actor or object being AP Public string 
Mastodon uses "https://www.w3.org/ns/activitystreams#Public" as object
when sending a `Follow` activity to a relay

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 13:36:45 +01:00
Thomas Citharel
89b751e124
Fix signatures for relay 
The plugs were missing

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 13:36:25 +01:00
Thomas Citharel
d552fcb2d3
Add a config option to whitelist users registration 
Through whole email or domain email

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 12:09:24 +01:00
Thomas Citharel
28e966e5b0
Fix comment visibility and local status 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 09:49:08 +01:00
Thomas Citharel
4da3fb946b
Update demo warning message 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 09:20:40 +01:00
Thomas Citharel
39b7a5b948
Improve JSON-LD representation for Address and add it to the docs 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-16 11:47:57 +01:00
Thomas Citharel
039846d465
Clear AP cache when content is updated or deleted 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-16 11:47:31 +01:00
Thomas Citharel
14176ccc89
Support pt:CommentsEnabled in addition to mz:repliesModeration 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-16 11:46:19 +01:00
Thomas Citharel
334d66bf5d
Add admin interface to manage instances subscriptions 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-15 21:56:16 +01:00
Thomas Citharel
dc07f34d78
Introduce comments below events 
Also add tomstones

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-28 12:33:58 +01:00
Thomas Citharel
8aed527971 Merge branch 'master' into 'feature/add-a-demo-mode' 
# Conflicts:
#   CHANGELOG.md
 2019-11-21 16:28:53 +01:00
Thomas Citharel
a53100ef6e
Added a demo mode to show or hide instance warnings that data is deleted 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-21 16:07:43 +01:00
Thomas Citharel
5e9c91e659
Added mix commands to manage users and view actors 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-21 15:51:13 +01:00
Thomas Citharel
3b210a33a2
Disable address autocomplete where required (nominatim) 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-20 13:49:57 +01:00
Thomas Citharel
83fcf2b62e Merge branch 'feature/add-pelias-geocoder' into 'master' 
Feature/add pelias geocoder

See merge request framasoft/mobilizon!324
 2019-11-19 20:19:02 +01:00
Thomas Citharel
ea00cf45dc
Update docs 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-19 20:01:31 +01:00
Thomas Citharel
c7b25474d3
Introduce support for Pelias geocoder 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-19 17:59:04 +01:00
Thomas Citharel
321a04babe
Fix duplicate tags when editing an event with tags in description 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-19 15:36:25 +01:00
Thomas Citharel
b6645a4acc
Include sender mail in from: emails 
Closes #277

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-19 11:12:59 +01:00
Thomas Citharel
258550ec94
Handle missing geolix database 
Close #313

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-19 10:47:48 +01:00
Thomas Citharel
634a0b851e
Validate ends_on being after begins_on 
Closes #315

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-18 18:56:36 +01:00
Thomas Citharel
4dc4524e71
Validate username on backend side and refactor actor changeset 
Closes #316

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-18 18:56:28 +01:00
Thomas Citharel
f35698005a
Fix #232 and #230 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-18 18:56:28 +01:00
Thomas Citharel
c599a47d58
Introduce Mimirsbrunn geocoder and improve addresses & maps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-12 14:10:18 +01:00
Thomas Citharel
0e7cf89492
Remove floor 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-08 19:39:02 +01:00
Thomas Citharel
33f7c14db6
Fixes with addresses and iCalendar 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-06 10:04:17 +01:00
Thomas Citharel
f91f8ab926
Fix for adding addresses 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-06 09:32:01 +01:00
Thomas Citharel
95ba76a0fa
Fix issue when updating event and introduce background jobs 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-11-04 16:40:36 +01:00
Thomas Citharel
cc820d6b63
Refactor Core things, including Ecto handling, ActivityPub & Transmogrifier modules 
* Data doesn't need anymore to be converted to ActivityStream format to
be saved (this was taken from Pleroma and not at all a good idea here)
* Everything saved when creating an event is inserted into PostgreSQL in
a single transaction
 2019-10-31 10:06:11 +01:00
Thomas Citharel
b117985dff
Make inserting data into search table an async operation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-23 16:33:56 +02:00
Thomas Citharel
39d7db07f3
Fix unrelated warning 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-23 15:27:11 +02:00
Thomas Citharel
b5f9518faf
Implement search engine & service in backend 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-23 15:27:11 +02:00
Thomas Citharel
afa3bb1eff
Allow WebP and Gif pics 
svg stays forbidden until we can be sure it's fine security-wise

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-21 13:43:06 +02:00
Thomas Citharel
d1fb90eece
Add the optimize filter for uploaded pics 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-21 13:42:45 +02:00
Thomas Citharel
c16ef05d88
Limit multipart upload to 10MB 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-18 14:10:39 +02:00
Thomas Citharel
342506bac0
Add some backend changes and validation for field length 
Closes #225 and #226

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-18 11:31:11 +02:00
Thomas Citharel
6718dd8e69
Upgrade vue-cli to v4, change the way server params injection is made 
and serve es6 modules

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-17 14:20:22 +02:00
Thomas Citharel
4dcbf85d9a Merge branch 'bug/fix-XSS-on-event-title' into 'master' 
Make sure title is properly sanitized

Closes #247

See merge request framasoft/mobilizon!281
 2019-10-16 19:17:27 +02:00
Thomas Citharel
8094f1d80a
Make sure title is properly sanitized 
Close #247

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 19:03:31 +02:00
Thomas Citharel
de9b26df2d
Translate them and handle difference between user not found and user not 
confirmed

Closes #212

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 17:07:49 +02:00
Damien
b98a86184b (Hopefully) improve grammar 
[CI skip]
 2019-10-15 21:38:49 +02:00
Thomas Citharel
5e9ca2f2f3
set default to show event time 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 20:00:58 +02:00
Thomas Citharel
7b296e01da
Change link for Framacolibri 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 19:33:07 +02:00
Thomas Citharel
d93561742a
Better handle datetime 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 19:29:18 +02:00
Thomas Citharel
cc701f8994
Properly update event ics export cache and fix export desc html 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 15:44:16 +02:00
Thomas Citharel
cbe1dd2868
Prevent picture resend on event update, handle duplicate pictures 
properly in backend and add a proper default picture

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 11:41:57 +02:00
Thomas Citharel
33e51a05ec
Handle errors better 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-13 13:56:24 +02:00
Thomas Citharel
57f0b5dad1
Participation fixes 
Closes #208 and #210

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-13 10:51:22 +02:00
Thomas Citharel
2577a2a27b Merge branch 'test/add-cypress-on-event-creation' into 'master' 
Add e2e seed and test event creation

See merge request framasoft/mobilizon!254
 2019-10-12 19:47:19 +02:00
Thomas Citharel
5e75daa732
Add e2e seed and test event creation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-12 19:34:16 +02:00
Thomas Citharel
d3a5b1f3e5
Add custom user-agent to geospatial calls 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-12 11:41:18 +02:00
Thomas Citharel
534ff09674
Properly handle event status 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-11 16:34:03 +02:00
Thomas Citharel
4499fb2f31
Fix participation section, show how many places are available 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-11 15:26:16 +02:00
Thomas Citharel
98472e7222
Expose participants number through API 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-11 11:54:57 +02:00
Thomas Citharel
bf25d22786
Make sure people can't join an event with limited participants 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-11 11:50:06 +02:00
Thomas Citharel
210b348b46
Add warning inside emails as well 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-11 10:44:53 +02:00
Thomas Citharel
040faf4451
Fix title & meta 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-10 17:28:32 +02:00
Thomas Citharel
5a56c47360 Merge branch 'bug/email-logo-alt' into 'master' 
Bug/email logo alt

See merge request framasoft/mobilizon!238
 2019-10-10 14:57:07 +02:00
Thomas Citharel
aa233f43a7
Replace email logo alternative text by instance name 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-10 14:27:06 +02:00
Thomas Citharel
ac35e4b923
Fix preview 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-10 12:25:32 +02:00
Thomas Citharel
eca8b9ec7c
Fix editor related issues 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-10 11:05:53 +02:00
Thomas Citharel
5b1b7ee164
Make sure featured events have currently happening events 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-09 16:37:39 +02:00
Thomas Citharel
7a453b4329
Fix unavailable access to an event 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-08 21:31:47 +02:00
Thomas Citharel
bff00dea21
Properly handle account deleted 
Close #191

Also fix an issue with public events not being accessible when requested
as another logged-in user.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-08 18:13:06 +02:00
Thomas Citharel
77d286ebb6
Introduce Cypress 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-06 18:28:18 +02:00
Thomas Citharel
471e8ac472
Redirect to profile creation when user has no identities 
Also load persons by ID instead of preferred_username

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-06 12:36:42 +02:00
Thomas Citharel
442a011490
Add draft feature 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-02 18:23:32 +02:00
Thomas Citharel
a84cfb5910
Save user locale and use it to translate things 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-01 13:08:09 +02:00
Thomas Citharel
5fd38ace2e
Notifications on event update 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-30 19:01:46 +02:00
Thomas Citharel
5b4f1c271a
Send email notifications when a participation is approved/rejected 
Also handles participant status :rejected instead of deleting the
participation

Closes #164

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-30 18:45:29 +02:00
Thomas Citharel
65b49e247f
Add config option to disable federation 
Closes #148

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-27 16:18:29 +02:00
Thomas Citharel
8dc2fbcf98
Fix rebase issue 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-26 18:10:11 +02:00
miffigriffi
0a0d07cf38
Fix software design suggestions 2019-09-26 17:45:47 +02:00
miffigriffi
aed824f1aa
Fix code readability issues 2019-09-26 17:45:47 +02:00
miffigriffi
20dfce5c83
Fix refactoring opportunities 2019-09-26 17:45:33 +02:00
Thomas Citharel
4d4fdaaffe Merge branch 'feature/participate-dropdown' into 'master' 
Add a dropdown on participate menu, disallow listing participations

Closes #174

See merge request framasoft/mobilizon!200
 2019-09-26 17:41:14 +02:00
Thomas Citharel
757d2cabec
Add a dropdown on participate menu, disallow listing participations 
Now requires quering the person endpoint to know if an actor
participates in an event, organizers can make authenticated requests to
event { participants { } } to see the pending / approved participants.

Also closes #174

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-26 17:00:01 +02:00
Thomas Citharel
d4a7b6fe0d
Remove unneeded Markdown converter (earmark) 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-26 16:49:49 +02:00
Thomas Citharel
f129d4137d
[Backend] Allow to change your password 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-24 18:08:33 +02:00
Thomas Citharel
8006b8e0f3
Fixes for email 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-09-24 12:09:43 +02:00