1293 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Thomas Citharel	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
Thomas Citharel	ed46a0917f	Improve registration page sentences ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-10-14 12:23:17 +02:00
Thomas Citharel	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
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	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
Thomas Citharel	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
Thomas Citharel	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
Thomas Citharel	5676852206	Improve icons & css & seo & a11y ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-10-13 18:21:35 +02:00
Thomas Citharel	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
Thomas Citharel	14369e61e9	Fix test and handle errors better ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-10-13 17:03:48 +02:00
Thomas Citharel	3e4bd76f29	Fix participations list actions with another identity ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-10-13 16:24:43 +02:00
Thomas Citharel	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
Thomas Citharel	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
Thomas Citharel	33acbca2bc	Make sure number of available places gets updated when participation ... status changes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-10-13 14:00:40 +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	893af88b43	Merge branch 'bug/participation-fixes' into 'master' ... Participation fixes Closes #210 et #208 See merge request framasoft/mobilizon!258	2019-10-13 11:04:50 +02:00