3024 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chirac	a72ce9c91f	Merge branch 'search_results_pagination' into 'dev' ... Search results pagination See merge request federez/re2o!474	2019-12-07 13:45:43 +01:00
Jean-Roman Garnier	7f4c796249	Tweak filtering for users and clubs in search to better handle user-defined filters	2019-12-06 13:24:09 +00:00
Jean-Roman Garnier	7817dd47a5	Fix display filter in advance search not being taken into account	2019-12-06 10:29:10 +00:00
Jean-Roman Garnier	83123d9dc1	Make search-results pagination more coherent with rest of pagination style	2019-12-06 00:15:06 +00:00
Jean-Roman Garnier	83a6dea5c9	Add pagination in search results	2019-12-06 00:01:13 +00:00
klafyvel	a7d871e204	Merge branch 'fix_alias_perms' into 'dev' ... Fix function called by perm check See merge request federez/re2o!473	2019-11-25 15:41:10 +01:00
Gabriel Detraz	35e50964a1	Fix function called by perm check	2019-11-25 15:25:52 +01:00
chirac	9afe81b9e2	Merge branch 'translation' into 'dev' ... Translation See merge request federez/re2o!471	2019-11-24 23:32:47 +01:00
Laouen Fernet	c8ed48145c	Add migrations for improved translations	2019-11-24 23:27:57 +01:00
Laouen Fernet	e26d21064e	Improve internationalisation for email templates, scripts, commands and error messages	2019-11-24 23:27:57 +01:00
Laouen Fernet	7894e3267a	Edit translations in users	2019-11-24 23:27:57 +01:00
Laouen Fernet	b433e464ac	Edit translations in topologie	2019-11-24 23:27:57 +01:00
Laouen Fernet	37129bd83e	Edit translations in tickets	2019-11-24 23:27:56 +01:00
Laouen Fernet	062308f942	Edit translations in templates	2019-11-24 23:27:56 +01:00
Laouen Fernet	58de66e7a4	Edit translations in search	2019-11-24 23:27:56 +01:00
Laouen Fernet	90ff281d80	Edit translations in re2o	2019-11-24 23:27:56 +01:00
Laouen Fernet	bcbf819cb9	Edit translations in preferences	2019-11-24 23:27:56 +01:00
Laouen Fernet	797d052e95	Edit translations in multi_op	2019-11-24 23:27:56 +01:00
Laouen Fernet	7ca5387d7b	Edit translations in machines	2019-11-24 23:27:56 +01:00
Laouen Fernet	489a564ce8	Edit translations in logs	2019-11-24 23:27:56 +01:00
Laouen Fernet	d24dd8225e	Edit translations in cotisations	2019-11-24 23:27:56 +01:00
Laouen Fernet	e8514ae8a9	Edit translations in api	2019-11-24 23:27:56 +01:00
Laouen Fernet	679e81ac7d	Mark strings for translation in users	2019-11-24 23:27:56 +01:00
Laouen Fernet	207c8ba206	Mark strings for translation in topologie	2019-11-24 23:27:56 +01:00
Laouen Fernet	6522051728	Mark strings for translation in tickets	2019-11-24 23:27:55 +01:00
Laouen Fernet	fe4de10f7a	Mark strings for translation in templates	2019-11-24 23:27:55 +01:00
Laouen Fernet	5d4d9d71bf	Mark strings for translation in search	2019-11-24 23:27:55 +01:00
Laouen Fernet	b5769bb1f8	Mark strings for translation in re2o	2019-11-24 23:27:55 +01:00
Laouen Fernet	038a11fb75	Mark strings for translation in preferences	2019-11-24 23:27:55 +01:00
Laouen Fernet	a745e8cc9c	Mark strings for translation in multi_op	2019-11-24 23:27:55 +01:00
Laouen Fernet	ac5d8e2080	Mark strings for translation in machines	2019-11-24 23:27:55 +01:00
Laouen Fernet	07ce7bd8a7	Mark strings for translation in logs	2019-11-24 23:27:55 +01:00
Laouen Fernet	2454de2032	Mark strings for translation in cotisations	2019-11-24 23:27:55 +01:00
Laouen Fernet	3743a46bc5	Mark strings for translation in api	2019-11-24 23:27:55 +01:00
chirac	8624105378	Merge branch 'bug-massive-boostrap-form' into 'dev' ... Fix massive fields sending incorrect data in POST request See merge request federez/re2o!472	2019-11-24 23:23:11 +01:00
Jean-Roman Garnier	755e95e644	Fix massive fields sending incorrect data in POST request	2019-11-24 22:10:55 +00:00
chirac	af05df6c85	Merge branch 'fix_debug_remains' into 'dev' ... Fix klafy horrors See merge request federez/re2o!470	2019-11-17 13:06:52 +01:00
Hugo Levy-Falk	09da1b4d43	Fix klafy horrors	2019-11-17 11:58:23 +00:00
chirac	5a83a577fa	Merge branch 'display_preferences' into 'dev' ... Add spaces where needed. See merge request federez/re2o!469	2019-11-16 19:26:06 +01:00
nanoy	35ba5b6e49	Add spaces where needed.	2019-11-16 19:22:03 +01:00
chirac	540a8d0531	Merge branch '210-use-black-for-formatting' into 'dev' ... Resolve "Use black for formatting" See merge request federez/re2o!468	2019-11-04 23:16:57 +01:00
Hugo Levy-Falk	c4a104b3b6	I like my ☕ black. ... Just ran black on the whoe repository. Fix #210.	2019-11-04 22:47:24 +01:00
chirac	2460a7d2a0	Merge branch '229-kill-dead-code' into 'dev' ... What Is Dead May Never Die 🧟 See merge request federez/re2o!467	2019-11-04 22:44:40 +01:00
Hugo Levy-Falk	ce862a3bde	What Is Dead May Never Die 🧟	2019-11-04 17:49:17 +01:00
chirac	180ba11a51	Merge branch '222-allow-short-time-membership' into 'dev' ... Fix #222 See merge request federez/re2o!454	2019-11-04 16:45:37 +01:00
Hugo Levy-Falk	034b50bc58	Fix #189	2019-11-04 00:25:29 +01:00
Hugo Levy-Falk	e0a65e4d04	Setup tests for Vente model.	2019-11-03 21:46:18 +01:00
Hugo Levy-Falk	c76f32cf26	Fix #222	2019-11-03 19:55:37 +01:00
chirac	c260d3889e	Merge branch 'fix-edit-switch' into 'dev' ... Fix typo in view edit_switch See merge request federez/re2o!466	2019-11-03 19:54:58 +01:00
Hugo Levy-Falk	804d5a711b	Fix typo in view edit_switch	2019-10-31 21:54:25 +01:00