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

204 Commits

Author SHA1 Message Date
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez ad1ede437c Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop' 
changes in treeview

See merge request artica/pandorafms!3654
 2020-12-22 13:02:17 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
fbsanchez b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
fbsanchez a313f00755 First steps VC network link 2020-10-09 12:45:10 +02:00
fbsanchez 4394a8cf6a wip discovery.cloud.gcp 2020-09-22 16:55:46 +02:00
fbsanchez 23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
 2020-06-22 14:06:13 +02:00
Daniel Rodriguez 30ce7fbc97 Merge branch 'ent-5726-Colors-severity-Eventos' into 'develop' 
fixed bad constants

See merge request artica/pandorafms!3246
 2020-06-22 11:20:59 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
alejandro-campos 6866beef52 fixed bad constants 2020-05-26 17:44:38 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
fbsanchez 17eae7d97f updates 2020-03-19 18:33:04 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Luis Calvo c2e608f120 Added cont for module status alert triggered 2020-03-04 12:09:54 +01:00
Tatiana Llorente c21682145c Changed value for constants 1year, 2years, 3years 2020-01-15 10:37:05 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
Tatiana Llorente 38b3490e4e Changed color of constant to severity minor in events 2019-10-24 17:42:27 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez cab4a6dc03 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 17:28:14 +02:00
Alejandro Fraguas 26c606b0d5 Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop' 
Added more parameters to SAML configuration

See merge request artica/pandorafms!2506
 2019-07-09 13:18:12 +02:00
fbsanchez 0e3fd848f7 minor fixes and visual change in azure credentials 2019-07-04 19:34:03 +02:00
fbsanchez 07edee619a CS filtering and constant 2019-07-03 16:38:26 +02:00
alejandro-campos 2a69e3a75e Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2 2019-06-26 18:06:23 +02:00
fbsanchez c5675ded4c fixed alert color 2019-06-25 15:24:42 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
alejandro-campos f74b32fe3c Added more parameters to SAML configuration 2019-06-14 10:34:51 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
manuel bac1e44608 Removed autofill proxi in auth server 
Former-commit-id: 448622c39e6697ead1a3a515da3e573abfc0384d
 2019-04-16 12:37:06 +02:00
fbsanchez 798a2aad16 WIP discovery F3 
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
 2019-04-03 18:13:19 +02:00