Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Jose Gonzalez
|
60685cdccc
|
Table fixes
|
2023-01-10 10:18:37 +01:00 |
Enrique Martin
|
2cf0e301c5
|
Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop'
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view
See merge request artica/pandorafms!5369
|
2023-01-05 11:46:53 +00:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
Jonathan
|
b9d6898639
|
#9758 update_alert_count on enable/disable alerts
|
2023-01-03 15:09:18 +01:00 |
|
Jonathan
|
707763f5e2
|
#10074 snmp alert edit content_type
|
2022-12-29 14:55:30 +01:00 |
Luis Calvo
|
aa85c73a3c
|
Fix alert list view search bug
|
2022-12-09 08:59:03 +01:00 |
|
jose.gonzalez@pandorafms.com
|
445a8161cf
|
Merge
|
2022-12-05 09:44:35 +01:00 |
|
jose.gonzalez@pandorafms.com
|
dccd950e9e
|
Changes
|
2022-11-30 10:14:42 +01:00 |
alejandro.campos@artica.es
|
2925df80e9
|
changed wrong count
|
2022-11-29 12:04:03 +01:00 |
|
alejandro.campos@artica.es
|
6243229345
|
changed wrong count
|
2022-11-29 11:54:25 +01:00 |
|
jose.gonzalez@pandorafms.com
|
a688182062
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2022-11-22 17:47:02 +01:00 |
Daniel Rodriguez
|
49d0f336fd
|
Merge branch 'ent-9514-14202-Problemas-ACL-Enterprise-no-deja-borrar-alertas' into 'develop'
fix alert deletion from agent alerts
See merge request artica/pandorafms!5192
|
2022-11-22 14:04:08 +00:00 |
|
jose.gonzalez@pandorafms.com
|
bf678b55dc
|
Several views updated
|
2022-11-11 16:15:17 +01:00 |
|
jose.gonzalez@pandorafms.com
|
f99a7dc511
|
Adaptations
|
2022-11-07 14:04:07 +01:00 |
|
jose.gonzalez@pandorafms.com
|
13b0c7d0c8
|
Fixed views
|
2022-10-25 13:13:52 +02:00 |
Daniel Barbero
|
688597a006
|
multiple external alert policies pandora_enterprise#8733
|
2022-10-20 16:42:26 +02:00 |
Daniel Maya
|
89bd5ec22c
|
#9665 Fixed button 2
|
2022-10-20 10:42:27 +02:00 |
|
Daniel Maya
|
fcb1cd24b5
|
#9665 Fixed button
|
2022-10-18 11:02:06 +02:00 |
|
alejandro.campos@artica.es
|
2c57873898
|
fix alert deletion from agent alerts
|
2022-10-13 12:03:15 +02:00 |
|
Daniel Rodriguez
|
d833c7ba39
|
Merge branch 'ent-9485-14165-filtrado-alertas-metaconsola' into 'develop'
Ent 9485 14165 filtrado alertas metaconsola
See merge request artica/pandorafms!5128
|
2022-10-13 09:24:11 +00:00 |
|
Daniel Maya
|
c1b4501da5
|
resolved conflict
|
2022-10-03 14:41:14 +02:00 |
edu.corral
|
a13c2a24a9
|
ent 9485 metaconsole alert filter
|
2022-09-21 09:46:31 +02:00 |
|
alejandro.campos@artica.es
|
d1cc2458b6
|
implemented alert commands and actions to send report by email
|
2022-09-13 12:16:53 +02:00 |
|
edu.corral
|
03504fe7c5
|
ent 9183 agent alerts filter
|
2022-09-02 11:26:24 +02:00 |
Diego Muñoz-Reja
|
bc6f234029
|
Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop'
Resized alert action list and refactor
See merge request artica/pandorafms!4980
|
2022-06-29 14:50:37 +00:00 |
|
José González
|
7edcd3b0a6
|
Improve code and fix update alerts
|
2022-06-29 11:05:50 +02:00 |
Jimmy Olano
|
f48d3a9849
|
Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop'
Ent 8984 13630 cuenta de plantillas de alerta no coincide
See merge request artica/pandorafms!4902
|
2022-06-29 02:40:08 +00:00 |
|
José González
|
237de0ee97
|
Resized alert action list and refactor
|
2022-06-23 12:21:00 +02:00 |
|
Daniel Rodriguez
|
5138756525
|
Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop'
Ent 8958 13577 error al quitar un comando de una acción
See merge request artica/pandorafms!4878
|
2022-06-06 12:16:15 +00:00 |
|
Daniel Maya
|
1379ca43b0
|
#8984 Fixed pagination
|
2022-05-23 17:10:00 +02:00 |
|
Daniel Maya
|
37c8fe73df
|
#9017 Fixed alert list
|
2022-05-23 16:36:16 +02:00 |
Daniel Maya
|
a2de9121b7
|
#8958 remove the option none
|
2022-05-10 15:15:40 +02:00 |
|
Daniel Rodriguez
|
3f7067fe48
|
Merge branch 'ent-I-do-now-like-procedures' into 'develop'
Allow both behaviours in alert time slots
See merge request artica/pandorafms!4711
|
2022-02-24 09:55:40 +00:00 |
|
Daniel Barbero Martin
|
237a7feb98
|
remove procedure and retrocompatibility pandora_enterprise#3943
|
2022-02-22 13:20:53 +01:00 |
|
Daniel Rodriguez
|
ffc7cb2b44
|
Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop'
Increased field size
Closes pandora_enterprise#8455
See merge request artica/pandorafms!4706
|
2022-02-22 12:08:46 +00:00 |
|
Daniel Barbero Martin
|
93cad269c8
|
fixed json entities pandora_enterprise#3943
|
2022-02-22 12:03:22 +01:00 |
|
José González
|
e2621f6230
|
Increased field size
|
2022-02-18 11:18:01 +01:00 |
fbsanchez
|
4d912fbd34
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
|
2022-02-11 09:55:34 +01:00 |
|
fbsanchez
|
6bb754d5d2
|
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
pandora_console/pandoradb.sql
|
2022-02-08 13:02:22 +01:00 |
José González
|
fc4b702db0
|
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
|
2022-02-08 11:35:01 +00:00 |
|
Daniel Barbero Martin
|
ba6d6f9107
|
calendar not editable pandora_enterprise#3943
|
2022-02-08 09:38:42 +01:00 |
|
Daniel Barbero Martin
|
0e0e737283
|
calendar not editable pandora_enterprise#3943
|
2022-02-07 13:07:48 +01:00 |
|
Jose Gonzalez
|
1129a801c4
|
Fix alert commands
|
2022-02-03 13:49:26 +01:00 |
|
Jose Gonzalez
|
2f356541ea
|
Fixed alert management log
|
2022-02-03 12:54:50 +01:00 |
|
Daniel Barbero Martin
|
3d951749f5
|
alert template schedule pandora_enterprise#3943
|
2022-02-02 13:03:52 +01:00 |
|
Daniel Barbero Martin
|
5060d0b8f7
|
alert template schedule pandora_enterprise#3943
|
2022-02-02 10:09:31 +01:00 |
|
Daniel Barbero Martin
|
b62566af49
|
alert template schedule pandora_enterprise#3943
|
2022-02-01 16:50:53 +01:00 |
|
Jose Gonzalez
|
d81e6571ec
|
New audit logs
|
2022-02-01 13:39:18 +01:00 |
|
Daniel Barbero Martin
|
645257f9dc
|
alert template schedule pandora_enterprise#3943
|
2022-02-01 11:29:25 +01:00 |