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

1441 Commits

Author SHA1 Message Date
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
Daniel Rodriguez 4bf47eaa35 Merge branch 'ent-7145-boton-de-borrado-de-items-desplazado-en-lista-de-informes' into 'develop' 
fixed position

See merge request artica/pandorafms!3909
 2021-03-16 16:47:54 +00:00
Daniel Rodriguez 9e2d774d8f Merge branch 'ent-7148-estilos-rotos-en-varios-botones-de-custom-graphs-de-informes' into 'develop' 
fixed visual style error

See merge request artica/pandorafms!3905
 2021-03-16 16:47:26 +00:00
marcos bd4cad3c83 fixed position 2021-03-15 16:28:30 +01:00
marcos 95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +01:00
marcos 09e94bd0e9 resolved merge conflict 2021-03-15 11:43:36 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
 2021-03-11 17:47:27 +01:00
Daniel Rodriguez 16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop' 
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
 2021-03-11 14:40:24 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel 54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop' 
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
 2021-03-01 15:28:18 +00:00
Daniel Rodriguez 2ef8bc2178 Merge branch 'ent-6877-Aumentar-el-limite-de-caracteres-de-la-etiqueta-en-contenedore-de-Gráficas' into 'develop' 
Ent 6877 aumentar el limite de caracteres de la etiqueta en contenedore de gráficas

See merge request artica/pandorafms!3791
 2021-03-01 12:24:17 +00:00
Daniel Rodriguez f74b73cbb5 Merge branch 'ent-6492-Tokens-que-no-corresponden-en-el-item-SQL-Query-de-informes' into 'develop' 
Fix item sql query remove fields

See merge request artica/pandorafms!3690
 2021-03-01 10:52:28 +00:00
Daniel Rodriguez c37d883efe Merge branch 'ent-6874-macros-no-se-sustituyen-listado-informes' into 'develop' 
Added macros to reports items list

See merge request artica/pandorafms!3740
 2021-03-01 10:20:54 +00:00
Daniel Barbero Martin 6e3a3a1d38 Fixed error reports sla selected modules in metaconsole 2021-02-18 14:09:23 +01:00
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
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Daniel Maya 693a58ef69 Fixed label size 2021-01-21 15:39:29 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
fbsanchez 6e910f9a68 group select style consistency 2021-01-11 13:09:33 +01:00
fbsanchez b102d42793 minor fix - group containers must be rebuilt... 2021-01-11 13:09:09 +01:00
fbsanchez f38ea57c5f group selector updates for report, required 2021-01-08 17:15:23 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
Luis Calvo 92f57e6176 Added macros to reports items list 2020-12-23 13:43:54 +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 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +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
Daniel Barbero Martin d3a3a74ceb Fix item sql query remove fields 2020-12-03 10:31:25 +01:00
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop' 
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
 2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop' 
Report macros now apply on showing report

See merge request artica/pandorafms!3460
 2020-11-30 17:25:22 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
daniel ff37a43035 fix errors metaconsole, report group settings 2020-11-30 14:27:13 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin e30506a21e fix select agents builder inventory reports 2020-11-24 16:48:12 +01:00
marcos b42cb5a30f Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-11-24 08:59:44 +01:00
marcos 5978e46141 add toolkit on sql query report item editor 2020-11-23 13:29:35 +01:00
Daniel Barbero Martin b7d4144904 fix remove debug 2020-11-18 17:37:33 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
Daniel Barbero Martin f1080757a0 Fix combo server in reports builder 2020-10-30 13:30:59 +01:00
fbsanchez 326d1dac49 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-10-30 10:38:30 +01:00
fbsanchez 8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
Daniel Rodriguez d5a57156dc Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop' 
Fix continous reload page cased by automatic form submit

See merge request artica/pandorafms!3561
 2020-10-29 13:22:10 +01:00
Daniel Rodriguez 8144d3bc95 Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop' 
Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
 2020-10-29 12:40:43 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
