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 |