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
Daniel Barbero Martin
5e008e684d
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2020-01-02 17:45:52 +01:00
Alejandro Fraguas
ec950b199e
Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop'
...
Ent 4488 añadir confirmacion al borrado de consolas visuales
See merge request artica/pandorafms!2859
2019-12-26 13:42:28 +01:00
manuel
3f09d13941
Fixed visual bug in grouped report item
2019-12-24 10:25:32 +01:00
Alejandro Fraguas
c91290f062
Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop'
...
Changed title name or description in items table of reports
See merge request artica/pandorafms!2875
2019-12-23 17:13:39 +01:00
Alejandro Fraguas
fa34170e34
Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop'
...
Fixed bug in inventory item
See merge request artica/pandorafms!2975
2019-12-23 10:23:21 +01:00
Alejandro Fraguas
69159d158d
Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop'
...
Ent 1786 rango de tiempo en container graphs
See merge request artica/pandorafms!2931
2019-12-23 10:18:39 +01:00
manuel
9e88c1c2c2
Fixed bug in inventory item
2019-12-18 17:00:14 +01:00
Daniel Barbero
d77d50bb74
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-12-17 08:26:04 +01:00
Daniel Maya
8bde504fc2
Fixed item sql
2019-12-16 15:50:21 +01:00
Daniel Barbero
319b3e604f
Merge remote-tracking branch 'origin' into new-vc-line-element
2019-12-13 08:15:23 +01:00
Manuel Montes
a2162948b4
Fixed minor bugs in metaconsole reports
2019-12-12 18:12:42 +01:00
Daniel Barbero
63dd3c48f8
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
Manuel Montes
7ea61b7424
Added controls on report items
2019-12-12 09:11:15 +01:00
daniel
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
vgilc
1e0818786b
Merge branch 'ent-4652-ajustar-posicion-del-label-el-item-imagen-estatica-de-consolas-visuales' into 'develop'
...
Adjusted margin on static image item
See merge request artica/pandorafms!2895
2019-12-10 11:56:06 +01:00
Tatiana Llorente
fecd2c74b5
Added button to refresh graph in container graphs
2019-12-03 13:00:59 +01:00
Jose Gonzalez
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
daniel
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
manuel
e4ba7ccde0
Added hint
2019-11-21 12:06:00 +01:00
manuel
fe1e7da0ed
Adjusted margin on static image item
2019-11-18 17:36:16 +01:00
Tatiana Llorente
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
manuel
ea83ee1292
Fixed bug in prediction report item 4740
2019-11-08 12:06:06 +01:00
Tatiana Llorente
90d567a064
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
...
Conflicts:
pandora_console/godmode/reporting/graphs.php
2019-11-06 17:48:51 +01:00
Daniel Rodriguez
dd86598298
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
...
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
2019-11-05 16:43:52 +01:00
Tatiana Llorente
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
Tatiana Llorente
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
manuel
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
manuel
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
manuel
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
Marcos Alconada
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
marcos
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
Daniel Rodriguez
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
Daniel Rodriguez
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
marcos
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
manuel
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
Tatiana Llorente
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
Daniel Rodriguez
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
Daniel Rodriguez
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
Alejandro Fraguas
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
Tatiana Llorente
380ce879ef
Added io_safe_output to custom graphs name - #4664
2019-10-02 10:59:40 +02:00
marcos.alconada
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
marcos.alconada
e363b17476
When an item is updated, it is redirected to the item lists
2019-09-25 10:51:02 +02:00
Daniel Barbero Martin
cd5fd4782c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/visual-console-client/vc.main.css
2019-09-24 13:20:25 +02:00
Luis Calvo
37fd876a22
Fixed bug
2019-09-19 10:31:54 +02:00
Daniel Barbero Martin
0c59c89d8f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-19 09:35:52 +02:00
Daniel Rodriguez
c81cb1d222
Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop'
...
Ent 3878 report type summation not working properly
See merge request artica/pandorafms!2599
2019-09-18 14:41:35 +02:00
Luis Calvo
0b8ff69a36
Fixed modules first load on edit agent/module item report
2019-09-16 12:57:37 +02:00
Luis Calvo
a04268b33c
Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly
2019-09-16 11:02:18 +02:00
Luis
daa70f84db
Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.item_editor.php
2019-09-16 10:09:52 +02:00
Manuel Montes
90c94e74d9
Fixed bug in list graphs view
2019-09-09 21:02:53 +02:00
manuel
e4d014923b
Fixed visual bug in item names from report template
2019-09-05 10:44:18 +02:00
Daniel Rodriguez
20cc562911
Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop'
...
Fixed bug in report deletions
See merge request artica/pandorafms!2362
2019-09-02 13:18:20 +02:00
Daniel Rodriguez
ab5ad9a459
Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop'
...
fixed error
See merge request artica/pandorafms!2665
2019-08-30 14:12:42 +02:00
Daniel Rodriguez
f292780aa2
Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop'
...
Added item type text to list of items- #4377
See merge request artica/pandorafms!2652
2019-08-30 14:11:18 +02:00
manuel
ce4f4f003d
Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-08-30 09:30:11 +02:00
Daniel Barbero Martin
ee1eed93b4
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-08-21 07:58:08 +02:00
marcos.alconada
e83f001948
fixed error
2019-08-16 13:47:06 +02:00
Tatiana Llorente
b893d55a49
Added item type text to list of items- #4377
2019-08-09 12:09:49 +02:00
Tatiana Llorente
8bfde74a06
Show alias instead of name - #4389
2019-08-09 11:06:17 +02:00
Daniel Rodriguez
c97074ea74
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
...
fixed macros reports
See merge request artica/pandorafms!2595
2019-07-17 13:49:38 +02:00
Daniel Rodriguez
e69024f4e2
Merge branch 'ent-4267-edicion-text-informes' into 'develop'
...
Solved wrong variable rewriting
See merge request artica/pandorafms!2553
2019-07-16 10:10:53 +02:00
Daniel Rodriguez
81c4bd1a76
Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop'
...
Ent 3333 etiquetas a los items en el builder de consolas visuales
See merge request artica/pandorafms!2344
2019-07-15 14:12:16 +02:00
Luis Calvo
ef9502a552
Fixed errors on sum report uncompressed checkbox
2019-07-15 11:56:57 +02:00
Daniel Barbero Martin
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
Luis Calvo
a1e2693d4b
Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly
2019-07-12 11:33:27 +02:00
Luis Calvo
41d8afaeea
added summation report uncompressed module cehckbox
2019-07-12 11:32:56 +02:00
Daniel Barbero
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
Tatiana Llorente
f701bcb44e
Fixed several minor visual bugs - #4347
2019-07-11 17:00:50 +02:00
Daniel Barbero Martin
ed0688f853
fixed macros reports
2019-07-10 18:20:43 +02:00
Daniel Rodriguez
f864573486
Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop'
...
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias
See merge request artica/pandorafms!2577
2019-07-10 09:33:41 +02:00
Daniel Maya
aafba795ee
Update visual console
2019-07-08 17:51:01 +02:00
Daniel Barbero
7175d716f0
fixed translate
2019-07-05 10:32:10 +02:00
Alejandro Fraguas
d269f3b69c
Merge branch 'ent-3714-Eliminar-opciones-template-y-wizard-en-la-visual-console-open' into 'develop'
...
Hidden buttons template and wizard in the open visual console
See merge request artica/pandorafms!2264
2019-07-04 17:10:05 +02:00
Daniel Barbero
209681e4c2
ADD failover option availability_graph
2019-07-02 11:50:58 +02:00
Daniel Barbero Martin
0064bc0cba
fixed errors
2019-07-01 17:07:39 +02:00
Alejandro Fraguas
eb94438c7f
Merge branch 'ent-3541-7513-nuevo-modificar-informe-de-eventos-por-grupo' into 'develop'
...
Show new filters for group events reports
See merge request artica/pandorafms!2534
2019-07-01 12:38:48 +02:00
Jose Gonzalez
a2877b46f3
Solved wrong variable rewriting
2019-06-27 14:58:57 +02:00
Daniel Rodriguez
321ea717af
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
...
Changed js
See merge request artica/pandorafms!2544
2019-06-26 13:02:50 +02:00
marcos.alconada
c223e0bdad
Changed js
2019-06-26 12:50:19 +02:00
marcos.alconada
006e0cd4ec
Changed js
2019-06-26 12:31:47 +02:00
marcos.alconada
280459dc1a
Show new filters for group events reports
2019-06-24 17:28:46 +02:00
fbsanchez
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
Alejandro Fraguas
10b337f713
Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop'
...
Add javascript for insert name to reports
See merge request artica/pandorafms!2424
2019-06-18 13:53:52 +02:00
Daniel Rodriguez
4362bf3131
Merge branch 'ent-3429-event-report-options-saving' into 'develop'
...
Added missing options parameters
See merge request artica/pandorafms!2173
2019-06-14 13:19:43 +02:00
Daniel Rodriguez
5c7b45173b
Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop'
...
fix bug in item edition in metaconsole
See merge request artica/pandorafms!2500
2019-06-14 13:05:27 +02:00
alejandro-campos
8554baef20
fix bug in item edition in metaconsole
2019-06-13 11:11:39 +02:00
fbsanchez
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
marcos.alconada
c1d1c23a4f
Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph
2019-06-12 12:37:52 +02:00
marcos.alconada
608f079ca0
now you need put an agent or visual console, else you cant create or update a Static Grap
2019-06-12 12:36:56 +02:00
Alejandro Campos
cc9a7553bc
Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
Luis Calvo
c6d1bb6533
Fixed fields not saving in event reports
2019-06-06 10:33:46 +02:00
Luis Calvo
3475684cdc
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-05 09:36:57 +02:00
fbsanchez
c741020538
styles review
2019-06-04 13:57:55 +02:00
fbsanchez
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
fbsanchez
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
fbsanchez
88b0802472
style review
2019-06-03 10:46:52 +02:00
fbsanchez
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
Alejandro Fraguas
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
fbsanchez
8c0bfd72a8
avoid icon overlap report view lsit
2019-05-29 16:52:38 +02:00
fbsanchez
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
fbsanchez
4a42756ec6
group_management styles profiles
2019-05-29 15:44:51 +02:00
Alejandro Gallardo Escobar
f5d5cbf5b8
VC item cache improvements.
...
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
2019-05-28 18:34:07 +02:00
Alejandro Gallardo Escobar
ce8ba54e09
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
2019-05-27 11:31:24 +02:00
manuel
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
Alejandro Fraguas
f5586d7b70
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
...
fixed label reports and more fixed
See merge request artica/pandorafms!2413
2019-05-24 10:47:15 +02:00
Daniel Barbero Martin
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
Daniel Rodriguez
7c236149b0
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
...
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
2019-05-23 17:18:00 +02:00
Daniel Maya
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
manuel
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
Daniel Maya
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
Daniel Maya
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
Daniel Rodriguez
0173c856af
Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop'
...
Changed simple quote in alerts
See merge request artica/pandorafms!2419
Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
2019-05-16 12:17:22 +02:00
marcos.alconada
8f2dce439b
Add javascript for insert name to reports
...
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
2019-05-16 12:13:58 +02:00
marcos.alconada
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
Daniel Maya
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
manuel
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
Daniel Barbero Martin
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
Daniel Maya
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
manuel
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
Daniel Maya
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
manuel
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
Daniel Barbero
eb64dbae86
add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item
...
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
2019-05-03 14:16:26 +02:00
Daniel Barbero
db4cfaf1b7
fixed errors reporting_builder.php
...
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
2019-05-03 12:11:20 +02:00
Daniel Barbero
9b9d2a3647
fixed errors reporting_builder.item_editor.php
...
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
2019-05-03 10:39:29 +02:00
Alejandro Gallardo Escobar
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
Daniel Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
manuel
68b69d66c4
Fixed bug in report deletions
...
Former-commit-id: 1ef6173b079d88316c248f1f3cdaa47290ed6212
2019-04-17 09:07:12 +02:00
Alejandro Gallardo Escobar
d5b83b867b
Visual Console Refactor: bugfix
...
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
Tatiana Llorente
c33a2cfaf6
Change arrow images to sort the table in custom reports - #3707
...
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
Tatiana Llorente
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
marcos.alconada
550eb3cd3e
change name label from visual_console_builder.elements.php
...
Former-commit-id: 71201d54200624452c4dd75231894d4cd4e29031
2019-04-08 15:30:07 +02:00
Tatiana Llorente
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
manuel
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
manuel
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
Tatiana Llorente
9fe8dcdda3
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
Tatiana Llorente
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Daniel Rodriguez
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
Tatiana Llorente
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
Luis Calvo
d890d25574
Fixed db query bug
...
Former-commit-id: 4eef9808433009c2725956103b4338f70bfe1403
2019-03-26 15:57:54 +01:00
fermin831
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
fermin831
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
manuel
6121c2a32b
Added types reports to send email
...
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +01:00
marcos.alconada
2cfaec43ac
Quito condicion sobrante
...
Former-commit-id: e0504cd9721593f0131b4a88ef65ce3b90818176
2019-03-19 15:41:51 +01:00
marcos.alconada
e5c5d1a0f1
Solucionado pantalla en blanco
...
Former-commit-id: 3bea690502a76bad50ba074f5da9db57978e9535
2019-03-19 14:49:03 +01:00
samucarc
0863c2ffd6
Hidden buttons template and wizard in the open visual console
...
Former-commit-id: 42796373226cf112f1abda8b54a780b1546f46c3
2019-03-15 11:51:39 +01:00
Fermin
c2c8287d3e
Fixed resolution in netflow reports
...
Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70
2019-03-13 20:15:53 +01:00
alejandro-campos
610aeee3aa
Fix bug in report massive deletion
...
Former-commit-id: f3ebaed0f9a8530c0a81cc1655021d89e4234459
2019-03-12 13:18:29 +01:00
alejandro-campos
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
fbsanchez
ab453fde68
WIP: event extended reports
...
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
manuel
de827c12e3
Fixed javascript error
...
Former-commit-id: 581d6f4604ed5b4af7bd68424d2d5769df56c5bf
2019-02-27 09:28:56 +01:00
manuel
c6ef2ad120
Fixed bug in items reports deleted
...
Former-commit-id: 4781be9487437f8f2e608aaea88e5f9f321ac4d1
2019-02-26 16:51:15 +01:00
fermin831
4930968ec9
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/godmode/reporting/reporting_builder.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/functions_reports.php
Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
2019-02-21 17:21:42 +01:00
Daniel Rodriguez
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
manuel
af2954d392
Changed controls in static graph vs
...
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
2019-02-20 11:46:32 +01:00
Daniel Rodriguez
0352ef2b70
Merge branch '3141-SQL-query-a-la-propia-metaconsola' into 'develop'
...
fix metaconsole sql items creation
See merge request artica/pandorafms!2097
Former-commit-id: a2efa5704837d09eec24f144eb0fcc5b922b856a
2019-02-19 18:08:14 +01:00
daniel
cf79f54a48
fixed minor error
...
Former-commit-id: ffde6120127e31865553a8b06f91b3f0938a164c
2019-02-19 15:07:07 +01:00
Alejandro Gallardo Escobar
9f6a96675e
Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog
...
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
2019-02-18 17:34:24 +01:00
daniel
e00ae31862
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0
2019-02-18 13:16:43 +01:00
daniel
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
alejandro-campos
46de260573
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
...
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
2019-02-15 15:55:31 +01:00
alejandro-campos
337b846f48
Merge branch 'develop' into 3141-SQL-query-a-la-propia-metaconsola
...
Former-commit-id: 16a42b43088f8f99b9c33fe05a53f220598b2135
2019-02-15 15:35:57 +01:00
Luis Calvo
15f4f2ec77
Added missing options parameters
...
Former-commit-id: 7232a12ea2b4609e2727051b7779aaaf96479060
2019-02-15 11:28:40 +01:00
samucarc
f2f0578582
Fixed conflict
...
Former-commit-id: 9f2981e43d0ffc6f90c532c985944b32a82f6c3e
2019-02-07 17:59:55 +01:00