chirac
|
023986f77e
|
Merge branch 'fix-machine-display-name' into 'dev'
Let's have a useful displayed name for machines.
See merge request re2o/re2o!539
|
2020-06-01 14:00:50 +02:00 |
|
Hugo Levy-Falk
|
9f568d4fb9
|
Let's have a useful displayed name for machines.
|
2020-06-01 11:24:23 +02:00 |
|
chirac
|
98b2e132cc
|
Merge branch 'feature-view-button' into 'dev'
I need a view button
See merge request re2o/re2o!538
|
2020-05-30 18:34:33 +02:00 |
|
Hugo Levy-Falk
|
e1542b9e92
|
I need a view button
|
2020-05-30 18:14:33 +02:00 |
|
klafyvel
|
c3227b52de
|
Merge branch 'fix_268' into 'dev'
Fix 268
See merge request re2o/re2o!537
|
2020-05-29 20:10:38 +02:00 |
|
Gabriel Detraz
|
ee0fe7b24e
|
Refactor serviceuser admin
|
2020-05-28 22:27:37 +02:00 |
|
Gabriel Detraz
|
eb5becb0db
|
Fix user adherent/club creation form
|
2020-05-28 22:08:44 +02:00 |
|
chirac
|
a5dda65412
|
Update year in base.html
|
2020-05-28 14:49:29 +02:00 |
|
chirac
|
2a12f168ae
|
Merge branch 'fix_routers' into 'dev'
Update CHANGELOG.md
See merge request re2o/re2o!536
|
2020-05-21 18:47:56 +02:00 |
|
chirac
|
7f82878c69
|
Update CHANGELOG.md
|
2020-05-21 18:47:17 +02:00 |
|
klafyvel
|
9c01bf7a12
|
Merge branch 'fix_routers' into 'dev'
Fix, add a possible local_routers.py file for routers database use
See merge request re2o/re2o!535
|
2020-05-21 18:41:47 +02:00 |
|
Gabriel Detraz
|
48b084e047
|
Fix, add a possible local_routers.py file for routers database use
|
2020-05-21 18:34:42 +02:00 |
|
klafyvel
|
804101a9da
|
Merge branch 'add-thumbnail-to-user-model' into 'dev'
Fix small issue with image displayed
See merge request re2o/re2o!534
|
2020-05-21 18:20:52 +02:00 |
|
Leila
|
ba917fe644
|
Fix small image bug
|
2020-05-21 18:10:30 +02:00 |
|
klafyvel
|
abc2748c56
|
Merge branch 'add-thumbnail-to-user-model' into 'dev'
Add thumbnail to user model
See merge request re2o/re2o!533
|
2020-05-19 16:30:33 +02:00 |
|
chiahetcho
|
1ba03335e4
|
Correct django settings
|
2020-05-18 16:52:53 +02:00 |
|
Leila
|
a6e324bc60
|
Add migration file
|
2020-05-18 16:49:17 +02:00 |
|
Leila
|
c4fcf68077
|
Update image in filesystem when user changes image
|
2020-05-17 18:01:22 +02:00 |
|
Leila
|
d94f7b44a3
|
Add thumbnail to user model
|
2020-05-17 12:51:05 +02:00 |
|
chirac
|
2466792f92
|
Merge branch 'fix_backports_flag' into 'dev'
Update : Fix pip/pip3 + flag buster freeradius package
See merge request re2o/re2o!532
|
2020-05-16 17:17:14 +02:00 |
|
chirac
|
55f1b98c94
|
Update apt_requirements_radius.txt
|
2020-05-16 17:06:07 +02:00 |
|
Gabriel Detraz
|
80d5010d3c
|
Update : Fix pip/pip3 + flag buster freeradius package
|
2020-05-16 16:42:56 +02:00 |
|
klafyvel
|
898c0f2472
|
Merge branch 'python2.7_fix' into 'dev'
Retro-compat for python2.7 radius instance
See merge request re2o/re2o!530
|
2020-05-16 13:55:10 +02:00 |
|
Gabriel Detraz
|
610e8815d0
|
Retro-compat for python2.7 radius instance
|
2020-05-16 13:49:23 +02:00 |
|
klafyvel
|
bc7dcfd061
|
Merge branch 'freeradius_python3' into 'dev'
Freeradius python3 backend
See merge request re2o/re2o!531
|
2020-05-16 13:47:32 +02:00 |
|
klafyvel
|
ab5e7f5bdd
|
Grammar nazi mode : on.
|
2020-05-16 12:56:09 +02:00 |
|
klafyvel
|
aa0532206b
|
@chirac needs some sleep.
|
2020-05-16 12:54:36 +02:00 |
|
chirac
|
40c164bed9
|
Update CHANGELOG.md
|
2020-05-16 04:14:31 +02:00 |
|
Gabriel Detraz
|
0a60f67816
|
Freeradius python3 backend
|
2020-05-16 03:57:51 +02:00 |
|
|
|
46e3c26d80
|
Merge branch 'rename_rezo_rez_uid' into 'dev'
Rename rezo_rez_uid legacy and add some help text entries
See merge request re2o/re2o!529
|
2020-05-03 16:05:45 +02:00 |
|
Gabriel Detraz
|
e82b170698
|
Rename rezo_rez_uid legacy and add some help text entries
|
2020-05-03 15:59:59 +02:00 |
|
|
|
65b624df58
|
Merge branch 'fix_ticket_name' into 'dev'
Fix name format for tickets
See merge request re2o/re2o!528
|
2020-05-03 12:53:40 +02:00 |
|
Gabriel Detraz
|
52cfdc7105
|
Fix name format for tickets
|
2020-05-03 02:12:04 +02:00 |
|
chirac
|
8e4cb69025
|
Merge branch 'wrong_history_data' into 'dev'
Fix wrong data being sometimes shown in history
See merge request re2o/re2o!527
|
2020-05-03 01:51:09 +02:00 |
|
|
|
0c21a8e14d
|
Fix mac address filter no longer working
|
2020-05-03 00:47:49 +02:00 |
|
|
|
d330ddde87
|
Fix error in format string
|
2020-05-03 00:39:45 +02:00 |
|
|
|
524403de2b
|
Fix filtering error when showing history
|
2020-05-03 00:27:49 +02:00 |
|
chirac
|
a2a6c1e7cd
|
Merge branch 'fix_typo_regen_extension' into 'dev'
Fix typo in function name to regen DNS
See merge request re2o/re2o!525
|
2020-05-01 13:08:06 +02:00 |
|
Laouen Fernet
|
33cea3254d
|
Fix typo in function name to regen DNS
|
2020-05-01 13:04:22 +02:00 |
|
chirac
|
f0aa4b345f
|
Merge branch 'fix_acl_multiple_instance' into 'dev'
Allow ACL to be used for two instances of the same model.
See merge request re2o/re2o!526
|
2020-05-01 13:00:27 +02:00 |
|
Hugo Levy-Falk
|
69d5858922
|
Now you don't see me anymore.
|
2020-05-01 12:27:37 +02:00 |
|
Hugo Levy-Falk
|
367e306145
|
fix acl functions in topologie models inheriting from Machine
|
2020-05-01 12:23:41 +02:00 |
|
Hugo Levy-Falk
|
bf55bf0fa9
|
PEP8 is for everyone.
|
2020-04-30 22:36:41 +02:00 |
|
Hugo Levy-Falk
|
74a44b7e92
|
Merge branch 'fix_acl_multiple_instance' of https://gitlab.federez.net/re2o/re2o into fix_acl_multiple_instance
|
2020-04-30 22:36:03 +02:00 |
|
Hugo Levy-Falk
|
c4e8441718
|
Avoid failing when permissions depending on another model are None.
|
2020-04-30 22:32:17 +02:00 |
|
Hugo Levy-Falk
|
7edef7b722
|
Machine inherits AclMixin
|
2020-04-30 22:27:21 +02:00 |
|
Gabriel Detraz
|
ace47e1bc7
|
More logic permission check in machine
|
2020-04-30 22:21:12 +02:00 |
|
Gabriel Detraz
|
b440519c73
|
Wrong name for basic django permission change
|
2020-04-30 22:00:17 +02:00 |
|
Hugo Levy-Falk
|
68ce40a368
|
fix history view.
|
2020-04-30 21:55:44 +02:00 |
|
Hugo Levy-Falk
|
d8b6a7dab1
|
Allow ACL to be used for two instances of the same model.
|
2020-04-30 19:59:42 +02:00 |
|
