8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-18 04:53:47 +00:00
Commit graph

3306 commits

Author SHA1 Message Date
chirac
ecd468201a Remove and replace massive_bootstrap; forms change for autocomplete 2020-12-30 18:55:28 +01:00
chirac
1d011435f5 Add views and urls for autocomplete on user app 2020-12-30 18:55:28 +01:00
chirac
01384ce296 Merge branch 'fix-multi-op-side-effect' into 'dev'
Fix side effect when importing multi_op

See merge request re2o/re2o!581
2020-12-30 18:24:42 +01:00
Hugo Levy-Falk
4ec4763d1c Fix side effect when importing multi_op 2020-12-30 18:24:31 +01:00
klafyvel
2f2566ac64 Merge branch 'fix_theme_profil' into 'dev'
Fix display theme on profile

See merge request re2o/re2o!571
2020-12-29 09:52:37 +01:00
b8890ffaa0 Fix display theme on profile 2020-12-29 09:52:20 +01:00
klafyvel
5a4ff3583b Merge branch 'make_acl_compatible_with_api' into 'dev'
Make acl compatible with api

See merge request re2o/re2o!576
2020-12-28 21:02:37 +01:00
Hugo Levy-Falk
a1c08c4e96 Just blacked everything. 2020-12-28 20:59:35 +01:00
chapeau
70b492c315 documentation 2020-12-28 20:57:21 +01:00
5a79ffb0f5 lets be sure that api permissions wont trigger on functional views 2020-12-28 20:57:21 +01:00
ba9d5211b9 patch 2020-12-28 20:57:21 +01:00
a96a2f50fa modification des acl pour gérer les vues de l'api 2020-12-28 20:57:21 +01:00
chirac
3459994754 Merge branch 'fix-club-edit-acl' into 'dev'
Fix club edit and add some documentation on that error.

See merge request re2o/re2o!580
2020-12-28 20:54:42 +01:00
Hugo Levy-Falk
11c4f4ef21 Fix club edit and add some documentation on that error. 2020-12-28 20:51:21 +01:00
chirac
aea9398f34 Merge branch 'fix-validators-positiveinteger' into 'dev'
Fix validators positiveinteger

See merge request re2o/re2o!579
2020-12-28 16:42:34 +01:00
Hugo Levy-Falk
4d82eda5b1 Code formatting. 2020-12-28 16:38:44 +01:00
Hugo Levy-Falk
7f36b642ac Remove useless MinValueValidator(0) on PositiveIntegerField. 2020-12-28 16:37:43 +01:00
klafyvel
08aa4c043e Merge branch 'fix-advanced-search-filters-for-empty-query' into 'dev'
Fix advanced search filters for empty query

See merge request re2o/re2o!577
2020-12-27 15:55:43 +01:00
10d6e35352 Improve code formatting of search/engine.py 2020-12-27 15:50:16 +01:00
3f0901bbb3 Fix advanced search filters for empty query 2020-12-27 15:47:41 +01:00
bca20e28f6
refactor: 🎨 Replace os.path by pathlib 2020-11-30 14:12:01 +01:00
68bab01fa2 a few small fixes 2020-11-29 22:37:42 +01:00
0a99779c59 merge 2020-11-29 18:22:32 +01:00
9ff03d8c42 lets be sure that api permissions wont trigger on functional views 2020-11-29 18:19:46 +01:00
0ecf684c3d add brand news ACL 2020-11-29 18:08:20 +01:00
344f836209 Merge branch 'make_acl_compatible_with_api' of https://gitlab.federez.net/re2o/re2o into new_radius_api 2020-11-29 17:21:52 +01:00
eb7830dfad patch 2020-11-29 17:21:28 +01:00
9720d80e1c modification des acl pour gérer les vues de l'api 2020-11-29 17:17:42 +01:00
fdb93e1759 documentation 2020-11-29 10:33:40 +01:00
048140db20 on a testé à rennes et ça marche du tonnerre 2020-11-28 23:07:36 +01:00
df6de3ef2f première passe de debug 2020-11-28 16:24:36 +01:00
51e312e4c9 première version du script, pre debug 2020-11-28 15:42:08 +01:00
c213703a30 premiere version de l'api radius 2020-11-28 12:09:36 +01:00
e863179907 bypass temporaire des acl de l'api 2020-11-28 12:06:32 +01:00
klafyvel
108d0201d2 Merge branch 'new_radius_api' into 'dev'
Add functional views in api router

See merge request re2o/re2o!573
2020-11-23 20:18:22 +01:00
935249bebd Merge branch 'dev' of https://gitlab.federez.net/re2o/re2o into new_radius_api 2020-11-23 20:10:44 +01:00
chapeau
5fe3c42348 Merge branch 'rezometz_to_Rézo_Metz' into 'dev'
Rezometz to Rézo Metz

See merge request re2o/re2o!572
2020-11-23 20:09:14 +01:00
cb144f3390 Add functional views in api router 2020-11-23 19:58:55 +01:00
d1d4ea6af3
Ça se dit Rézo Metz 'tain 2020-11-23 17:06:37 +01:00
chirac
be3970a052 Merge branch 'fix_filter_access' into 'dev'
Fix has_access global filter on different membership and connexion invoices

See merge request re2o/re2o!570
2020-11-19 21:16:49 +01:00
Gabriel Detraz
2cacdb1987 Remove duplicated line 2020-11-18 08:28:45 +01:00
Gabriel Detraz
d58b99173f Fix has_access global filter on different membership and connexion invoices 2020-11-18 02:52:35 +01:00
chirac
368d623271 Merge branch 'frontend' into 'dev'
Refactor navbar and general frontend.

See merge request re2o/re2o!569
2020-11-18 00:33:55 +01:00
4b320ba7cf
Minor typo in translations 2020-11-17 22:23:51 +01:00
30ff646de7
Links and translations 2020-11-17 22:13:20 +01:00
087ef6feb6
Translations 2020-11-17 21:50:16 +01:00
0f40663fac
Add custom themes 2020-11-17 13:54:33 +01:00
3a9a839148
Bootom navbar don't hide sidebar 2020-11-17 09:58:08 +01:00
2db1f5afee
Add right sidebar for large screenn, remove scroll in navbar, add scroll in left sidebar 2020-11-16 19:12:36 +01:00
a093637cb3
Link in navbar for multi_op app 2020-11-16 19:11:22 +01:00