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
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
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
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
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
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
290494ae57
systemd: fix recusive alias
2019-10-16 11:59:37 +02:00
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
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
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
4938f853d5
Improve docs a bit
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-16 11:20:30 +02:00
7b23ca6965
Improve docker setup
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-16 11:12:42 +02:00
c82288a627
Merge branch 'master' into 'master'
...
(Hopefully) improve grammar
See merge request framasoft/mobilizon!273
2019-10-16 08:57:30 +02:00
b98a86184b
(Hopefully) improve grammar
...
[CI skip]
2019-10-15 21:38:49 +02:00
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
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
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
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
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
a924db34f3
Fix contribution guide link
...
Fixes #213 #233
2019-10-15 17:45:22 +02:00
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
5af1f4a8c2
Fix event description lists margin
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-15 11:40:25 +02:00
5ebbb57d0e
Fix participations stats on the MyEvents page
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-15 10:39:26 +02:00
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
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
5e9ca2f2f3
set default to show event time
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 20:00:58 +02:00
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
7b296e01da
Change link for Framacolibri
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 19:33:07 +02:00
d93561742a
Better handle datetime
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 19:29:18 +02:00
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
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
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
e0826b4e87
Show event onlineAddress
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 14:38:21 +02:00
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
b200b1c2b2
Add icons on event edit fields
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 13:07:50 +02:00
3feb3183d9
Fixes for event card
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 13:03:48 +02:00
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
ef953d1376
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
ed46a0917f
Improve registration page sentences
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-14 12:23:17 +02:00
2b79a399bc
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
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
18cabe4d42
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
7a556d1305
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
8139b4d132
Merge branch 'improve-icons' into 'master'
...
Improve icons & css & seo & a11y
See merge request framasoft/mobilizon!262
2019-10-13 18:22:44 +02:00
5676852206
Improve icons & css & seo & a11y
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-13 18:21:35 +02:00
9afc5fe509
Merge branch 'bug/fix-participations-list-actions-with-another-identity' into 'master'
...
Fix participations list actions with another identity
Closes #180
See merge request framasoft/mobilizon!261
2019-10-13 17:26:11 +02:00
14369e61e9
Fix test and handle errors better
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-13 17:03:48 +02:00
3e4bd76f29
Fix participations list actions with another identity
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-10-13 16:24:43 +02:00
717ef84ab8
Merge branch 'bug/make-sure-event-meta-is-reactive' into 'master'
...
Bug/make sure event meta is reactive
Closes #211
See merge request framasoft/mobilizon!260
2019-10-13 14:21:00 +02:00
d6a1167a1e
Merge branch 'feature/handle-errors-better' into 'master'
...
Handle errors better
Closes #209
See merge request framasoft/mobilizon!259
2019-10-13 14:20:39 +02:00
Joel Takvorian