fbsanchez 6112b3e932 minor fix 2020-10-29 10:55:07 +01:00
Luis Calvo f3de0540fc Fix continous reload page cased by automatic form submit 2020-10-22 19:56:13 +02:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Barbero Martin 73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
fbsanchez 4babcbe647 Forced recursion while selecting All group - group_alert_report 2020-10-20 18:25:04 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop' 
Group selection improvement

See merge request artica/pandorafms!3450
 2020-10-05 13:11:23 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
 2020-09-30 18:38:27 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
Daniel Rodriguez 4880cbd29b Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop' 
Ent 6134 cambio visual en checkbox de informes

See merge request artica/pandorafms!3448
 2020-09-23 14:07:07 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop' 
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
 2020-09-17 15:14:33 +02:00
Daniel Rodriguez 536e24d09e Merge branch 'ent-6288-No-se-puede-generar-Log-Report-item-en-informes' into 'develop' 
fix agents selector check

See merge request artica/pandorafms!3433
 2020-09-17 12:45:36 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Daniel Rodriguez 81cdfdbaa1 Merge branch 'ent-6289-Item-import-text-from-url-tiene-que-ser-items-de-la-ruta-de-consola-si-no-falla' into 'develop' 
added warning message

See merge request artica/pandorafms!3442
 2020-09-16 13:32:37 +02:00
alejandro-campos 8a6920a973 minor change 2020-09-16 11:43:53 +02:00
Luis Calvo fae8070e29 Report macros now apply on showing report 2020-09-15 19:57:52 +02:00
manuel.montes 4b531a96c2 Changed checkbox switch 2020-09-10 17:48:07 +02:00
alejandro-campos 77496bd5a2 added warning message 2020-09-09 09:35:21 +02:00
alejandro-campos c4e192f7f7 fix agents selector check 2020-09-04 13:54:07 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop' 
Fixed report sendmail success message

See merge request artica/pandorafms!3353
 2020-08-07 09:37:10 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
Daniel Rodriguez 100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop' 
Fixed error link builder in VC

See merge request artica/pandorafms!3275
 2020-07-16 12:11:51 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
Luis Calvo 76d724321f Fixed report sendmail success message 2020-07-03 14:18:30 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
Daniel Rodriguez 146879ee8d Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop' 
Fixed errors filter search with pagination

See merge request artica/pandorafms!3226
 2020-06-15 08:29:14 +02:00
Daniel Barbero Martin 44b2c59572 Fixed error link builder in VC 2020-06-05 11:01:00 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Daniel Barbero Martin a73ec18867 Fixed errors filter search with pagination 2020-05-21 09:13:39 +02:00
Tatiana Llorente c8e492b194 Moved creation button to right side in visual maps - #5404 2020-03-02 11:41:54 +01:00
Daniel Barbero Martin 10972a2364 Fix bug icon builder view not legacy mode 2020-02-13 08:45:25 +01:00
Daniel Rodriguez 5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop' 
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
 2020-02-11 15:39:26 +01:00
Manuel Montes 4f14921e85 Fixed bug in reports 2020-02-10 11:40:33 +01:00
Daniel Barbero Martin 0dabab11cf Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/install.php
 2020-01-27 16:19:32 +01:00
Daniel Rodriguez 28392b71ef Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop' 
availability failover

See merge request artica/pandorafms!3015
 2020-01-27 10:48:50 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
vgilc 69d9051339 Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop' 
Fixed visual bug in grouped report item

See merge request artica/pandorafms!2992
 2020-01-22 12:20:05 +01:00
Daniel Maya c68f83f013 availability failover 2020-01-15 17:16:46 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Luis db49db3711 report font not depending of custom report front enabled 2020-01-13 18:21:48 +01:00
Daniel Maya 49e03f5e44 Fixed XSS vulnerability 2020-01-13 11:29:18 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Rodriguez 997d1e46e5 Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop' 
Added hint

See merge request artica/pandorafms!2904
 2020-01-07 09:26:11 +01:00