Commit Graph

33157 Commits

Author SHA1 Message Date
artica c109c45c20 Auto-updated build strings. 2023-03-09 01:00:20 +01:00
Jose Gonzalez 47c67ff131 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 00:45:48 +01:00
Jose Gonzalez c855061d43 Netflow view 2023-03-09 00:45:41 +01:00
daniel 2f3ceb0f82 Merge branch 'ent-9662-second-round' into 'develop'
fixed styles

See merge request artica/pandorafms!5586
2023-03-08 18:33:19 +00:00
daniel fdaf53450a Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-08 19:28:28 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon d0c8794361 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 17:12:22 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Jonathan 08c2803970 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 17:09:47 +01:00
Jonathan 54e6a99cc3 Dashboard pagination visual position 2023-03-08 17:09:42 +01:00
Daniel Maya 72990ab177 #9662 Fixed pandora black 2023-03-08 16:41:26 +01:00
Daniel Cebrian 6efa1f46d7 #10324 fixed conflic wit tickets 10325 2023-03-08 16:01:50 +01:00
Jonathan 434aa1dbc3 z-index fix on buttons and mesage 2023-03-08 15:57:55 +01:00
Jose Gonzalez a8c177a248 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:57:19 +01:00
Jonathan b6aa5fc11e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:45:23 +01:00
Jonathan 63ecb7eb0b Tree view metaconsole view like nodo 2023-03-08 15:45:18 +01:00
Pablo Aragon 2934ff25ff Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:31:05 +01:00
Pablo Aragon 87e82c0410 10457-Audit log, save/load filters 2023-03-08 15:30:48 +01:00
Jose Gonzalez 0304c1f18e Calendar CSS styles 2023-03-08 15:23:42 +01:00
Jose Gonzalez c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez 0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jose Gonzalez 1d3d2fc5fd Minor fixes 2023-03-08 15:01:41 +01:00
Jonathan 862e1c0ad3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:45:29 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Pablo Aragon 78eccfd73b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 13:36:49 +01:00
Pablo Aragon 1a7e063c60 Alerts 2023-03-08 13:36:36 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
daniel bc501ec552 fixed styles 2023-03-08 08:28:48 +01:00
daniel 5ff56ff7e8 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5583
2023-03-08 07:07:55 +00:00
daniel 8567cb55fb Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-08 08:06:05 +01:00
artica 27357b16b6 Auto-updated build strings. 2023-03-08 01:00:21 +01:00
Jose Gonzalez eefb62e520 Input improve 2023-03-07 22:45:48 +01:00
Jose Gonzalez 5017878701 Messages view 2023-03-07 22:05:06 +01:00
Jose Gonzalez 4af67db415 Export data view 2023-03-07 18:10:07 +01:00
Alejandro Campos 7c9b4c6944 Merge branch 'develop' into 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre'
# Conflicts:
#   pandora_console/godmode/reporting/map_builder.php
2023-03-07 17:05:08 +00:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez 14246ea570 User edit notifications 2023-03-07 17:50:03 +01:00
Jose Gonzalez 651469b562 Users connected view 2023-03-07 17:37:33 +01:00
Jose Gonzalez b13892ecdb Users connected view 2023-03-07 17:37:01 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
alejandro.campos@artica.es 7e5dee5418 fixed license check 2023-03-07 16:27:14 +01:00
daniel 1ba420a9ce fixed styles 2023-03-07 16:22:13 +01:00
Pablo Aragon dbd565fd1d Alerts 2023-03-07 16:17:48 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
daniel 5a41c8b61c fixed styles 2023-03-07 16:00:33 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00