Alexandre Iooss
58196cadad
Redirect Django Contrib Admin login page
...
Without this patch, Re2o has two login screen with different
features.
This patch redirects `/admin/login/` to the login page.
This patch is part of the Aube patchset for Re2o. This helps in the goal
to unify the login process and drop the custom login page.
2019-04-20 19:30:49 +02:00
Alexandre Iooss
f4c9ac19cf
Override Django Contrib Auth templates
...
This override Django Contrib Auth templates to make them more integrated
with the user site.
More precisely the breadcrumb now redirects to the index page rather to
the Django Contrib Admin index page.
*It also fix a security vulnerability in Re2o.* Without this patch users
are able to request for a new password AND the existing login name. So
just with access to someone mail, it would be possible to hack into his
account.
And yes, Re2o implements another password system. But this one is not
disabled (see by yourself : https://intranet.crans.org/password_reset/ ).
This also is part of the Aube patch-set for Re2o and one of Aube goal is
to drop the custom admin password reset system and use the Django
Contrib Auth one.
2019-04-20 19:30:49 +02:00
klafyvel
cd2c666b46
Merge branch 'HandleHttpErrors' into 'dev'
...
Correct http response status code
See merge request federez/re2o!418
2019-04-20 19:05:43 +02:00
Maxime Bombar
458fe2f505
Correct http response status code
2019-04-15 10:00:38 +02:00
klafyvel
3e03fc0c49
Merge branch 'full_archive' into 'dev'
...
Full archive
See merge request federez/re2o!414
2019-03-17 19:41:44 +01:00
klafyvel
f69c88d8fe
Fix LDAP deletion on single user full archiving.
2019-03-17 19:36:44 +01:00
klafyvel
2e2c72a9c3
Delete LDAPUser when full archiving a single user.
2019-03-17 19:30:30 +01:00
Gabriel Detraz
682803cca4
Exclude full archive for home creation
2019-03-17 18:14:58 +01:00
detraz
857c42c892
Enable search for full archived state
2019-03-17 18:03:33 +01:00
detraz
986cdcd90a
Mass delete machine intelligent function
2019-03-17 17:56:46 +01:00
detraz
6e569566ed
Avoid lazy eval problems with django queryset
2019-03-17 17:20:11 +01:00
detraz
9053a752b1
New argument on all_adh and all_access including asso
2019-03-17 15:23:51 +01:00
detraz
0d0d09bc9f
Fix type var rename
2019-03-17 14:53:11 +01:00
Gabriel Detraz
e0194ba4e3
Fonctions mass_achivage pour objects multiples
2019-03-17 05:45:34 +01:00
Gabriel Detraz
706903f8c9
Add new full_archive state for user
2019-03-17 03:24:20 +01:00
grizzly
e83e5d4f79
Merge branch 'residences2' into 'dev'
...
Change les variables type en name ou machine_type pour éviter les confusions
See merge request federez/re2o!413
2019-03-09 19:48:17 +01:00
detraz
c9b84047d2
Change les variables type en name ou machine_type pour éviter les confusions
2019-03-03 17:28:33 +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
chirac
411467a520
Merge branch 'feature_document_templates' into 'dev'
...
Feature document templates
See merge request federez/re2o!391
2019-01-21 21:03:38 +01:00
Hugo LEVY-FALK
31ba9a271f
Fix get_subscription of invoice.
2019-01-21 20:52:28 +01:00
Hugo LEVY-FALK
bc758a6bcb
Retire le lien vers les templates dans la sidebar de cotisations
2019-01-21 09:12:06 +01:00
Hugo LEVY-FALK
4fef4a6057
Déplace les templates dans préférences.
2019-01-21 00:54:02 +01:00
