8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-04 17:06:27 +00:00
Commit graph

3179 commits

Author SHA1 Message Date
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
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
fd006c505a
Refactor navbar and general frontend.
The menus of the navbar is reorganized
The footer is changed into a navbar
The right sidebar is placed to the left
The left sidebar is deleted
Header navbar and leftsidebar are now fixed
Physical grouing is split into 4 views
2020-11-15 20:41:23 +01:00
klafyvel
1fd8863370 Merge branch 'fix_disable_emailnotyetconfirmed_translation' into 'dev'
Fix disable_emailnotyetconfirmed translation

See merge request re2o/re2o!568
2020-11-12 19:23:08 +01:00
Jean-Romain Garnier
2949b31edf Fix disable_emailnotyetconfirmed translation 2020-11-12 12:14:13 +01:00
klafyvel
850dcfb800 Merge branch 'fix_user_history_key_error' into 'dev'
Fix #295

See merge request re2o/re2o!567
2020-11-12 11:33:59 +01:00
Jean-Romain Garnier
b247d0c2c8 Fix #295
KeyError could be raised when omparing versions with different fields
2020-11-12 11:23:01 +01:00
grisel-davy
efc08d3f9a Forgot the paginator in the MR !566. 2020-11-04 22:10:18 +01:00
Gabriel Detraz
dfb688f995 Fix : default value should be 0 2020-11-02 23:43:54 +01:00
Gabriel Detraz
01af6ea927 Fix error on migration 48 and split for pg_triggers reason 2020-11-02 23:07:13 +01:00
chirac
d8bc523827 Merge branch 'fix_tables_half_width' into 'dev'
Fix tables half width

See merge request re2o/re2o!566
2020-11-01 14:08:10 +01:00
grisel-davy
a12ed72c87 Break word with CSS and not with a specific method of interfaces 2020-10-28 21:23:49 +01:00
grisel-davy
8a722d825e Fix the overflow of text in the sidenav for small screen 2020-10-28 19:33:37 +01:00
grisel-davy
10de0d0ac8 Turn table row into panels 2020-10-27 16:04:21 +01:00
grisel-davy
17f09c551b reorganize infos on contact page 2020-10-27 12:20:26 +01:00
grisel-davy
7bedf0c9dc Affichage améliorer avec 2 footers 2020-10-27 11:41:46 +01:00
grisel-davy
b5c01bf58f Table -> grid pour l'affichage sur telephone 2020-10-27 11:31:51 +01:00
grisel-davy
0a2c48da6b Affichage sans chevauchement sur toute la gamme de largeur 2020-10-26 19:23:41 +01:00
grisel-davy
718e761d2a Affichage sans chevauchement sur toute la gamme de largeurs 2020-10-26 19:15:51 +01:00
grisel-davy
8a67b0ca0e Turn tables into grids 2020-10-25 23:47:59 +01:00
grisel-davy
dba0da249e Add paginator, updates machines, create aff_machines, and minor changes 2020-10-24 00:52:25 +02:00
grisel-davy
685c88d2e5 Fix typo and update display port profils 2020-10-23 19:13:02 +02:00
grisel-davy
57d22e9aaf fix typo in iptypes and update display of switchs 2020-10-23 12:09:09 +02:00
grisel-davy
4f5bdc1d0b Add listings of articles to aff of all cotisations 2020-10-23 11:41:02 +02:00
grisel-davy
a3f4deb145 Update display of ip_types 2020-10-23 10:12:18 +02:00
grisel-davy
0bcb6cc680 Remove redundant code, reuse aff_ templates 2020-10-23 00:15:34 +02:00
grisel-davy
6cc6326f15 Not perfect but much better 2020-10-22 23:55:05 +02:00
chirac
e8d4cbf9ed Merge branch 'remove_profil_image' into 'dev'
Remove profil image

See merge request re2o/re2o!565
2020-10-22 16:42:38 +02:00
grisel-davy
5163fd5e53 Remove profile_image field from the api 2020-10-22 15:43:06 +02:00