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

647 Commits

Author SHA1 Message Date
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Maya c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Jose Gonzalez e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
Jose Gonzalez 2521b32f13 WIP: Backup upload 2021-02-08 16:33:54 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop' 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
 2020-12-24 10:30:01 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +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 ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop' 
fix check install meta

See merge request artica/pandorafms!3666
 2020-12-22 13:48:13 +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
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
fbsanchez 7c298ae0a8 minor fixes 2020-12-01 17:19:34 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop' 
fixed bad module id reference

See merge request artica/pandorafms!3505
 2020-12-01 11:55:56 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b9c2db9825 fix check install meta 2020-11-27 13:21:14 +01:00
fbsanchez a419c2ec46 Minor fix avoid notice 2020-11-25 20:16:30 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez 2718558b29 Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop' 
Ent 6398 poner ojito mostrar passwords

Closes pandora_enterprise#6398

See merge request artica/pandorafms!3488
 2020-11-23 16:17:35 +01:00
Luis 6931e15dd2 Fixed url with blakspace on pagination 2020-11-23 10:40:28 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
 2020-11-19 15:21:58 +01:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop' 
mc search nodes

See merge request artica/pandorafms!3463
 2020-09-18 14:37:10 +02:00
fbsanchez 90c7de86a3 RC1 filtering, ordering and pagination in node list view (MC) 2020-09-17 11:42:53 +02:00
fbsanchez 19831f833c more accurate fix 2020-09-14 17:59:41 +02:00
fbsanchez adafaa4db2 Applying date format from configuration to date specification 2020-09-14 17:56:09 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop' 
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
 2020-08-05 11:51:01 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
Luis Calvo 4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00