chirac
|
99928c885b
|
Merge branch 'fix_state' into 'master'
Fix le changement d'etat de l'user
See merge request federez/re2o!113
|
2018-04-07 22:16:05 +02:00 |
|
Gabriel Detraz
|
bb6b19f574
|
Fix le changement d'etat de l'user
|
2018-04-07 22:14:40 +02:00 |
|
klafyvel
|
b49866d9ee
|
Merge branch 'buttons_amelioration' into 'master'
modification panel profil
See merge request federez/re2o!109
|
2018-04-03 21:10:10 +02:00 |
|
chirac
|
34991c2639
|
Merge branch 'fix_radius' into 'master'
Update auth.py
See merge request federez/re2o!112
|
2018-04-03 20:15:20 +02:00 |
|
chirac
|
cdc012bc47
|
Update auth.py
|
2018-04-03 20:11:19 +02:00 |
|
guimoz
|
39a1c4eb86
|
Merge branch 'profil_frontend' into 'master'
Profil frontend
See merge request federez/re2o!111
|
2018-04-03 18:48:01 +02:00 |
|
chirac
|
2fffa98d46
|
Merge branch 'master' into 'profil_frontend'
# Conflicts:
# users/views.py
|
2018-04-03 18:38:28 +02:00 |
|
Gabriel Detraz
|
3affe08d29
|
Factorisation de paginator + pagination des machines dans profil
|
2018-04-03 05:01:01 +02:00 |
|
Gabriel Detraz
|
ec076fb4bf
|
xReactivation du sendmail
|
2018-04-03 04:58:26 +02:00 |
|
Gabriel Detraz
|
c0f1eb7acf
|
Merge branch 'mixin_hist' into 'master'
Commentaire sur le controle
See merge request nounous/re2o!22
|
2018-04-03 03:48:17 +02:00 |
|
Gabriel Detraz
|
a3bad81689
|
Commentaire sur le controle
|
2018-04-03 03:47:18 +02:00 |
|
Gabriel Detraz
|
b748a3003a
|
Merge branch 'aff_port_naturel' into 'master'
Aff port naturel
See merge request nounous/re2o!21
|
2018-04-02 20:21:01 +02:00 |
|
grisel-davy
|
cf9d37dc54
|
affichage des ports plus naturel
|
2018-04-02 20:12:53 +02:00 |
|
Gabriel Detraz
|
f39ae95b35
|
Fix historique alias
|
2018-04-02 04:31:34 +02:00 |
|
Gabriel Detraz
|
6db387caf8
|
Linked_objects + fix modif formset
|
2018-04-02 03:52:28 +02:00 |
|
Gabriel Detraz
|
88b003d0fe
|
Remplace "cableur" par effectué par
|
2018-04-02 03:39:03 +02:00 |
|
Gabriel Detraz
|
5596abf4df
|
Affichage des objets liés quand c'est necessaire (interfaces-machines-domain)
|
2018-04-02 03:36:54 +02:00 |
|
Gabriel Detraz
|
513933abba
|
Register club et adherent admin pour histo
|
2018-04-02 03:35:32 +02:00 |
|
klafyvel
|
22143e8a3e
|
Merge branch 'fix_divers_acl' into 'master'
Fix service users + stack
See merge request federez/re2o!110
|
2018-04-01 20:48:35 +02:00 |
|
Gabriel Detraz
|
e7be7e1a2c
|
Fix service users + stack
|
2018-04-01 20:44:49 +02:00 |
|
Gabriel Detraz
|
543037b667
|
Save que si l'objet a été modifié
|
2018-04-01 00:07:01 +02:00 |
|
Gabriel Detraz
|
a553789bad
|
Draft : on save que si l'objet a été modifié
|
2018-03-31 18:10:43 +02:00 |
|
Gabriel Detraz
|
30a576c010
|
Gestion historique sur les ports et model de ports
|
2018-03-31 17:42:34 +02:00 |
|
Gabriel Detraz
|
bb5c9603de
|
Fix history shell
|
2018-03-31 17:27:32 +02:00 |
|
Gabriel Detraz
|
1795d26c55
|
Gestion de l'historique avec un mixin forms et model
|
2018-03-31 17:19:02 +02:00 |
|
Tipunchetrhum
|
88f519ba8e
|
modification panel profil
|
2018-03-29 23:43:43 +02:00 |
|
klafyvel
|
a2bde7fc1a
|
Merge branch 'acl_mixins' into 'master'
Acl mixins
See merge request federez/re2o!108
|
2018-03-29 15:26:13 +02:00 |
|
Gabriel Detraz
|
83c59d29c6
|
Merge branch 'acl_mixins' into 'master'
Doc pour acl mixins
See merge request nounous/re2o!20
|
2018-03-29 14:58:47 +02:00 |
|
Gabriel Detraz
|
8fe0c8776f
|
Doc pour acl mixins
|
2018-03-29 14:56:17 +02:00 |
|
Gabriel Detraz
|
db74a5c496
|
Merge branch 'arcas' into 'master'
Arcas
See merge request nounous/re2o!16
|
2018-03-29 14:26:21 +02:00 |
|
Gabriel Detraz
|
ea31157a71
|
Merge branch 'acl_mixin' into 'master'
Acl mixin
See merge request nounous/re2o!19
|
2018-03-29 04:38:35 +02:00 |
|
Gabriel Detraz
|
c9fd4cd7b5
|
Fix acl mixin sur users, docstring, fix topologie acl
|
2018-03-29 04:36:23 +02:00 |
|
Gabriel Detraz
|
34024bfc29
|
init.py pour python2 dans api
|
2018-03-28 20:47:33 +02:00 |
|
Gabriel Detraz
|
12cf400e2a
|
Shell -> ListShell
|
2018-03-28 20:46:33 +02:00 |
|
Gabriel Detraz
|
746eef0f74
|
Fix bugs sur topologie, id et plus _id
|
2018-03-28 20:33:25 +02:00 |
|
Gabriel Detraz
|
f91feff0fc
|
Fix divers nas et ap
|
2018-03-28 19:59:51 +02:00 |
|
Gabriel Detraz
|
3a253f3874
|
Adapte history pour le acl_mixin
|
2018-03-28 18:04:46 +02:00 |
|
chirac
|
14991bf88e
|
AclMixin sur preferences
|
2018-03-28 17:39:23 +02:00 |
|
Gabriel Detraz
|
007ad3310a
|
Factorise les get_instance dans le mixin acl
|
2018-03-28 17:15:45 +02:00 |
|
Gabriel Detraz
|
96c5df929e
|
Merge branch 'acl_mixin' into 'master'
Acl mixin
See merge request nounous/re2o!18
|
2018-03-28 10:31:00 +02:00 |
|
Gabriel Detraz
|
46ba34ec0b
|
Fix can_edit/can_create
|
2018-03-28 04:14:50 +02:00 |
|
Gabriel Detraz
|
262431113f
|
Passage de cotisations, topologie et users avec le nouveau mixin
|
2018-03-28 04:07:26 +02:00 |
|
Gabriel Detraz
|
ef1dbc882b
|
Poc de acl mixin, factorisation du code
|
2018-03-28 03:52:34 +02:00 |
|
Gabriel Detraz
|
72e70e74d9
|
Merge branch 'better_frontend' into 'master'
Better frontend
See merge request nounous/re2o!17
|
2018-03-28 00:56:03 +02:00 |
|
Gabriel Detraz
|
e3830a6099
|
Nouveaux dropdown dans la bar
|
2018-03-28 00:10:22 +02:00 |
|
Gabriel Detraz
|
2966547b19
|
Paginateur sur school + tableaux responsives + fix divers
|
2018-03-27 23:56:46 +02:00 |
|
Gabriel Detraz
|
06d4b42716
|
Merge branch 'fix_search' into 'master'
Fix search
See merge request nounous/re2o!15
|
2018-03-27 04:26:41 +02:00 |
|
chirac
|
9d28f33ca7
|
Merge branch 'fix_search' into 'master'
Fix search
See merge request federez/re2o!107
|
2018-03-27 04:26:09 +02:00 |
|
Gabriel Detraz
|
5b4176692a
|
Fix search
|
2018-03-27 04:25:09 +02:00 |
|
chirac
|
4c2a465089
|
Merge branch 'unifi_ap_names' into 'master'
Post save and post delete
See merge request federez/re2o!106
|
2018-03-27 03:03:36 +02:00 |
|