rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-28 15:42:25 +00:00
Code Issues Releases Wiki Activity
2431 commits 211 branches 14 tags 12 MiB
Commit graph

2431 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Iooss
31680830a8 Define columns in admin 2019-02-26 10:24:47 +01:00
Alexandre Iooss
403fb85656 Use user admin for shells management 2019-02-26 10:03:48 +01:00
Alexandre Iooss
74a0ed4a5d Move useradmin in a separate app 2019-02-26 09:55:57 +01:00
Alexandre Iooss
a086c5784f Fix label not being hidden by JS 2019-02-25 21:17:04 +01:00
Alexandre Iooss
f21123dadd Better pagination in admin 2019-02-25 21:12:11 +01:00
Alexandre Iooss
26a7b635b7 Fix missing translation 2019-02-25 20:42:32 +01:00
Alexandre Iooss
2ebdbab1e2 Update translation 2019-02-25 20:41:33 +01:00
Alexandre Iooss
6d99881873 Overwrite admin templates (6) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
13865d697c Overwrite admin templates (5) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
231497d16b Overwrite admin templates (4) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
46cb6dddb3 Title block for compatibility 2019-02-25 17:53:12 +01:00
Alexandre Iooss
0c49a3b077 Overwrite admin templates (4), thanks edpibu :) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
b1758da49f It's better to return to the true home 2019-02-25 17:53:12 +01:00
Alexandre Iooss
5409f34206 Overwrite admin templates (3) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
9879f940a3 Overwrite admin templates (2) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
cf586ff52e Sync admin template with Django contrib code 2019-02-25 17:53:12 +01:00
Alexandre Iooss
69ff7a2391 Overwrite admin templates (1) 2019-02-25 17:53:12 +01:00
Alexandre Iooss
ae6ae4a151 Change HTML lang according to page lang 2019-02-25 17:53:12 +01:00
Alexandre Iooss
6287863bf6 Make base template compatible with Django Contrib Admin 2019-02-25 17:53:12 +01:00
Alexandre Iooss
e38a661680 Switch schools management page to user admin site 2019-02-25 17:53:12 +01:00
Alexandre Iooss
eca74aae6b Add custom admin site for users 2019-02-25 17:53:12 +01:00
klafyvel
0bc1734cf3 Merge branch 'residence' into 'dev' 
Residence

See merge request federez/re2o!412
 2019-02-20 23:31:18 +01:00
klafyvel
4fcfbea0f4 Update forms.py 2019-02-20 23:25:15 +01:00
chirac
c4571ab425 Update, english doc models.py 2019-02-20 20:49:34 +01:00
chirac
bd079b2756 Doc in english dormitory views.py 2019-02-20 20:46:28 +01:00
detraz
c346ca531a Display residence if residence>1 2019-02-19 00:54:11 +01:00
detraz
87730a3ad2 Fix room_name problem with building 2019-02-18 22:13:34 +01:00
detraz
8d799ed92d Create dormitory with buildings 2019-02-18 21:11:51 +01:00
grizzly
565f57967c Merge branch 'update_translation_files' into 'dev' 
Update translation files

See merge request federez/re2o!409
 2019-02-12 09:42:36 +01:00
Alexandre Iooss
56ec7a2df5 Update translation files 2019-02-12 09:12:45 +01:00
Hugo LEVY-FALK
ca1005d58c Merge branch 'master' into dev 2019-02-07 19:09:51 +01:00
Hugo LEVY-FALK
a8dbe4621f Release : 2.7 2019-02-07 18:48:46 +01:00
klafyvel
833d7177e9 Merge branch 'radius_asci' into '2.7' 
Fix : All message in asci...

See merge request federez/re2o!404
 2019-02-07 18:30:55 +01:00
Gabriel Detraz
824fd0c51e Fix : All message in asci... 2019-02-07 15:17:35 +01:00
grizzly
02dba09972 Merge branch 'frontend_various_fixes' into 'dev' 
Frontend various fixes

See merge request federez/re2o!395
 2019-01-28 11:27:31 +01:00
Alexandre Iooss
0d4b86f5c1 Make alternatives for favicon 
Make alternatives for favicon to support a wider range of device.
It includes favicon for iOS, Android, MacOS touchbar.
It also fixes the favicon on Chromium/Chrome variants.
 2019-01-28 11:12:05 +01:00
Alexandre Iooss
6780b91fe2 Make 'Manage the club' panel hover like other panels 2019-01-28 11:12:05 +01:00
klafyvel
522b5be317 Merge branch 'mac_vendor' into 'dev' 
Mac vendor

See merge request federez/re2o!403
 2019-01-27 12:16:22 +01:00
Grizzly
e024560729 Meilleur gestion d'erreur 2019-01-27 10:38:43 +00:00
Grizzly
e1fa749039 Determine et affiche le vendeur de la mac (wip sur le except) 2019-01-27 09:39:18 +00:00
klafyvel
eacad3bdb9 Merge branch 'active_machine' into 'dev' 
Texte et couleur pour les machines désactivées

See merge request federez/re2o!402
 2019-01-26 13:24:52 +01:00
klafyvel
ee7c1272b1 Translation for deactivated 2019-01-26 13:08:59 +01:00
Grizzly
9b05f8fa98 Texte et couleur pour les machines désactivées 2019-01-24 18:00:20 +00:00
chirac
6e20c134f9 Merge branch 'hotfix_radius' into '2.7' 
Hotfix radius

See merge request federez/re2o!399
 2019-01-23 21:37:15 +01:00
chirac
b6465f2e89 Merge branch 'hotfix_radius' into 'dev' 
Hotfix radius

See merge request federez/re2o!400
 2019-01-23 21:37:06 +01:00
Hugo LEVY-FALK
0e79ab4e01 Fix vlan id 2019-01-23 21:30:17 +01:00
Hugo LEVY-FALK
d26bf4dc97 fix encoding 2019-01-23 21:02:35 +01:00
klafyvel
beae8ee83e Merge branch 'dev' into '2.7' 
Dev

See merge request federez/re2o!398
 2019-01-23 00:08:39 +01:00
klafyvel
4f9e0f8a8c Merge branch 'mac_uniq' into 'dev' 
Mac_address is now uniq in one ip range

See merge request federez/re2o!397
 2019-01-23 00:01:18 +01:00
detraz
67b702f171 Mac_address is now uniq in one ip range 2019-01-22 23:41:06 +01:00