tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,432 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

168 Commits

Author SHA1 Message Date
Tatiana Llorente 4c2215a3db Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 
Conflicts:
	pandora_console/install.php


Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
 2019-02-07 08:59:45 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
 2019-02-05 09:23:53 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358 
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
 2019-01-24 11:10:49 +01:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
Fermin 1e4c570541 [Tags performance] check agents_get_modules in networkmap and removed unused code 2018-10-05 10:44:24 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
samucarc 21db360ab8 Fixed welcome icone 2018-07-26 17:44:31 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
Arturo Gonzalez 192175a4cc Added custom graphviz fields to map creation 2017-11-27 13:52:31 +01:00
Arturo Gonzalez a819efbdb8 Added graphviz values to calibrate maps 2017-11-21 13:18:06 +01:00
Arturo Gonzalez 385685de8a Added safe input to agent name 2017-10-31 09:35:13 +01:00
Arturo Gonzalez 504201b822 Added minor fix 2017-10-17 13:44:36 +02:00
vgilc 4457b3d849 Merge branch '1079-interfaces-when-agent-comes-to-satellite-dev' into 'develop' 
Added function to get all interfaces

See merge request !764
 2017-09-11 09:38:52 +02:00
Arturo Gonzalez 7b949cb5bf Added function to get all interfaces 2017-08-31 10:09:49 +02:00
Arturo Gonzalez bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
Arturo Gonzalez 9cd9eb6fb4 Added filter to non-relation modules. (networkmap) 2017-03-14 11:30:41 +01:00
Arturo Gonzalez 944f891f93 Added modules nodes to non interface relacions. 2017-03-09 11:20:06 +01:00
Arturo Gonzalez 65fcfd7f4c Fixed module type in map relations, again, and now its true. 2017-03-09 11:06:51 +01:00
Arturo Gonzalez 7dd279b902 Rewrite code to modules type cause it was broken. 2017-03-09 08:58:11 +01:00
Arturo Gonzalez 6548443c82 Removed module tipe filter in networkmaps. 2017-03-08 16:09:08 +01:00
Arturo Gonzalez 71614ae81b Added interface links support to networkmaps. Ticket #132 GitLab 2016-12-30 08:51:31 +01:00
Arturo Gonzalez efc117103c New networkmaps in progress... (Added networkmaps to dashboard) 2016-10-14 11:08:19 +02:00
Arturo Gonzalez eb9390cad6 New networkmaps in progress... (Added new migration system and new design elements to js) 2016-10-10 16:11:15 +02:00
Arturo Gonzalez fbc70c7313 New networkmaps in progress... (Trying to fix mi moguer level) 2016-10-10 12:29:51 +02:00
Arturo Gonzalez 969c80ee87 New networkmaps in progress... (Added parameter to node distances) 2016-10-07 14:13:16 +02:00
Arturo Gonzalez b20ecce66a New networkmaps in progress... (Added node sep and rank sep temp controller) 2016-10-07 12:26:17 +02:00
Arturo Gonzalez 50bdad682d New networkmaps in progress... (Changed some visual styles) 2016-10-04 12:40:03 +02:00
Arturo Gonzalez bda0584131 New networkmaps in progress... (Fixed other types of generation) 2016-10-03 16:38:18 +02:00
Arturo Gonzalez e3a6fada7f New networkmaps in progress... (To much changes in the maps form and more minor things) 2016-10-03 16:09:07 +02:00
Arturo Gonzalez 56887cd51c New networkmaps in progress... (To much changes to write it all in only one line, i just say that "The magic was done") 2016-09-29 16:47:30 +02:00
Arturo Gonzalez d2a4e689b5 New networkmaps in progress... (Working in the l2 and l3 fusion system (NO DBZ FUSION)) 2016-09-28 09:01:15 +02:00
Arturo Gonzalez 30d30df548 New networmaps in progress... (Fixed open map with interfaces) 2016-09-27 11:43:57 +02:00
Arturo Gonzalez 446063dd51 New networkmaps in progress... (hells commit with magic to fix the interface links) 2016-09-26 16:14:12 +02:00
Arturo Gonzalez cbef0f3dfd New networkmaps in progress... (Fixed problems in Open part) 2016-09-21 09:52:42 +02:00
Arturo Gonzalez 5d987ed066 New networkmaps in progress... (Moved E code to E section and removed nun dependences) 2016-09-20 15:06:29 +02:00
Arturo Gonzalez 67a4d5e75e New networkmaps in progess... (Added central node and fixed some things) 2016-09-16 11:56:18 +02:00
Arturo Gonzalez 831e7ca314 New networkmap in progess... (Changed db structure and more important things) 2016-09-15 16:41:05 +02:00
Arturo Gonzalez 17e3f38aca New networkmaps in progress... (Transfer e code to Open version) 2016-09-14 11:18:26 +02:00
mdtrooper e6a84b2aff Some fixes in the enterprise holding area. 2016-05-17 13:14:40 +02:00
mdtrooper b229002dd7 Remove the old debug traces. 2016-05-13 13:41:30 +02:00
mdtrooper ae475c8447 Fixed the relations A-M-M-A and A-M-A in the old networkmaps (and this is the source of new networkmaps) 2016-05-13 13:20:53 +02:00
mdtrooper c3ab1371e1 Fixed the networkmap for the enterprise dashboard. 2016-05-03 14:59:25 +02:00
mdtrooper 78f044dbf5 Some fixes. 2016-04-26 15:03:53 +02:00
mdtrooper 87f7425467 The longest function networkmap_generate_dot is divided in two functions. 2016-04-25 15:17:15 +02:00
mdtrooper 5e79358952 Fixed the policies networkmaps. 2016-04-20 14:55:53 +02:00
mdtrooper b4b3cc720d Fixed the networkmaps new for the policies. 2016-04-18 19:16:26 +02:00