Thomas Citharel
|
f0d4d84a58
|
Merge branch 'master' into 'master'
🗎 Don't `sudo apt install sudo` and add imagemagick to dependencies
See merge request framasoft/mobilizon!284
|
2019-10-17 15:03:26 +02:00 |
|
Thomas Citharel
|
ddd9d44da1
|
Merge branch 'feature/add-polyfill-for-intersection-observer' into 'master'
Fix build on Safari and improve js build
Closes #246
See merge request framasoft/mobilizon!283
|
2019-10-17 14:49:31 +02:00 |
|
marcin mikołajczak
|
078c269590
|
🗎 Don't sudo apt install sudo and add imagemagick to dependencies
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
|
2019-10-17 14:41:54 +02:00 |
|
Thomas Citharel
|
63a839d8aa
|
Try to fix crash on Safari by removing -apple-system from font-family
Source https://github.com/scrumpy/tiptap/issues/464
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-17 14:30:25 +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
|
4b80b8616d
|
Add polyfill for IntersectionObserver
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-17 11:04:07 +02:00 |
|
Thomas Citharel
|
166696c7dd
|
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
|
571f6c60bd
|
Fix multiline display on participants page
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-17 09:41:52 +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
|
6b2382c444
|
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
|
90a1d3276f
|
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
|
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 |
|
Joel Takvorian
|
bb3e56d2b3
|
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
|
ff064188e1
|
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
|
0d97bb88a1
|
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
|
6276d9445c
|
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
|
f6036c8461
|
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
|
3b31acebd6
|
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
|
290494ae57
|
systemd: fix recusive alias
|
2019-10-16 11:59:37 +02:00 |
|
Thomas Citharel
|
eea6607ac6
|
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
|
c4204572c6
|
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
|
ef7dc3f020
|
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
|
4938f853d5
|
Improve docs a bit
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-16 11:20:30 +02:00 |
|
Thomas Citharel
|
7b23ca6965
|
Improve docker setup
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-16 11:12:42 +02:00 |
|
Thomas Citharel
|
c82288a627
|
Merge branch 'master' into 'master'
(Hopefully) improve grammar
See merge request framasoft/mobilizon!273
|
2019-10-16 08:57:30 +02:00 |
|
Damien
|
b98a86184b
|
(Hopefully) improve grammar
[CI skip]
|
2019-10-15 21:38:49 +02:00 |
|
Thomas Citharel
|
5f934e3449
|
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
|
a78441bb25
|
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
|
eef8ba516d
|
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
|
d755589c9d
|
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
|
fe8ad26ec5
|
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
|
a924db34f3
|
Fix contribution guide link
Fixes #213 #233
|
2019-10-15 17:45:22 +02:00 |
|
Thomas Citharel
|
3c635ce4b4
|
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
|
5af1f4a8c2
|
Fix event description lists margin
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-15 11:40:25 +02:00 |
|
Thomas Citharel
|
5ebbb57d0e
|
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
|
f82c3b7492
|
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
|
4727c8861e
|
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
|
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
|
9a854fd997
|
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
|
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
|
ea40e1b6d9
|
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
|
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
|
32f6ee7019
|
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
|
e0826b4e87
|
Show event onlineAddress
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-14 14:38:21 +02:00 |
|
Thomas Citharel
|
cad508a9bb
|
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
|
b200b1c2b2
|
Add icons on event edit fields
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-14 13:07:50 +02:00 |
|
Thomas Citharel
|
3feb3183d9
|
Fixes for event card
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-14 13:03:48 +02:00 |
|
Thomas Citharel
|
0fa9a0bcb1
|
Event description pic & meta and email share fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
|
2019-10-14 12:56:37 +02:00 |
|