Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity
953 Commits 4 Branches 85 Tags 205 MiB
266db34fe2
Commit Graph

953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Citharel
266db34fe2 Merge branch 'bug/fix-display-on-participants-page' into 'master' 
Fix multiline display on participants page

Closes #217

See merge request framasoft/mobilizon!282
 2019-10-17 09:55:51 +02:00
Thomas Citharel
ea7ff329c3 Fix multiline display on participants page 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-17 09:41:52 +02:00
Thomas Citharel
9901a26eb1 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
32b04755a8 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
960329195f Merge branch 'doc-develop' into 'master' 
Doc: work is based on master; push to fork

See merge request framasoft/mobilizon!280
 2019-10-16 17:23:51 +02:00
Thomas Citharel
49252bd31c Merge branch 'bug/differenciate-user-not-found-and-user-not-activated' into 'master' 
Translate them and handle difference between user not found and user not confirmed

Closes #212

See merge request framasoft/mobilizon!279
 2019-10-16 17:20:53 +02:00
Thomas Citharel
6bdf44f60f 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
Joel Takvorian
a340954dce Doc: work is based on master; push to fork 
Doc was mentioning branch "develop" (which doesn't exist it seems) instead of master
Refer to forked repo instead of upstream
 2019-10-16 17:07:48 +02:00
Thomas Citharel
c91df22c65 Merge branch 'test/fix-ci' into 'master' 
Fix Cypress run on CI

See merge request framasoft/mobilizon!278
 2019-10-16 14:00:37 +02:00
Thomas Citharel
b6473446fa Merge branch 'participation-link' into 'master' 
Link to participation from event page

Closes #221

See merge request framasoft/mobilizon!274
 2019-10-16 13:46:04 +02:00
Thomas Citharel
cf72918b80 Merge branch 'patch-1' into 'master' 
systemd: fix recusive alias

See merge request framasoft/mobilizon!277
 2019-10-16 13:45:42 +02:00
Thomas Citharel
dec144396e Fix Cypress run on CI 
Had written the condition the wrong way

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 13:43:41 +02:00
Joel Takvorian
44f58c92ca Link to participation from event page 
When the organizer sees hiw own event, the number of attendees is now a link to the attendees page

Fixes #221
 2019-10-16 13:12:58 +02:00
Geno
4e8412a7b2 systemd: fix recusive alias 2019-10-16 11:59:37 +02:00
Thomas Citharel
bf82fa4528 Merge branch 'test/make-cypress-run-when-no-key' into 'master' 
Make cypress run even when no key (merge requests from forks)

See merge request framasoft/mobilizon!276
 2019-10-16 11:51:07 +02:00
Thomas Citharel
af2b6be195 Merge branch 'docker/improve-script' into 'master' 
Docker/improve script

See merge request framasoft/mobilizon!275
 2019-10-16 11:33:32 +02:00
Thomas Citharel
55762e7cf2 Make cypress run even when no key (merge requests from forks) 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 11:30:57 +02:00
Thomas Citharel
f65cb68363 Improve docs a bit 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 11:20:30 +02:00
Thomas Citharel
458992cd8c Improve docker setup 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-16 11:12:42 +02:00
Thomas Citharel
c836f17345 Merge branch 'master' into 'master' 
(Hopefully) improve grammar

See merge request framasoft/mobilizon!273
 2019-10-16 08:57:30 +02:00
Damien
6c7bb75907 (Hopefully) improve grammar 
[CI skip]
 2019-10-15 21:38:49 +02:00
Thomas Citharel
535557402d Merge branch 'test/add-wait-time-for-cypress' into 'master' 
Wait a little for Cypress to detect register button

See merge request framasoft/mobilizon!272
 2019-10-15 18:30:03 +02:00
Thomas Citharel
f337ce32b8 Wait a little for Cypress to detect register button 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 18:14:19 +02:00
Thomas Citharel
e10f0018ff Merge branch 'bug/fix-description-even-lists-margin' into 'master' 
Fix event description lists margin

See merge request framasoft/mobilizon!269
 2019-10-15 17:54:46 +02:00
Thomas Citharel
87a54b1058 Merge branch 'test/fix-cypress' into 'master' 
Fix Cypress tests and add a different welcome message when coming from registration

See merge request framasoft/mobilizon!270
 2019-10-15 17:51:45 +02:00
Thomas Citharel
e3ffede838 Merge branch 'fix-contrib' into 'master' 
Fix contribution guide link

Closes #233 et #213

See merge request framasoft/mobilizon!271
 2019-10-15 17:48:05 +02:00
Joel Takvorian
7122eb0903 Fix contribution guide link 
Fixes #213 #233
 2019-10-15 17:45:22 +02:00
Thomas Citharel
2406ef9535 Fix Cypress tests and add a different welcome message when coming from 
registration

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 17:33:02 +02:00
Thomas Citharel
f6f5c1695f Fix event description lists margin 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 11:40:25 +02:00
Thomas Citharel
2d695dbb40 Fix participations stats on the MyEvents page 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 10:39:26 +02:00
Thomas Citharel
1563c1269a Fix event URL validation and check if hostname is correct before showing 
it

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 09:57:08 +02:00
Thomas Citharel
14cf2b0262 Put correct link to blog into message alert depending on locale 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-15 09:10:51 +02:00
Thomas Citharel
71470cca9a set default to show event time 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 20:00:58 +02:00
Thomas Citharel
048f0d8c02 Merge branch 'meta/redirect-to-correct-forum-subcategory' into 'master' 
Handle better the timepicker

See merge request framasoft/mobilizon!267
 2019-10-14 19:55:48 +02:00
Thomas Citharel
0dbde97fb5 Change link for Framacolibri 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 19:33:07 +02:00
Thomas Citharel
cc1e5ba24e Better handle datetime 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 19:29:18 +02:00
Thomas Citharel
afe422c7f0 Merge branch 'bug/fix-event-ics-cache' into 'master' 
Properly update event ics export cache and fix export desc html

See merge request framasoft/mobilizon!266
 2019-10-14 16:03:49 +02:00
Thomas Citharel
fd3116a0a8 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
26ed4e38c3 Hide Mastodon icon since there's no way to share right now 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 14:39:31 +02:00
Thomas Citharel
20aec46a08 Show event onlineAddress 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 14:38:21 +02:00
Thomas Citharel
e17132b22f Make sure welcome back only shows once and improve margins 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 14:25:08 +02:00
Thomas Citharel
0bdd090e66 Add icons on event edit fields 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 13:07:50 +02:00
Thomas Citharel
92e4b298e3 Fixes for event card 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 13:03:48 +02:00
Thomas Citharel
78161785c8 Event description pic & meta and email share fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 12:56:37 +02:00
Thomas Citharel
6c07a5ef46 Merge branch 'bug/improve-registration-page' into 'master' 
Improve registration page sentences

See merge request framasoft/mobilizon!265
 2019-10-14 12:24:10 +02:00
Thomas Citharel
b05d7623a9 Improve registration page sentences 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-14 12:23:17 +02:00
Thomas Citharel
eff38f901b Merge branch 'bug/picture-fixes' into 'master' 
Prevent picture resend on event update, handle duplicate pictures properly in backend and add a proper default picture

See merge request framasoft/mobilizon!264
 2019-10-14 12:04:17 +02:00
Thomas Citharel
b28182d110 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
d21b9ad70d Merge branch 'improve-icons' into 'master' 
Remove purge-css that does more harm than good

See merge request framasoft/mobilizon!263
 2019-10-13 18:37:57 +02:00
Thomas Citharel
276d3d3d77 Remove purge-css that does more harm than good 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-13 18:37:12 +02:00