8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 07:23:46 +00:00
Commit graph

3105 commits

Author SHA1 Message Date
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
chirac
c33781b7e0 Merge branch 'Bug_no_matching_reverse' into 'dev'
Bug no matching reverse

See merge request re2o/re2o!524
2020-04-27 06:56:13 +02:00
Bombar Maxime
98caddf652 Fix edition of SRV records 2020-04-27 01:38:29 +02:00
Gabriel Detraz
459ac3d587 [Bug] Remove useless import 2020-04-25 23:28:08 +02:00
chirac
f2e5ee356a Merge branch 'add_creation_event_in_history' into 'dev'
Show"creation events in history

See merge request re2o/re2o!523
2020-04-25 13:49:51 +02:00
f61eaaa655 Show creation event in detailed history 2020-04-25 13:45:19 +02:00
chirac
29b36bb346 Merge branch 'complete_detailed_history' into 'dev'
Finish replacing old history view

See merge request re2o/re2o!522
2020-04-25 13:39:32 +02:00
568dd3b415 Remove useless query in detailed history 2020-04-25 11:26:18 +00:00
c3e246c64d Make related history more extensive for users and machines 2020-04-25 11:22:39 +00:00
de23ed7e03 Improve display of deleted objects in history 2020-04-25 11:09:22 +00:00
13cb3f7990 Make RelatedHistory cleaner 2020-04-25 12:59:01 +02:00
Jean-Romain Garnier
37f87d6487 Remove detaild_history.html file 2020-04-25 12:45:36 +02:00
Jean-Romain Garnier
2b18d438a2 Fix RelatedHistory init in detailed history 2020-04-25 12:40:10 +02:00
4190f4f39e Start implementing detailed history for event class 2020-04-25 12:31:18 +02:00
chirac
63f09d7867 Merge branch 'filter_event_logs' into 'dev'
Add ability to filter event logs and make them nicer

See merge request re2o/re2o!519
2020-04-25 01:50:37 +02:00
f7c5c801d5 Add username autocompletion in event filter view 2020-04-25 01:43:26 +02:00
00b3604aa3 Improve description for events with None objects 2020-04-25 01:43:26 +02:00
301a8f0182 Don't assume an event's userfulness when showing logs 2020-04-25 01:43:26 +02:00
0c7689adde Fix fix event type filter in postgre 2020-04-25 01:43:26 +02:00
9bd080f853 Fix event type filter in postgre 2020-04-25 01:43:26 +02:00
46822c1169 Fix import error in logs/models.py 2020-04-25 01:43:26 +02:00
a659e2fcbd Fix searching for malformated IP or MAC addresses in machine history search 2020-04-25 01:43:26 +02:00
364f89d3d4 Auto format MAC addresses inmachine history search 2020-04-25 01:43:26 +02:00
cbc26abdaf Make logs queries more efficient 2020-04-25 01:43:25 +02:00
ec59487e72 Fix bugs introduced while improving performance 2020-04-25 01:43:25 +02:00
acb4dea1b4 Work on improving performance when filtering logs 2020-04-25 01:43:25 +02:00
e537143efc Add missing translations 2020-04-25 01:43:25 +02:00
889a16d2ce Limit length of displayed diff 2020-04-25 01:43:25 +02:00
42a885c599 Fix diff computation in event logs 2020-04-25 01:43:25 +02:00
3935a37c24 Handle object creation in event logs 2020-04-25 01:43:25 +02:00
2a155032ef Attempt to add diff view in event logs 2020-04-25 01:43:25 +02:00
f350a24a42 Handle empty objects in event logs view 2020-04-25 01:43:25 +02:00