Daniel Rodriguez
|
492c7f90cf
|
Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
fixed error
See merge request artica/pandorafms!3321
|
2020-07-13 11:13:24 +02:00 |
marcos
|
1f4de3ee4d
|
ignore keys xss special days
|
2020-06-19 10:53:14 +02:00 |
|
marcos
|
40c0d4ea09
|
fixed error
|
2020-06-18 17:09:22 +02:00 |
|
marcos
|
9ddfde1774
|
fixed error with update event comments
|
2020-06-09 12:02:31 +02:00 |
|
marcos
|
cfe30d5b7d
|
fixed vulnerability on special days
|
2020-06-09 10:37:11 +02:00 |
fbsanchez
|
b3cf532c16
|
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
|
2020-05-29 12:30:49 +02:00 |
Manuel Montes
|
611291c217
|
Ent 5428 revision total de ayudas hint wiki
|
2020-05-29 11:37:06 +02:00 |
|
fbsanchez
|
f3d9f2d75e
|
Cluster view RC1
|
2020-05-22 13:13:19 +02:00 |
|
marcos
|
f229dada52
|
fixed minnnor error
|
2020-04-02 19:02:14 +02:00 |
Daniel Maya
|
c7e6f9fd34
|
Added disable event in alert template
|
2020-03-23 11:34:37 +01:00 |
Tatiana Llorente
|
8c86019037
|
Ent 5583 bug comando de alerta
|
2020-03-18 12:25:29 +01:00 |
|
Daniel Rodriguez
|
e1e76595a5
|
Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop'
Ent 5365 pestana de acciones de alertas sin paginacion
See merge request artica/pandorafms!3087
|
2020-03-16 17:19:32 +01:00 |
|
Daniel Maya
|
fc88d265d4
|
Added group filter in alert list
|
2020-03-16 15:42:10 +01:00 |
|
Tatiana Llorente
|
d799ac0739
|
Added pagination and filter box in alert actions - #5365
|
2020-03-02 16:17:45 +01:00 |
|
Tatiana Llorente
|
0980c9a74a
|
Ent 5261 cambio de control de intervalo en alertas
|
2020-01-16 13:50:39 +01:00 |
|
Tatiana Llorente
|
95600412e1
|
Minor visual changes in alert list
|
2020-01-14 13:14:09 +01:00 |
Alejandro Fraguas
|
7f61caaa15
|
Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop'
Ent 5034 bug al copiar acción de alerta
See merge request artica/pandorafms!2921
|
2019-12-23 10:51:10 +01:00 |
|
manuel
|
85f4301e4c
|
Fixed bugs in alert actions
|
2019-12-05 16:43:26 +01:00 |
vgilc
|
810fe8f860
|
Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'"
This reverts merge request !2886
|
2019-12-03 15:59:08 +01:00 |
|
vgilc
|
809628560b
|
Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'
Ent 4968 comandos de alerta con saltos de linea
See merge request artica/pandorafms!2886
|
2019-12-03 15:53:23 +01:00 |
|
Tatiana Llorente
|
0420a439d1
|
Send params to copy and delete action alert by post
|
2019-11-28 11:51:32 +01:00 |
|
Tatiana Llorente
|
9a17a02d61
|
Fixed bug with line breaks in alert commands
|
2019-11-14 12:29:02 +01:00 |
|
fbsanchez
|
65f5223698
|
validation alerts
|
2019-11-11 14:26:04 +01:00 |
|
Daniel Rodriguez
|
c5be8e55ae
|
Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
Ent 3807 html special chars conversion
See merge request artica/pandorafms!2320
|
2019-06-25 12:19:01 +02:00 |
|
fbsanchez
|
88b0802472
|
style review
|
2019-06-03 10:46:52 +02:00 |
|
manuel
|
bf3ac73feb
|
Removed empty help icons
|
2019-05-24 14:26:28 +02:00 |
|
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
Luis Calvo
|
0f35923073
|
Recovered event criticity field from event alert
Former-commit-id: e59764a9cf5eec411f6f5e28d306444273d9f89c
|
2019-05-16 13:23:47 +02:00 |
|
manuel
|
b89751e647
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
|
2019-05-14 11:50:07 +02:00 |
Alejandro Campos
|
9347fc17aa
|
Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta'
# Conflicts:
# pandora_console/extras/mr/28.sql
Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
|
2019-05-13 17:10:06 +02:00 |
|
manuel
|
20dace7de8
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
|
2019-05-13 16:20:12 +02:00 |
|
manuel
|
12c9952e4a
|
Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal
Conflicts:
pandora_console/extras/mr/28.sql
Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
|
2019-05-10 09:11:17 +02:00 |
|
Daniel Rodriguez
|
c775d0359c
|
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
|
2019-05-09 14:36:51 +02:00 |
|
marcos.alconada
|
fa14fa9510
|
Show new values after update
|
2019-05-07 17:47:47 +02:00 |
|
alejandro-campos
|
7d8f9f7798
|
fix lint errors
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
|
2019-05-03 13:54:39 +02:00 |
|
alejandro-campos
|
5b3dfcbf74
|
add feature to enable obfuscation on command fields when creating or updating commands
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
|
2019-05-03 13:46:52 +02:00 |
|
Daniel Maya
|
d16b96309b
|
Fixed pagination in Alert templates
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
|
2019-04-29 14:45:11 +02:00 |
|
manuel
|
6bd8221bc0
|
changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
|
2019-04-29 14:36:02 +02:00 |
Daniel Barbero Martin
|
ac41e9255f
|
helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
|
2019-04-24 13:53:18 +02:00 |
|
manuel
|
c075d5caad
|
Added condition type not normal in alert templates
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
|
2019-04-24 10:51:55 +02:00 |
|
Tatiana Llorente
|
41ea1a4c66
|
Fixed minor visual bug - #3707
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
|
2019-04-08 11:31:27 +02:00 |
|
Tatiana Llorente
|
d91631e0e1
|
New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
|
2019-04-05 13:18:38 +02:00 |
|
Tatiana Llorente
|
f497d3bd2e
|
Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
|
2019-04-02 13:42:30 +02:00 |
|
Luis Calvo
|
4c95a160de
|
Changed Jquery .text for .html for html conversion
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
|
2019-04-01 17:57:22 +02:00 |
|
Tatiana Llorente
|
26451c41a1
|
New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
|
2019-03-29 11:05:52 +01:00 |
|
Tatiana Llorente
|
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 |
|
Tatiana Llorente
|
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 |
Alejandro Gallardo Escobar
|
d38236091b
|
Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
|
2019-02-01 09:55:29 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
|
tatiana.llorente@artica.es
|
f5c96b7e5d
|
New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
|
2019-01-24 11:10:49 +01:00 |