enriquecd
09d712d1ab
Not blink separatos points in visual console digital clock - #2026
2018-03-28 18:42:59 +02:00
enriquecd
87ed7f9cf7
Not blick separator points in visual console digital clock - #2026
2018-03-28 17:30:31 +02:00
enriquecd
8d39ae54fa
Filter by not init agents and modules in tree view - #1454
2018-03-28 17:07:57 +02:00
artica
94936a46e9
Auto-updated build strings.
2018-03-28 00:01:22 +02:00
fermin831
4d78b28d17
[Secondary Groups] Fixed grouped agents events in node
2018-03-27 17:53:11 +02:00
fermin831
e3341c98ce
[Secondary Groups] Fixed agent graph agent status
2018-03-27 17:02:41 +02:00
fermin831
88375a2460
[Secondary groups] Fixed some problems in agent view
2018-03-27 16:38:17 +02:00
danielmaya
8b3ec8146d
Fixed target and source undefined
2018-03-27 16:36:26 +02:00
vgilc
985a7eec97
Merge branch '2110-EXT-5521-Error-al-subir-colecciones-2' into 'develop'
...
Fix api collection function include - #2110
See merge request artica/pandorafms!1395
2018-03-27 08:41:55 +02:00
artica
ac2638ceea
Auto-updated build strings.
2018-03-27 00:01:22 +02:00
enriquecd
9bb7ba475e
Fix api collection function include - #2110
2018-03-26 18:34:52 +02:00
fermin831
c96b883614
[Secondary groups] Fixed agent view to include secondary agents
2018-03-26 12:52:37 +02:00
danielmaya
e83c3bb5aa
Added tmetaconsole_agent in function agents_get_alias
2018-03-26 12:03:25 +02:00
artica
999edad737
Auto-updated build strings.
2018-03-26 00:01:20 +02:00
artica
b2ed2fbe45
Auto-updated build strings.
2018-03-25 00:01:20 +01:00
artica
c91e71569c
Auto-updated build strings.
2018-03-24 00:01:24 +01:00
vgilc
4371551a1b
Merge branch '2096-shorten_labels_in_hbars' into 'develop'
...
Fixed label shortener in hbar
See merge request artica/pandorafms!1385
2018-03-23 11:18:54 +01:00
fbsanchez
526bd5f8c5
Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars
2018-03-23 11:08:48 +01:00
daniel
f750d0f49e
fixed errors in reports interfaces metaconsole
2018-03-23 08:00:32 +01:00
artica
dd59704729
Auto-updated build strings.
2018-03-23 00:01:21 +01:00
enriquecd
078b370cbd
Hide passwords fields data in treeview and events - #2030
2018-03-22 13:10:25 +01:00
enriquecd
dcb33e08b7
Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente
...
Conflicts:
pandora_server/util/pandora_manage.pl
2018-03-22 11:11:01 +01:00
vgilc
9e276aa8a2
Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop'
...
Not blink separator dots for digital clocks - #2026
See merge request artica/pandorafms!1356
2018-03-22 10:04:04 +01:00
vgilc
7f30b63e98
Merge branch 'ent-2045-5325-Bug-Descripcion-MIBS' into 'develop'
...
[SNMP] Fixed translation of custom mibs, added custom description data and…
See merge request artica/pandorafms!1375
2018-03-22 10:03:16 +01:00
vgilc
9e72b6c190
Merge branch '2067-Informe_de_SLA_muestra_datos_en_not_init_al_inicio_del_grafico' into 'develop'
...
fixed errors detected SLA
See merge request artica/pandorafms!1377
2018-03-22 10:02:46 +01:00
vgilc
6b49624bc9
Merge branch 'ent-1965-5340-Bug-Visualizacion-elementos-Consola-Visual' into 'develop'
...
[Visual Console] Changed simple select by group select in restricted group…
See merge request artica/pandorafms!1369
2018-03-22 09:58:37 +01:00
vgilc
f8d58cbe1f
Merge branch 'ent-1971-error-en-validacion-de-alertas' into 'develop'
...
[Alerts view] Fixed validation in alerts view
See merge request artica/pandorafms!1371
2018-03-22 09:57:58 +01:00
vgilc
9e4d8e12b3
Merge branch 'ent-1978-5343-Bugs-SQL-Graphs-Custom-Reports' into 'develop'
...
[Pie charts] Adding more space in legend
See merge request artica/pandorafms!1366
2018-03-22 09:57:28 +01:00
artica
243e24e56e
Auto-updated build strings.
2018-03-22 00:01:23 +01:00
enriquecd
d21ca7eb5f
Add API cluster functions - #2007
2018-03-21 18:20:59 +01:00
fbsanchez
835e791ef1
Fixed label shortener in hbar
2018-03-21 13:40:15 +01:00
artica
199b81a79c
Auto-updated build strings.
2018-03-21 00:01:22 +01:00
fermin831
2cc1f04ced
[Secondary groups] Modified configure user to manage secondary groups
2018-03-20 16:51:41 +01:00
artica
972e394a8e
Auto-updated build strings.
2018-03-20 00:01:22 +01:00
enriquecd
8690aa908a
Cluster monitoring 2 - #2007
2018-03-19 10:05:29 +01:00
artica
25efa085ce
Auto-updated build strings.
2018-03-19 00:01:29 +01:00
artica
c4ddcc9332
Auto-updated build strings.
2018-03-18 00:01:21 +01:00
artica
ea5ef0bc42
Auto-updated build strings.
2018-03-17 00:01:23 +01:00
daniel
d881e0028d
fixed errors detected SLA
2018-03-16 12:03:51 +01:00
artica
a17c7c3e34
Auto-updated build strings.
2018-03-16 00:01:21 +01:00
fermin831
1001240cf4
[SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details
2018-03-15 16:03:46 +01:00
fermin831
e9932daf19
[Tree view] Substitute items by groups
2018-03-15 12:06:07 +01:00
artica
270a43fbeb
Auto-updated build strings.
2018-03-15 00:01:23 +01:00
fermin831
a8cb366508
[Alerts view] Fixed validation in alerts view
2018-03-14 17:24:34 +01:00
enriquecd
2663cc1be5
Translations 720 - #1670
2018-03-14 13:59:44 +01:00
fermin831
690ad81a62
[Visual Console] Changed simple select by group select in restricted group advanced fieldin static graph
2018-03-14 13:31:54 +01:00
artica
fb56ebfbff
Auto-updated build strings.
2018-03-14 00:01:25 +01:00
fermin831
d38df88c79
[Pie charts] Adding more space in legend
2018-03-13 19:07:31 +01:00
vgilc
8af4272152
Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop'
...
1923 migrar agentes desde metaconsola
See merge request artica/pandorafms!1364
2018-03-13 17:47:52 +01:00
danielmaya
9fa26f9fcb
Changes in networkmap_links_to_js_links
2018-03-13 16:40:49 +01:00
daniel
a3dceac0a0
Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola
2018-03-13 16:00:44 +01:00
artica
af5d70bd7d
Updated version and build strings.
2018-03-13 11:06:33 +01:00
artica
24ff4014ff
Auto-updated build strings.
2018-03-13 00:01:27 +01:00
daniel
c8118c2e08
fixed minor error
2018-03-12 19:31:24 +01:00
fermin831
74f899736f
[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work
2018-03-12 15:17:59 +01:00
daniel
2fdc520a36
Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola
2018-03-12 13:07:34 +01:00
artica
a66a7fde49
Auto-updated build strings.
2018-03-12 00:01:29 +01:00
artica
6235fc381a
Auto-updated build strings.
2018-03-11 00:01:29 +01:00
artica
4af8841c29
Auto-updated build strings.
2018-03-10 00:01:37 +01:00
danielmaya
64b62edd90
Fixed shorten axis units
2018-03-09 10:18:02 +01:00
artica
5a13db5a18
Auto-updated build strings.
2018-03-09 00:01:42 +01:00
artica
f3f0d7771c
Updated version and build strings.
2018-03-08 12:26:57 +01:00
daniel
1f3b95f6d1
check problems migration
2018-03-08 12:09:03 +01:00
enriquecd
97bcaec720
Not blink separator dots for digital clocks - #2026
2018-03-08 11:58:31 +01:00
artica
05fab2100d
Updated version and build strings.
2018-03-08 09:47:20 +01:00
artica
89da7843ee
Auto-updated build strings.
2018-03-08 00:01:34 +01:00
vgilc
5335b69b61
Merge branch '1776-3833-no-aparecen-eventos-en-la-aplicacion-de-android-v6' into 'pandora_6.0'
...
Resolve "[ #3833 ] No aparecen Eventos en la aplicación de android v6"
See merge request artica/pandorafms!1352
(cherry picked from commit 6b7a22e47c
)
c7e7ea1e
Removed unwanted output from the api.php responses
2018-03-07 16:54:18 +01:00
artica
a0eff331c5
Auto-updated build strings.
2018-03-07 00:01:39 +01:00
enriquecd
80fb004c96
Fix visual console list groups filter - #2011
2018-03-06 17:07:02 +01:00
artica
98b2aa2c8e
Auto-updated build strings.
2018-03-06 00:01:36 +01:00
artica
a01d65fb89
Auto-updated build strings.
2018-03-05 00:01:32 +01:00
artica
5db4a03117
Auto-updated build strings.
2018-03-04 00:01:30 +01:00
artica
a3c3b1c699
Auto-updated build strings.
2018-03-03 00:01:43 +01:00
fermin831
28755d90a0
[Tree View] Fixed snapshot preview in metaconsole
2018-03-02 10:58:37 +01:00
vgilc
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
fermin831
d7cbcd012f
[SQL Graph reports] Added dynamic height configuration option
2018-03-02 09:27:29 +01:00
artica
6f04665c72
Auto-updated build strings.
2018-03-02 00:01:32 +01:00
fermin831
52e6503018
[Vertical Bar Charts] Fixed strpos check
2018-03-01 17:07:55 +01:00
fermin831
b6688dda1c
[SQL charts reports] Added top n report to set the maximum number of elements
2018-03-01 16:49:50 +01:00
fermin831
4719742ba2
[Pie Charts] Maximized the number of elements
2018-03-01 13:19:58 +01:00
fermin831
287d28de4e
[Vertical Bar Charts] Preserve order after truncate label
2018-03-01 13:16:36 +01:00
fermin831
3359870c2f
[SQL Charts] Added limit elements and some improves
2018-03-01 13:11:11 +01:00
fermin831
98b57ef642
[SQL charts] Added breadcrumbs to sql charts
2018-03-01 12:41:17 +01:00
fermin831
d0bf68888e
[SQL charts] Fixed SQL vertical chart
2018-03-01 12:02:08 +01:00
vgilc
bb313fc6c6
Merge branch '1844-Fixed-header-pisa-el-contenido-de-la-página' into 'develop'
...
Change fixed header and fixed menu positions - #1844
See merge request artica/pandorafms!1328
2018-03-01 09:24:42 +01:00
vgilc
6e601cf298
Merge branch 'ent-1900-Pagina-de-ayuda-de-Macros-alertas' into 'develop'
...
[Console help] Fixed and revisted alert macros
See merge request artica/pandorafms!1329
2018-03-01 09:23:52 +01:00
artica
ddbe016266
Auto-updated build strings.
2018-03-01 00:01:47 +01:00
fermin831
6c6c9625fc
[Console help] Fixed and revisted alert macros
2018-02-28 19:22:31 +01:00
enriquecd
18f3020785
Change fixed header and fixed menu positions - #1844
2018-02-28 19:02:54 +01:00
vgilc
5ef9e08770
Merge branch '1908-No-se-muestran-correctamente-las-gráficas-en-valores-con-decimales-dev' into 'develop'
...
Fixed graph precision
See merge request artica/pandorafms!1327
2018-02-28 15:59:17 +01:00
vgilc
9fb5341dd0
Merge branch '1868-Cluster-Filtrar-lista-y-creador-de-clusters-partir-de-los-grupos-accesibles-por-el-usuario' into 'develop'
...
Filter clusters by groups - #1868
See merge request artica/pandorafms!1326
2018-02-28 15:56:21 +01:00
danielmaya
9d36887a02
Fixed graph precision
2018-02-28 14:33:22 +01:00
enriquecd
8fce51a816
Filter clusters by groups - #1868
2018-02-28 14:32:35 +01:00
fermin831
e37768097f
[Visual] Refixed help images on node
2018-02-28 12:16:43 +01:00
fermin831
6093f6a0d8
[Metaconsole] Fixed img broken links on metaconsole
2018-02-28 12:08:15 +01:00
vgilc
99d5da9dd3
Merge branch 'ent-1695-carrefour-pandora-fms-console-metaconsole-tree-view-conteo-de-los-elementos' into 'develop'
...
[Console Tree view] Added counter
See merge request artica/pandorafms!1321
2018-02-28 10:35:35 +01:00
vgilc
b9f09f0f4f
Merge branch 'ent-1768-4966-Se-ven-grupos-vacios-en-el-tree-view-cuando-tienen-parent' into 'develop'
...
[Console Tree view] Removed empty childs
See merge request artica/pandorafms!1320
2018-02-28 10:34:52 +01:00
vgilc
9f026a0b77
Merge branch '1988-Bug-Últimos-eventos-en-Vista-táctica-dev' into 'develop'
...
Fixed list of latest events in tactical view
See merge request artica/pandorafms!1323
2018-02-28 10:32:23 +01:00
danielmaya
7c5756a726
Fixed list of latest events in tactical view
2018-02-28 10:15:32 +01:00
artica
789f908b08
Auto-updated build strings.
2018-02-28 00:01:39 +01:00
fermin831
80ecb6f366
[Console Tree view] Added counter
2018-02-27 11:46:28 +01:00
fermin831
3fc010135b
[Console Tree view] Removed empty childs
2018-02-27 11:04:49 +01:00
vgilc
85bc975606
Merge branch '1962-No-aparecen-las-alertas-en-la-vista-de-agente-dev' into 'develop'
...
Fixed tags in alert list
See merge request artica/pandorafms!1318
2018-02-27 09:39:46 +01:00
artica
892d17f65c
Auto-updated build strings.
2018-02-27 00:02:10 +01:00
enriquecd
3ee2f8615f
API and CLI apply template components - #983
2018-02-26 19:10:53 +01:00
danielmaya
25bed4d5c2
Fixed tags in alert list
2018-02-26 13:42:28 +01:00
fermin831
37dfdc9021
[Console Enterprise ACL] Added graph view to Reporting->Custom Graphs text name
2018-02-26 11:15:11 +01:00
vgilc
7be55b4427
Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop'
...
Add new fileds to massive module edition - #1735
See merge request artica/pandorafms!1295
2018-02-26 10:42:55 +01:00
vgilc
362194c042
Merge branch 'ent-1875-no-se-pueden-borrar-macros-de-plugins-(server)' into 'develop'
...
[Console Plugins][Console Recon Scripts] Fixed deletion macro
See merge request artica/pandorafms!1312
2018-02-26 10:38:50 +01:00
vgilc
2313c4165e
Merge branch '1933-TMB-eventos-varios' into 'develop'
...
Fixed permission checks in event_acl
See merge request artica/pandorafms!1303
2018-02-26 10:32:17 +01:00
vgilc
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
vgilc
1c56f18dd8
Merge branch '1921-Informe-de-tipo-Datos-Históricos-no-devuelve-info-de-base-de-datos-histórico-dev' into 'develop'
...
Fixed connection to historical db
See merge request artica/pandorafms!1305
2018-02-26 10:12:36 +01:00
fermin831
058bdbe0d9
[Console] Fixed function users_can_manage_group_all
2018-02-26 10:12:14 +01:00
artica
4b9dd69a0f
Auto-updated build strings.
2018-02-26 00:01:52 +01:00
artica
6eb5f20d17
Auto-updated build strings.
2018-02-25 00:02:06 +01:00
artica
4dae0c97c0
Auto-updated build strings.
2018-02-24 00:01:59 +01:00
artica
effe16a275
Auto-updated build strings.
2018-02-23 00:01:27 +01:00
fermin831
cef3cb2ae0
[Console Plugins][Console Recon Scripts] Fixed deletion macro
2018-02-22 16:13:25 +01:00
artica
e752e26ee3
Auto-updated build strings.
2018-02-22 00:01:52 +01:00
vgilc
3b94629f8f
Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-final' into 'develop'
...
Change visual console digital clock colors - #1403
See merge request artica/pandorafms!1307
2018-02-20 09:55:50 +01:00
artica
cc088314b8
Auto-updated build strings.
2018-02-20 00:01:14 +01:00
enriquecd
9a525f3b2e
Change visual console digital clock colors - #1403
2018-02-19 19:17:53 +01:00
danielmaya
17586472c8
Fixed connection to historical db
2018-02-19 12:04:02 +01:00
fbsanchez
49f1ad38e7
Event ACL check: Fix case multiple tags
2018-02-19 11:44:35 +01:00
fbsanchez
33089f2ff2
Minor fix in sql query
2018-02-19 11:34:07 +01:00
artica
87ffae2d88
Auto-updated build strings.
2018-02-19 00:01:12 +01:00
artica
fe1b911f02
Auto-updated build strings.
2018-02-18 00:01:12 +01:00
artica
5e6bcd34d8
Auto-updated build strings.
2018-02-17 00:01:14 +01:00
fbsanchez
407fbf450f
Fixed permission checks in event_acl
...
Added event response macro _group_custom_id_
2018-02-16 15:09:37 +01:00
artica
12ef611493
Auto-updated build strings.
2018-02-16 00:01:13 +01:00
fbsanchez
df0480d12a
Fixed dbuncompress short unknown events
2018-02-15 11:19:44 +01:00
vgilc
e83201c457
Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop'
...
Change cluster view design - #1877
See merge request artica/pandorafms!1301
2018-02-15 09:42:46 +01:00
artica
d90c6ef778
Auto-updated build strings.
2018-02-15 00:01:13 +01:00
enriquecd
b51dc73cd6
Change cluster view design - #1877
2018-02-14 18:37:27 +01:00
danielmaya
a0c01ed57d
Added safe_output for password in ldap
2018-02-14 10:57:08 +01:00
vgilc
ef3ec1238a
Merge branch '1867-errores-en-vista-de-eventos-con-usuario-con-tags-tmb' into 'develop'
...
Fix avoid unexistent tag in tevent acl check
See merge request artica/pandorafms!1297
2018-02-14 08:49:14 +01:00
artica
4fbf0820a4
Auto-updated build strings.
2018-02-14 00:01:13 +01:00
fbsanchez
92287916eb
Fix avoid unexistent tag in tevent acl check
2018-02-13 16:48:36 +01:00
enriquecd
7f7916a18d
Add new fileds to massive module edition - #1735
2018-02-13 12:29:55 +01:00
artica
77392c70fc
Updated version and build strings.
2018-02-13 11:51:11 +01:00
artica
ab10cec7ba
Auto-updated build strings.
2018-02-13 00:01:13 +01:00
daniel
b419f71e7c
fixed error in acl combined profile
2018-02-12 16:10:29 +01:00
daniel
fabe14b7ea
fixed error acl
2018-02-12 12:38:28 +01:00
vgilc
8c7c3b2c09
Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop'
...
fixed error show events
See merge request artica/pandorafms!1287
2018-02-12 08:52:04 +01:00
artica
be4509cbf1
Auto-updated build strings.
2018-02-10 00:01:14 +01:00
daniel
74a8212032
fixed error show events
2018-02-09 14:20:49 +01:00
artica
a6451d01e2
Auto-updated build strings.
2018-02-09 00:01:15 +01:00
daniel
3e0edcfda8
fixed errors in automatic combined graph meta with TIP
2018-02-08 17:07:54 +01:00
vgilc
a5a6371270
Merge branch '1782-Esos-mapas-dev' into 'develop'
...
Fixed colour bug in interface link
See merge request artica/pandorafms!1283
2018-02-08 16:27:54 +01:00
danielmaya
eb38025b19
Fixed colour bug in interface link
2018-02-08 16:20:29 +01:00
fbsanchez
571ed36276
Fixed image handle in data view
2018-02-08 14:17:08 +01:00
artica
4aab64be3d
Auto-updated build strings.
2018-02-08 00:01:15 +01:00
enriquecd
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
vgilc
9531984eac
Merge branch '1748-Sistema-de-gestión-de-Clusters' into 'develop'
...
1748 sistema de gestión de clusters
See merge request artica/pandorafms!1279
2018-02-07 15:41:29 +01:00
enriquecd
ae471bb9f2
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
2018-02-07 13:52:44 +01:00
enriquecd
6851af5943
Show correct info in visual console static graphs tooltips - #1634
2018-02-07 12:46:29 +01:00
artica
520e968500
Auto-updated build strings.
2018-02-07 00:01:14 +01:00
enriquecd
5c0f0de1e4
Add module critical instructions when create an event - #1862
2018-02-06 16:01:32 +01:00
vgilc
26de4f6517
Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop'
...
Fixed module definition help and add autodisable mode to bulk operations
See merge request artica/pandorafms!1129
2018-02-06 12:17:14 +01:00
fermin831
d625652f9a
Removed unwanted git merge traces (sorry)
2018-02-06 12:06:21 +01:00
fermin831
378186cadf
Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode
...
Conflicts:
pandora_console/include/help/en/help_module_definition.php
pandora_console/include/help/es/help_module_definition.php
pandora_console/include/help/ja/help_module_definition.php
2018-02-06 12:01:33 +01:00
vgilc
fe4b1da1e3
Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop'
...
Make help and support links in login page customizables - #1709
See merge request artica/pandorafms!1201
2018-02-06 11:57:23 +01:00
vgilc
ae9db8bfd8
Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop'
...
Change system audit log extended info to table format with change info - #1571
See merge request artica/pandorafms!1115
2018-02-06 11:56:48 +01:00
enriquecd
ab24c3bf80
Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-02-06 10:46:59 +01:00
enriquecd
bf1ad29b6b
Merge branch 'develop' into 1699-Ordenar-alfabéticamente-los-grupos-de-agentes
...
Conflicts:
pandora_console/include/functions_users.php
2018-02-06 10:43:33 +01:00
vgilc
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
danielmaya
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
artica
be5adb4635
Auto-updated build strings.
2018-02-06 00:01:13 +01:00
vgilc
48b6dc56fd
Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop'
...
Show all alerts when select all tags filter - #1676
See merge request artica/pandorafms!1271
2018-02-05 15:57:40 +01:00
vgilc
ce43dd91d8
Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop'
...
Added _event_description_ in help_alert_macros.php
See merge request artica/pandorafms!1110
2018-02-05 15:42:14 +01:00
enriquecd
064a9d58b9
Show all alerts when select all tags filter - #1676
2018-02-05 15:30:28 +01:00
danielmaya
da8c1e4f46
resolved conflicts
2018-02-05 09:41:27 +01:00
artica
b819f76c58
Auto-updated build strings.
2018-02-05 00:01:13 +01:00
artica
084bea27cc
Auto-updated build strings.
2018-02-04 00:01:13 +01:00
artica
0614e5a492
Auto-updated build strings.
2018-02-03 00:01:14 +01:00
enriquecd
d59289db62
Change builder style - #1748
2018-02-02 14:56:33 +01:00
enriquecd
47f0a90cab
Show not init monitors - #1748
2018-02-02 14:10:03 +01:00
enriquecd
768e6e605f
Fix bugs - #1748
2018-02-02 13:05:36 +01:00
artica
3c6e71dbed
Auto-updated build strings.
2018-02-02 00:01:18 +01:00
enriquecd
e1669ded9d
Change branch to enterprise - #1748
2018-02-01 11:35:23 +01:00
artica
0d944f0322
Auto-updated build strings.
2018-02-01 00:01:13 +01:00
vgilc
3cad7be4a5
Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop'
...
Modified users_get_groups
See merge request artica/pandorafms!1244
2018-01-31 15:15:50 +01:00
enriquecd
f9edfcb893
finalized Wizard, new styles, editor mode - #1748
2018-01-31 14:42:37 +01:00
artica
3235215547
Auto-updated build strings.
2018-01-31 00:01:14 +01:00
daniel
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
daniel
ad0b463d13
fixed errors acl
2018-01-30 17:44:51 +01:00
enriquecd
b07021f6bc
Merge branch 'clusters' of https://192.168.50.5:8081/artica/pandorafms into clusters
2018-01-30 17:40:21 +01:00
enriquecd
2b446a681d
Popup when click modules in cluster view, new images, filter modules - #1748
2018-01-30 17:38:29 +01:00
danielmaya
f3e44b0c09
Updated visual style in clustermap
2018-01-30 13:48:11 +01:00
artica
2065207661
Auto-updated build strings.
2018-01-30 00:01:14 +01:00
vgilc
e29b8f86bd
Merge branch 'add-japanese-help' into 'develop'
...
Update Japanese help
See merge request artica/pandorafms!1254
2018-01-29 17:31:23 +01:00
danielmaya
13884a44d6
Added clustermap
2018-01-29 16:48:21 +01:00
vgilc
7b20e43141
Merge branch '1746-Mejora-visual-en-el-popup-de-warning-en-el-header-dev' into 'develop'
...
Fixed messages in warning popup
See merge request artica/pandorafms!1227
2018-01-29 13:36:06 +01:00
vgilc
b0fc04c8f3
Merge branch '1751-Posición-de-los-agentes-en-el-mapa-de-red-dev' into 'develop'
...
Fixed raw_text in networkmap
See merge request artica/pandorafms!1238
2018-01-29 13:35:20 +01:00
vgilc
d9825c08b5
Merge branch '1660-WUX-stats-charts-dev' into 'develop'
...
Fixed jquery error
See merge request artica/pandorafms!1151
2018-01-29 13:31:19 +01:00
vgilc
61ce7237c3
Merge branch '1688-Error-en-API-al-habilitar-alertas' into 'develop'
...
Add new function enable alert by alias - #1688
See merge request artica/pandorafms!1177
2018-01-29 13:25:54 +01:00
vgilc
2e486ffac0
Merge branch '1727-Gráficas-horizontales-texto' into 'develop'
...
Fix hbar grpahs label - #1727
See merge request artica/pandorafms!1246
2018-01-29 13:25:04 +01:00
vgilc
482204b525
Merge branch '1734-No-se-pueden-ver-opciones-avanzadas-en-módulos-generic_data_string' into 'develop'
...
Fix advanced options toggle for data string modules - #1734
See merge request artica/pandorafms!1237
2018-01-29 13:24:37 +01:00
vgilc
d82ce632bd
Merge branch '1740-Iconos-de-grupos-aumentan-de-tamaño-en-consola-visuales-de-meta' into 'develop'
...
Fix group elements size in editor mode for metaconsole when set to 0px - #1740
See merge request artica/pandorafms!1241
2018-01-29 13:23:11 +01:00
vgilc
862242bf00
Merge branch '1782-Fallo-en-enlaces-de-nodos-en-mapas-de-red-dev' into 'develop'
...
Fixed colour link and delete link
See merge request artica/pandorafms!1258
2018-01-29 13:19:27 +01:00