Commit Graph

105 Commits

Author SHA1 Message Date
Daniel Barbero Martin da6c75f5b0 Wip command center, alerts SNMP broken 2021-06-04 11:34:12 +02:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Marcos Alconada 317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00
Daniel Rodriguez a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop'
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
2021-04-14 13:15:29 +00:00
Junichi Satoh d4b8916c54 Fixed following problems.
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
2021-03-26 17:11:10 +09:00
alejandro.campos@artica.es 373ab32bb5 Add pagination to commands view 2021-03-16 11:54:40 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es af680b5d92 permissions limitation for command management 2021-03-01 13:58:04 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Tatiana Llorente 8c86019037 Ent 5583 bug comando de alerta 2020-03-18 12:25:29 +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
Tatiana Llorente 9a17a02d61 Fixed bug with line breaks in alert commands 2019-11-14 12:29:02 +01: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 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
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +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
Tatiana Llorente 26451c41a1 New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
2018-11-08 14:00:49 +01:00
fermin831 e24794d6ea Fixed alert command creation error management 2018-10-22 16:54:22 +02:00
fermin831 1f299cad52 Added copy button to alert commands 2018-10-22 12:01:29 +02:00
fermin831 b50b1c9f34 Added group icon to alerts commands view 2018-10-22 10:08:25 +02:00
fermin831 8b0b23dc27 Added group to alert commands update and creation 2018-10-22 09:49:06 +02:00
tatiana.llorente@artica.es 61a3d147af Added descriptive error messages - #2858 2018-10-03 16:41:58 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'"
This reverts merge request !862
2017-10-16 16:44:44 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
fbsanchez 8b06931715 Ticket 3462: Provided snmp help/std help based on referer 2016-07-29 15:46:27 +02:00
m-lopez-f 04c1304a5d Fixed help of action alerts. Tiquet: #3889 2016-06-27 13:09:23 +02:00
Daniel Maya b40f0848e0 Fixed help alert command. Ticket #3415. 2016-06-15 15:52:29 +02:00
Arturo Gonzalez Diaz 2b7c74f1d9 Changed bad help message in alert macros. Ticket#2863 2015-10-21 10:05:56 +02:00
m-lopez-f 1f99733ac8 Fixed problems with data from database when db is oracle 2015-10-19 08:32:37 +02:00
m-lopez-f 523cb7bf65 Add break to switch to last commit 2015-10-14 11:16:10 +02:00
m-lopez-f e94618db62 Fixed problems with data when database is in Oracle. Tiquet: #2864 2015-10-14 11:10:44 +02:00