Gabriel Detraz
d8ad882eff
xOptimisation des requètes SQL chargement des switchs
2019-08-06 04:11:36 +02:00
klafyvel
2e4e139227
Merge branch 'dormitory_port_profile' into 'dev'
...
Dormitory port profile
See merge request federez/re2o!424
2019-07-27 07:51:56 +02:00
Gabriel Detraz
9882310d61
Affichage correct si port profile custom
2019-07-27 01:55:26 +02:00
Gabriel Detraz
7cc0fd1e66
Mise en cache et gestion correcte des profile de port par résidence
2019-07-27 01:53:06 +02:00
chirac
5b112657c9
Returns correct port profile
2019-07-21 01:25:04 +02:00
chirac
3ec4fdd9d9
Profile default different for dormitories (option)
2019-07-21 01:02:32 +02:00
chirac
a51c5f4b57
Fix Article (s)
2019-07-14 19:55:53 +02:00
grizzly
3d7ad99d61
Merge branch 'fix_note' into 'dev'
...
Fix : Evite le plantage si le montant vaut exactement le minimum
See merge request federez/re2o!421
2019-07-13 11:51:36 +02:00
Gabriel Detraz
e60196db9b
Fix : Evite le plantage si le montant vaut exactement le minimum
2019-07-13 11:46:40 +02:00
grizzly
b8ab569a38
Merge branch 'broaden_customised_reminder_message' into 'dev'
...
[Reminder] Broaden with textfield and unlimited message for customized end_membership
See merge request federez/re2o!422
2019-07-13 11:38:47 +02:00
Gabriel Detraz
94aca35190
[Reminder] Broaden with textfield and unlimited message for customized end_membership
2019-07-12 18:27:12 +02:00
Fardale
4a14d6480c
fix md5 password verification function
2019-07-07 13:06:23 +02:00
Fardale
074b944246
fix crypt password verification function
2019-07-07 13:06:23 +02:00
klafyvel
2eeeb0c19a
Merge branch 'fix_md5_password' into 'master'
...
fix md5 password verification function
See merge request federez/re2o!420
2019-05-01 19:58:14 +02:00
klafyvel
375d3fbd34
Merge branch 'base_admin' into 'dev'
...
Base admin
See merge request federez/re2o!417
2019-04-29 21:54:08 +02:00
Fardale
79d085a0aa
fix md5 password verification function
2019-04-26 00:37:07 +02:00
chirac
3db44f592a
Merge branch 'fix_crypt_password' into 'master'
...
fix crypt password verification function
See merge request federez/re2o!419
2019-04-25 22:26:31 +02:00
Fardale
814fec7d2a
fix crypt password verification function
2019-04-24 23:36:25 +02:00
Alexandre Iooss
e900ce0d0d
Fix login screen not being redirected
2019-04-20 19:30:49 +02:00
Alexandre Iooss
831e0c0690
Link to login page when logged out
2019-04-20 19:30:49 +02:00
Alexandre Iooss
10c6a268d2
Add customisation to Django Contrib Admin
...
The default theme of Django Contrib Admin is not really great. This
theme the Django Admin with Re2o logo and colors.
It also comes with a new dynamic-generated menu to navigate in the admin
interface.
A new index page override the global index of Django Contrib Admin to
prepare for new features.
This patch is part of the Aube patchset for Re2o, targeting the use of
Django Contrib Admin as a manage interface for active members.
2019-04-20 19:30:49 +02:00
Alexandre Iooss
a7d7cbd261
Add a logout confirmation
...
This patch remove the custom rule in router responsible to redirect
logout to index page and place a template with pre-translated strings.
This is part of Aube patchset for Re2o to unify the login procedure with
Django Contrib Auth.
2019-04-20 19:30:49 +02:00
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
