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
fecd2c74b5
Added button to refresh graph in container graphs
2019-12-03 13:00:59 +01:00
d181d5357b
Created function for initialize TinyMCE
2019-11-26 13:19:28 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
e4ba7ccde0
Added hint
2019-11-21 12:06:00 +01:00
fe1e7da0ed
Adjusted margin on static image item
2019-11-18 17:36:16 +01:00
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
ea83ee1292
Fixed bug in prediction report item 4740
2019-11-08 12:06:06 +01:00
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
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
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
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
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
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
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
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
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
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
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
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
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
380ce879ef
Added io_safe_output to custom graphs name - #4664
2019-10-02 10:59:40 +02:00
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
e363b17476
When an item is updated, it is redirected to the item lists
2019-09-25 10:51:02 +02:00
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
37fd876a22
Fixed bug
2019-09-19 10:31:54 +02:00
0c59c89d8f
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-09-19 09:35:52 +02:00
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
0b8ff69a36
Fixed modules first load on edit agent/module item report
2019-09-16 12:57:37 +02:00
a04268b33c
Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly
2019-09-16 11:02:18 +02:00
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
90c94e74d9
Fixed bug in list graphs view
2019-09-09 21:02:53 +02:00
e4d014923b
Fixed visual bug in item names from report template
2019-09-05 10:44:18 +02:00
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
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
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
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
ee1eed93b4
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-08-21 07:58:08 +02:00
e83f001948
fixed error
2019-08-16 13:47:06 +02:00
b893d55a49
Added item type text to list of items- #4377
2019-08-09 12:09:49 +02:00
8bfde74a06
Show alias instead of name - #4389
2019-08-09 11:06:17 +02:00
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
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
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
ef9502a552
Fixed errors on sum report uncompressed checkbox
2019-07-15 11:56:57 +02:00
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
a1e2693d4b
Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly
2019-07-12 11:33:27 +02:00
41d8afaeea
added summation report uncompressed module cehckbox
2019-07-12 11:32:56 +02:00
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
f701bcb44e
Fixed several minor visual bugs - #4347
2019-07-11 17:00:50 +02:00
ed0688f853
fixed macros reports
2019-07-10 18:20:43 +02:00
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
aafba795ee
Update visual console
2019-07-08 17:51:01 +02:00
7175d716f0
fixed translate
2019-07-05 10:32:10 +02:00
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
209681e4c2
ADD failover option availability_graph
2019-07-02 11:50:58 +02:00
0064bc0cba
fixed errors
2019-07-01 17:07:39 +02:00
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
a2877b46f3
Solved wrong variable rewriting
2019-06-27 14:58:57 +02:00
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
c223e0bdad
Changed js
2019-06-26 12:50:19 +02:00
006e0cd4ec
Changed js
2019-06-26 12:31:47 +02:00
280459dc1a
Show new filters for group events reports
2019-06-24 17:28:46 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
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
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
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
8554baef20
fix bug in item edition in metaconsole
2019-06-13 11:11:39 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
c1d1c23a4f
Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph
2019-06-12 12:37:52 +02:00
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
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
c6d1bb6533
Fixed fields not saving in event reports
2019-06-06 10:33:46 +02:00
3475684cdc
Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving
2019-06-05 09:36:57 +02:00
c741020538
styles review
2019-06-04 13:57:55 +02:00
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
88b0802472
style review
2019-06-03 10:46:52 +02:00
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
bc279e99b0
Merge branch 'fix/styles' into 'develop'
...
Fix/styles
See merge request artica/pandorafms!2461
2019-05-29 18:31:43 +02:00
8c0bfd72a8
avoid icon overlap report view lsit
2019-05-29 16:52:38 +02:00
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
4a42756ec6
group_management styles profiles
2019-05-29 15:44:51 +02:00
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
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
0319e4d4e6
Removed empty help icons
2019-05-24 11:11:30 +02:00
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
1386a44e07
fixed errors label report
2019-05-23 17:52:28 +02:00
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
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
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
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
f1705af9f6
Fixed error window in visual console
...
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
2019-05-16 16:04:38 +02:00
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
8f2dce439b
Add javascript for insert name to reports
...
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
2019-05-16 12:13:58 +02:00
0e99b750b4
New branch without trash files
...
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
2019-05-14 18:15:23 +02:00
b508e40a73
Changed simple quote in alerts
...
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
2019-05-14 11:11:27 +02:00
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
e981edfa89
fixed label reports and more fixed
...
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
dab12ecdc5
Fixed error window in visual console
...
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
2019-05-09 15:06:03 +02:00
143def5d87
Added helps
2019-05-09 13:43:53 +02:00
c2b8ad22d3
Added cache_expiration in builder items
2019-05-09 12:44:58 +02:00
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
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
db4cfaf1b7
fixed errors reporting_builder.php
...
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
2019-05-03 12:11:20 +02:00
9b9d2a3647
fixed errors reporting_builder.item_editor.php
...
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
2019-05-03 10:39:29 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
68b69d66c4
Fixed bug in report deletions
...
Former-commit-id: 1ef6173b079d88316c248f1f3cdaa47290ed6212
2019-04-17 09:07:12 +02:00
d5b83b867b
Visual Console Refactor: bugfix
...
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
c33a2cfaf6
Change arrow images to sort the table in custom reports - #3707
...
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
550eb3cd3e
change name label from visual_console_builder.elements.php
...
Former-commit-id: 71201d54200624452c4dd75231894d4cd4e29031
2019-04-08 15:30:07 +02:00
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
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
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
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
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
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
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
d890d25574
Fixed db query bug
...
Former-commit-id: 4eef9808433009c2725956103b4338f70bfe1403
2019-03-26 15:57:54 +01:00
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
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
6121c2a32b
Added types reports to send email
...
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +01:00
2cfaec43ac
Quito condicion sobrante
...
Former-commit-id: e0504cd9721593f0131b4a88ef65ce3b90818176
2019-03-19 15:41:51 +01:00
e5c5d1a0f1
Solucionado pantalla en blanco
...
Former-commit-id: 3bea690502a76bad50ba074f5da9db57978e9535
2019-03-19 14:49:03 +01:00
0863c2ffd6
Hidden buttons template and wizard in the open visual console
...
Former-commit-id: 42796373226cf112f1abda8b54a780b1546f46c3
2019-03-15 11:51:39 +01:00
c2c8287d3e
Fixed resolution in netflow reports
...
Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70
2019-03-13 20:15:53 +01:00
610aeee3aa
Fix bug in report massive deletion
...
Former-commit-id: f3ebaed0f9a8530c0a81cc1655021d89e4234459
2019-03-12 13:18:29 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
ab453fde68
WIP: event extended reports
...
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
de827c12e3
Fixed javascript error
...
Former-commit-id: 581d6f4604ed5b4af7bd68424d2d5769df56c5bf
2019-02-27 09:28:56 +01:00
c6ef2ad120
Fixed bug in items reports deleted
...
Former-commit-id: 4781be9487437f8f2e608aaea88e5f9f321ac4d1
2019-02-26 16:51:15 +01:00
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
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
af2954d392
Changed controls in static graph vs
...
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
2019-02-20 11:46:32 +01:00
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
cf79f54a48
fixed minor error
...
Former-commit-id: ffde6120127e31865553a8b06f91b3f0938a164c
2019-02-19 15:07:07 +01:00
9f6a96675e
Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog
...
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
2019-02-18 17:34:24 +01:00
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
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
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
337b846f48
Merge branch 'develop' into 3141-SQL-query-a-la-propia-metaconsola
...
Former-commit-id: 16a42b43088f8f99b9c33fe05a53f220598b2135
2019-02-15 15:35:57 +01:00
15f4f2ec77
Added missing options parameters
...
Former-commit-id: 7232a12ea2b4609e2727051b7779aaaf96479060
2019-02-15 11:28:40 +01:00
f2f0578582
Fixed conflict
...
Former-commit-id: 9f2981e43d0ffc6f90c532c985944b32a82f6c3e
2019-02-07 17:59:55 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
775ebfe1d2
Created dummy Network Traffic Top N report
...
Former-commit-id: 7515d84dd40cc5ef9f50a2922e8a8a8fa5049eeb
2019-01-29 11:24:02 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
f14acf12d2
Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
...
Be able to change the subject and body of the report message when necessary
See merge request artica/pandorafms!1925
Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
439f1db620
Fixed link in cron job and visual console manager
...
Former-commit-id: 6533fcc628157231c7bd524d878c144faac02447
2019-01-09 18:11:21 +01:00
471c01a4c5
fixed bad link to node in metaconsole's custom graph item editor
...
Former-commit-id: 22fb4302de980d8b3e16fb90d087b71c218598a1
2019-01-09 10:20:17 +01:00
0ec0af6e6e
Merge branch '2980-Ajuste-de-dimensiones-en-custom-graph' into 'develop'
...
Removed the adjustment of dimensions in custom graph
See merge request artica/pandorafms!1946
Former-commit-id: ee5fe8d83c851b2ade8d8b4c6966a23116716d24
2018-12-21 10:26:47 +01:00
2a407bb494
Merge branch '3253-Error_en_automatic_combined_graph_en_meta_con_varios_nodos' into 'develop'
...
fixed autocombined report metaconsole
See merge request artica/pandorafms!2077
Former-commit-id: 130262742f8bac0441b4b8285dc62bb0d3aa998a
2018-12-21 10:22:21 +01:00
f60b55ac2b
fix metaconsole sql items creation
...
Former-commit-id: 68e45006b53599e3f59322fe08cf5a93df747c32
2018-12-19 13:14:09 +01:00
e6049870f7
Fixed validations and changed alert by dialog
...
Former-commit-id: 4c38c7f665cd328708bca48f997794b9a8586840
2018-12-18 12:52:01 +01:00
f2f88579fa
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Added a pending translation
See merge request artica/pandorafms!2083
Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
2018-12-14 10:21:40 +01:00
d76612b247
Minor fix
...
Former-commit-id: 80d3a5ae66a68ea249d4afe571862b01bc71db78
2018-12-13 17:11:38 +01:00
6839559eb5
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Error fixes and metaconsole support for the color cloud item of the VC
See merge request artica/pandorafms!2082
Former-commit-id: 445dbc16ce84f22ffb1d379c8539b7ec35c9e478
2018-12-13 15:42:48 +01:00
06a68d01be
Error fixes and metaconsole support for the color cloud item of the VC
...
Former-commit-id: 01b0045b76c41dc2c0f3145631fbd0beae3b16df
2018-12-13 15:36:01 +01:00
1b4cd37d5f
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Add the Color Cloud item to the Visual Console
See merge request artica/pandorafms!2075
Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
2018-12-12 17:43:39 +01:00
358532c4a8
fixed autocombined report metaconsole
...
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
5d52e9f9c3
Minor fix
...
Former-commit-id: e9827e1294a995fc13deb42d701ea103cf9ad1da
2018-12-12 09:41:52 +01:00
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
e3243883f0
Fixed static graph without images creation and update previsualization
...
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +01:00
0af861f5b9
fix visual console's percentile item: label color not showing and removed label from view menu
...
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
2018-12-05 16:25:46 +01:00
111ae09928
Merge branch '2722-Labels-en-visual-console' into 'develop'
...
fixed labels not showing for percentile item in visual console builder
See merge request artica/pandorafms!2019
2018-11-30 13:27:15 +01:00
bf66319d90
Merge branch '2907-TIP-para-Query-History-DataBase' into 'develop'
...
Tip added - #2907
See merge request artica/pandorafms!1884
2018-11-30 13:09:15 +01:00
9bdd1af488
fixed errors in visual console
2018-11-29 13:24:12 +01:00
d48c228855
fixed label not showing on page reload in visual console's percentile item
2018-11-27 15:25:16 +01:00
a00c10a136
Merge branch '2166-Hide-not-init-agents-2' into 'develop'
...
removed hide not init modules from sla and availability report
See merge request artica/pandorafms!1976
2018-11-15 17:20:00 +01:00
a1846a6e22
removed hide not init modules from sla and availability report
2018-11-15 12:00:25 +01:00
60212dae50
fixed errors cv
2018-11-14 16:38:44 +01:00
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
1d8a746329
Removed the adjustment of dimensions in custom graph
2018-11-08 09:49:36 +01:00
5c99a8138f
fixed minor error
2018-11-07 17:16:25 +01:00
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
0f3717a268
Be able to change the subject and body of the report message when necessary
2018-11-02 12:57:52 +01:00
78a1c72eac
fixed warnings php7
2018-10-30 17:38:46 +01:00
e03f56f0d7
Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'
...
2429 resaltar elementos al pasar por encima o marcar
See merge request artica/pandorafms!1762
2018-10-29 09:17:54 +01:00
9aed441246
Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop'
...
Changed custom graph item insertion and deletion to fix bug when sorting elements in list
See merge request artica/pandorafms!1782
2018-10-25 13:20:30 +02:00
8dde77fb0e
Tip added - #2907
2018-10-23 15:42:01 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
9ee64b4894
Fixed report agent/module
2018-10-17 08:44:51 +02:00
392d4e7aad
Fixed lost id_agent in visual console
2018-10-15 15:05:47 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
f952d5c70e
tags_get_acl_tags revision
2018-10-08 17:45:26 +02:00
1278f03fd9
[Tags performance] agents_get_modules misc checks
2018-10-04 19:08:01 +02:00
7bd0615681
[Tags performace] Check visual consoles
2018-10-03 13:53:59 +02:00
46830a4cbe
Merge branch '2778-Mostrar-valor-numerico-en-el-tooltip-dev' into 'develop'
...
fixed issue with string data in visual map
See merge request artica/pandorafms!1811
2018-10-03 09:31:02 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
a7421fc385
Merge branch '1805_Campo_vacio_Informes_personalizados' into 'develop'
...
Added title in custom reports
See merge request artica/pandorafms!1632
2018-10-01 15:15:38 +02:00
896ba6051b
fixed issue with string data in visual map
2018-09-26 11:00:44 +02:00
3f046441f0
Changed custom graph item insertion and deletion to fix bug when sorting elements in list
2018-09-19 10:06:57 +02:00
e5ff2b956c
Bugfixes
2018-09-18 15:33:14 +02:00
d652a9c942
Created function that adds class checkselected and added inputs to select all in several tables - #2429
2018-09-13 16:07:40 +02:00
98b2907857
Bug fixes
2018-09-12 16:16:04 +02:00
40ff7b9042
Now is possible to link visual consoles from different nodes to the visual console elements
2018-09-10 11:25:44 +02:00
c20942f425
Now the status calculation can be configured for every visual console item
2018-09-05 15:25:19 +02:00
36247d391f
Merge branch 'develop' into ent-2588-service-like-visual-console-status
2018-09-04 17:25:23 +02:00
22696a0fc6
Added new modes to calculate the status of the linked visual maps
2018-09-04 17:23:42 +02:00
fd27b6d445
Fixed issue with timezone in visual console editor
2018-09-03 14:43:21 +02:00
5f4d76f3a7
fixed recursion option in custom report's item editor
2018-08-28 16:38:32 +02:00
8f329698d0
Vconsole templates, fixed permissions
2018-08-10 18:16:31 +02:00
c78ac2f4d5
fixed minor error
2018-08-02 13:07:40 +02:00
c3413bbf62
fixed minor error
2018-08-02 13:06:43 +02:00
9d5004efbf
fixed minor error
2018-08-02 11:07:22 +02:00
ef2ff49504
mv enterprise visual console template
2018-08-02 11:03:13 +02:00
d5f0429390
mv enterprise templates visual console
2018-08-02 10:57:00 +02:00
4968ff3878
Included library from enterprise
2018-08-02 10:07:47 +02:00
2a7e710b9e
fixed errors in template wizar visual console
2018-08-01 13:51:45 +02:00
62d2b509ad
fixed minor error
2018-08-01 13:21:04 +02:00
dc56e0712c
delete template visual console
2018-08-01 13:20:20 +02:00
49aeb349eb
create form templates visual console
2018-08-01 13:10:10 +02:00
92911e8fb8
fixed js wizard template visual console
2018-08-01 12:24:27 +02:00
333e5c874c
create template visual console
2018-08-01 11:52:20 +02:00
cb77a299bb
add templates console visual
2018-08-01 09:58:48 +02:00
2b11d8cd7c
Added title in custom reports
2018-07-25 13:48:02 +02:00
49ed21b93d
Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms3' into 'develop'
...
Reverse changes for non-administrators users
See merge request artica/pandorafms!1603
2018-07-09 08:54:03 +02:00
0d7acdc574
Reverse changes for non-administrators users
2018-07-06 12:02:34 +02:00
9f9728fd03
Reverse changes for non-administrators users
2018-07-06 10:22:57 +02:00
54a74c43d0
Remove the 'All Groups' option in non-administrators users
2018-07-03 13:11:00 +02:00
c0cd577fb4
Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop'
...
Fixed bug in pandorafms
See merge request artica/pandorafms!1523
2018-06-25 19:05:26 +02:00
053f037d0d
Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop'
...
Changed permission AW for VR in visual console
See merge request artica/pandorafms!1537
2018-06-25 19:01:21 +02:00
02822bcfd6
Deleted 'show in two columns' option
2018-06-22 13:36:38 +02:00
05d8d0ccf5
fixed errors graph
2018-06-13 19:13:42 +02:00
9af4b25f31
Changed permission AW for VR in visual console
2018-06-13 17:28:03 +02:00
9ecc770519
remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces
2018-06-13 11:02:58 +02:00
68ae6e3112
Always group All in custom reports and custom graphs
2018-06-12 13:06:42 +02:00
632fc26be2
Thermometer graph only for intracom - #2214
2018-06-12 12:39:05 +02:00
bcd937b1ba
Fixed bug in pandorafms
2018-06-11 17:42:12 +02:00
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
fac3e21829
Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone
2018-06-11 16:40:10 +02:00
badfd83b0d
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
dbb802fb31
Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop'
...
New graph thermometer - #2214
See merge request artica/pandorafms!1465
2018-06-04 10:19:21 +02:00
4abf3f3b2e
Merge branch '1976-Informe-de-log-dev' into 'develop'
...
Fixed sources in log report
See merge request artica/pandorafms!1508
2018-06-04 10:17:17 +02:00
04f117523b
Fixed sources in log report
2018-05-31 17:33:51 +02:00
836cce115d
Fixed ACL in custom graphs
2018-05-31 15:29:31 +02:00
3155fecbfe
Fixed ACL in reports created by another user in bit RM
2018-05-30 15:09:47 +02:00
061df6495c
Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports
2018-05-30 12:14:35 +02:00
dd57ddbd3c
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
358847ecef
[Rebranding] Open godmode/<others>
2018-05-10 15:43:46 +02:00
123d49d604
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
f758124531
fixed treshold graph
2018-05-10 08:43:09 +02:00
597e702e13
[Visual console] Removed show all advanced options in all elements and add its options to donut graphs
2018-05-08 18:50:14 +02:00
734c52d8bd
New graph thermometer - #2214
2018-05-04 11:13:26 +02:00
3a47c3a8fb
[Visual console] Update position when change advanced options
2018-04-17 19:08:30 +02:00
a190bd992b
[SLA] Modified availability SLA to include priority modes
2018-04-16 12:25:02 +02:00
9a55ee7d2a
[SLA] Added priority mode to report style (only interface)
2018-04-12 15:42:53 +02:00
5418bbd099
Fix reports made by wizard - #2098
2018-03-28 18:54:15 +02:00
0c3b6fbf83
[Visual console] Fixed icon preview
2018-03-14 10:25:27 +01:00
80fb004c96
Fix visual console list groups filter - #2011
2018-03-06 17:07:02 +01:00
af6f251995
[ACL] Now only RM can delete custom graphs
2018-03-02 13:14:48 +01:00
2b2c99cc42
Merge branch 'ent-1941-sql-charts' into 'develop'
...
Ent 1941 sql charts
See merge request artica/pandorafms!1331
2018-03-02 10:15:03 +01:00
d7cbcd012f
[SQL Graph reports] Added dynamic height configuration option
2018-03-02 09:27:29 +01:00
6e62f4c023
[SQL Graphs] Added Max items form to top_n_value db column
2018-03-01 15:55:58 +01:00
095a703c6c
Fix pagination in visual console list - #1994
2018-03-01 15:50:34 +01:00
38c6099664
Fix advanced options section in donut grpahs of visual consoles - #1899
2018-03-01 10:39:54 +01:00
3f7e6f7ed3
Merge branch 'ent-1964-5331-error-de-ACLs-en-custom-graphs' into 'develop'
...
Ent 1964 5331 error de ac ls en custom graphs
See merge request artica/pandorafms!1315
2018-02-26 10:31:22 +01:00
3b19d34bdc
pandora_console/godmode/reporting/create_container.php
2018-02-26 10:12:29 +01:00
a386fc9441
Fixed SQL report
2018-02-22 17:38:13 +01:00
a801ba4ac8
Fixed issue with copy and delete visual console
2018-02-13 11:40:43 +01:00
a04f941a55
Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
...
Conflicts:
pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
0f01fcbd20
Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop'
...
Added type graph selection in container graph
See merge request artica/pandorafms!1113
2018-02-06 09:55:36 +01:00
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
160daa836c
Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev'
...
# Conflicts:
# pandora_console/godmode/reporting/visual_console_builder.editor.js
2018-02-05 15:55:56 +01:00
0d0b7ada48
Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola
...
Conflicts:
pandora_console/include/functions_users.php
2018-01-30 17:56:30 +01:00
2a7bcb4bc2
Merge branch '1673-elemento-group-en-modo-show-statistics-no-muestra-cartel-dev' into 'develop'
...
Fixed group status icon
See merge request artica/pandorafms!1178
2018-01-29 13:30:10 +01:00
dc5840b844
Merge branch '1736-Consola-visual-Previsualización-background-no-carga-imagen-en-meta-dev' into 'develop'
...
Fixed background preimage in visual console
See merge request artica/pandorafms!1243
2018-01-29 13:23:46 +01:00
9d4521e5e5
Merge branch '1374-Nombre-predeterminado-para-custom-graphs-4597-com1' into 'develop'
...
Show graph name in custom graph items for report list - #1374
See merge request artica/pandorafms!1203
2018-01-29 12:59:22 +01:00
65615dcf80
Fixed error sql
2018-01-25 10:06:05 +01:00
06a33faec2
Fixed element size of type icon, group and static graph
2018-01-11 15:32:52 +01:00
638d7ced30
performance improvements in visual console list is called indiscriminately to the function get_acl
2018-01-11 15:25:55 +01:00
88cfb73a78
Fixed background preimage in visual console
2018-01-10 15:33:54 +01:00
4c908dd8ad
fixed minor error in visual console favourite
2018-01-08 17:43:31 +01:00
e2ee8a555d
add fullscale container graph
2018-01-03 15:53:49 +01:00
ead1161e0b
add fullscale combined and custom graph
2018-01-03 12:13:00 +01:00
0b5678fba6
add new funtionality view favourite console visual
2017-12-28 15:13:06 +01:00
8572bc61b3
Show graph name in custom graph items for report list - #1374
2017-12-21 13:33:01 +01:00
e5c4dc4778
Merge branch '1319-Unsuccessfull-action-open' into 'develop'
...
Check empty SLA fields on SLA wizar create form - #1319
See merge request artica/pandorafms!1096
2017-12-21 10:52:35 +01:00
097bc3df32
Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop'
...
Added resize functionality to flot graphs and fix overview in container graphs
See merge request artica/pandorafms!1068
2017-12-21 10:46:42 +01:00
7938f6e65e
Merge branch '1617-Consola-visual-Previsualización-background-no-carga-imagen' into 'develop'
...
Fix preload background image in visual console builder - #1617
See merge request artica/pandorafms!1090
2017-12-21 10:44:03 +01:00
4f0a451ba1
Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop'
...
1576 permisos sobre gráficas no permite ver graph containers 4863 media open
See merge request artica/pandorafms!1072
2017-12-21 08:59:36 +01:00
c98e94e59e
Merge branch '1626-Fallo-al-clonar-item-de-la-consola-visual-dev' into 'develop'
...
Fixed copy item in visual console
See merge request artica/pandorafms!1106
2017-12-21 08:56:17 +01:00
14d5bb04c1
Fixed group status icon
2017-12-13 17:10:05 +01:00
d0d0f8b229
Fix custom graph builder order bar - #1382
2017-12-13 13:08:41 +01:00
43e697a1cb
Added hint in field Add summatory series
2017-12-13 11:50:15 +01:00
61b33221bf
Added check modules and series
2017-12-13 10:37:23 +01:00
e01f00ac3d
code backup
2017-12-13 10:36:08 +01:00
521eb8f4cb
Add clocks to visual console - #1403
2017-12-01 12:14:56 +01:00
cf01084873
Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop'
...
Add order items setting bar to graph editor - #1382
See merge request artica/pandorafms!961
2017-11-30 13:12:25 +01:00
f49cef9ca4
Merge branch 'develop' into visual-console-agent-link-bug
...
Conflicts:
pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-29 14:00:44 +01:00
684658d81f
Merge branch '1409-Imágenes-en-consolas-visuales---enlace-publico-dev' into 'develop'
...
Changed convert_urls in tinymce
See merge request artica/pandorafms!931
2017-11-29 13:47:50 +01:00
897d7bf258
Added type graph selection in container graph
2017-11-23 18:01:32 +01:00
02d67835bd
Fixed copy item in visual console
2017-11-21 17:27:39 +01:00
cc737e5120
Check empty SLA fields on SLA wizar create form - #1319
2017-11-20 11:49:13 +01:00
69f44aae13
Fix preload background image in visual console builder - #1617
2017-11-17 12:28:52 +01:00
8fa2acfd2a
Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
02670bef03
Update visual_console_builder.editor.js
2017-11-15 16:05:34 +01:00
27e7a51006
Fix graph container permissions and graph acl - #1576
2017-11-15 11:31:17 +01:00
776aca90d6
Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/include/ajax/visual_console_builder.ajax.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
90b99c491a
Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
...
Added new system of calculate status if user set a parent weight
See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
78ef64ead2
Added resize functionality to flot graphs and fix overview in container graphs
2017-11-14 18:44:29 +01:00
274c551671
Added height to bars graph
2017-11-14 08:50:12 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
49df1e448a
Added changes from donut graph
2017-11-13 09:59:00 +01:00
110945bccf
Added the last change to load string modules
2017-11-13 09:35:24 +01:00
eb39d25c4b
Added field to get string modules
2017-11-10 15:03:52 +01:00
fac066debd
Added groups acl in all visual console elements
2017-11-08 15:01:44 +01:00
c9d1fab036
Added new system of calculate status if user set a parent weight
2017-11-08 12:49:03 +01:00
092c43bede
Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
...
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/include/ajax/visual_console_builder.ajax.php
pandora_console/include/functions_visual_map_editor.php
2017-11-08 10:27:44 +01:00
3de0e38c2d
Added color to resume data
2017-11-08 10:21:09 +01:00
b9b8b37abe
Added grid color to bars graph in visual console
2017-11-08 09:55:36 +01:00
7e6cc539e8
Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop'
...
Fixed problems with unit
See merge request artica/pandorafms!1027
2017-11-07 11:23:02 +01:00
47171418cd
Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop'
...
Modified simple value
See merge request artica/pandorafms!1026
2017-11-07 11:22:28 +01:00
31577a823c
Fixed problems with unit
2017-11-07 10:57:30 +01:00
94a9bcb85b
Modified simple value
2017-11-07 10:26:26 +01:00
2d87172558
Merge branch 'vulnerabilidad-en-consola' into 'develop'
...
Resolve: Vulnerabilidad en consola
See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00
f0fe30fc3a
Now can create static graphs a group items without images, fix bugs - #1407
2017-11-02 15:54:18 +01:00
594b6e9417
Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
...
1320 exportación csv saca entities dev
See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
a7e1e877e7
Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop'
...
654 cambios en informes de maximo minimo y media 4480 cherry
See merge request artica/pandorafms!994
2017-10-31 12:13:55 +01:00
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
4e672cc758
Merge branch '655-module_data_increment_new_type_of_report' into 'develop'
...
655 module data increment new type of report
See merge request artica/pandorafms!519
2017-10-31 08:18:26 +01:00
849eba10d4
[Console] Fixed a vulnerability into the 'fgraph.php' script
2017-10-30 18:03:09 +01:00
f608c686b8
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-30 17:23:59 +01:00
8163200f54
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
...
This reverts merge request !871
2017-10-30 16:11:58 +01:00
65ae5ed2eb
Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
...
Graph and table mode for max, min and avg reports and template reports - #654
See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
f4fc23cb64
Merge branch 'develop' into 1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2
...
Conflicts:
pandora_console/godmode/reporting/visual_console_builder.editor.js
2017-10-30 15:21:46 +01:00
9145811d29
Added final lost code
2017-10-27 10:40:58 +02:00
139db28eca
Added lost code
2017-10-26 16:13:27 +02:00
b96b50129c
Merge branch '1103-Opciones-copiar-cortar-pegar-editor-de-etiquetas-de-la-consola-visual' into 'develop'
...
Now the label editor color is changed by the mouse scroll - #1103
See merge request artica/pandorafms!802
2017-10-26 15:48:33 +02:00
eb99b0a885
Added lost code
2017-10-26 15:37:43 +02:00
802cb3ef5e
Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev
2017-10-26 14:41:07 +02:00
5a59f9e2a5
Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev
2017-10-26 14:20:35 +02:00
704511aa56
Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev
2017-10-26 13:40:01 +02:00
86b4fc433c
Merge branch '1388-Meter-un-par-de-saltos-de-tamaño-de-fuente-mas-elementos-consola-visual' into 'develop'
...
Add new font sizes for visual console - #1388
See merge request artica/pandorafms!874
2017-10-26 13:39:59 +02:00
e8a14b6981
Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
...
1416 new h and v bar charts in visual console dev
See merge request artica/pandorafms!956
2017-10-26 13:30:52 +02:00
c38546fa65
Merge branch '1386-Elemento-histograma-en-el-editor-se-ve-raro' into 'develop'
...
Change auto sla graphs size in visual console editor mode - #1386
See merge request artica/pandorafms!897
2017-10-26 11:19:23 +02:00
3ff14bb001
Merge branch '895-Borrado-masivo-de-informes-7' into 'develop'
...
Add multiple checkbox selector for report delete - #895
See merge request artica/pandorafms!596
2017-10-26 11:08:47 +02:00
f654bdd241
Merge branch '1113-Enumeración-recursiva-de-grupos-en-vista-agente-modulo-3805-media-open' into 'develop'
...
Add recursion group search for agent/module view and angent/module item in reports - #1113
See merge request artica/pandorafms!812
2017-10-26 11:07:46 +02:00
c0a690551b
Add order items setting bar to graph editor - #1382
2017-10-24 17:11:59 +02:00
5fa51ceb6b
Fixed element in meta
2017-10-24 09:24:07 +02:00
vgilc
Tatiana Llorente
Jose Gonzalez
daniel
manuel
Daniel Rodriguez
Marcos Alconada
Alejandro Fraguas
Luis Calvo
Manuel Montes
Daniel Maya
fbsanchez
alejandro-campos
Alejandro Gallardo Escobar
fermin831
samucarc
artica
Samuel Carcases
manuel.montes
slerena
enriquecd
nramon
Alejandro Gallardo Escobar
Enrique Camargo
Arturo Gonzalez