bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
c08806374e
removed deprecated get_magic_quotes_gpc function and dependent code
2021-10-04 17:37:06 +02:00
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
533a94b09e
Fixed issue with alert actions update
2021-07-19 14:34:48 +02:00
2f536c7577
Wip command center
2021-06-01 19:36:56 +02:00
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
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
58d5c2bc69
Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop'
...
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules
See merge request artica/pandorafms!3881
2021-04-06 17:30:27 +00:00
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +00:00
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
f8d9c00183
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules
2021-03-04 20:15:40 +01:00
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
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
c2c29c0d4a
Update functions_alerts.php with correction
2021-01-15 09:58:18 +01:00
579b8d4965
Solve issue and added correct headers
2021-01-14 19:08:01 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
45e8efa089
minor fix
2020-10-29 18:47:34 +01:00
742cbcb5c5
fix group alert report
2020-10-29 17:54:40 +01:00
0deff70f8b
Alert report (group) Group + secondary groups + recursion
2020-10-07 14:07:17 +02:00
5e039adb26
Solve the issue for alerts, os names and tags
2020-07-07 11:05:19 +02:00
6c90a4dd53
Fixed bug in alerts details view
2019-08-07 13:04:37 +02:00
ce1231eae6
Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
...
Added option in massive delete alerts to show alerts on disabled modules
See merge request artica/pandorafms!2396
2019-06-24 09:55:44 +02:00
98eb1acf00
Add name alert to message
2019-06-19 17:55:09 +02:00
358c3f6a55
Changed message to module name
2019-06-19 16:04:08 +02:00
e9e24505fe
Added option in massive delete alerts to show alerts on disabled modules
...
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
b11d1a6687
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
2019-02-13 12:03:46 +01:00
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
b97a9e2989
Merge branch '2927-Error-en-vista-de-alertas-lanzadas' into 'develop'
...
Fixed bug in alert details
See merge request artica/pandorafms!1887
2018-11-30 13:07:41 +01:00
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
ca75cff3f7
Fixed bug in alert details
2018-10-24 10:25:45 +02:00
f537dbb961
Validate the group command on action creation
2018-10-22 16:19:29 +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
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
0c899f5078
Merge branch 'develop' into 2479-Errores-en-vista-de-alertas-de-meta
...
Conflicts:
pandora_console/include/functions_ui.php
2018-10-01 14:03:30 +02:00
d5b9ddec46
Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop'
...
Added new funcionality to cluster alert configuration: update alert
See merge request artica/pandorafms!1634
2018-09-28 10:50:44 +02:00
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
9f0271c0b8
Merge branch '1920_Informe_de_alertas_2' into 'develop'
...
Fixed module/agent/group alert report
See merge request artica/pandorafms!1772
2018-09-18 08:37:03 +02:00
8daca7d220
Fixed module/agent/group alert report
2018-09-17 18:57:29 +02:00
a25d4ed166
Fixed alerts_get_alerts function
2018-09-12 17:27:09 +02:00
5c54afe673
Fixed secondary groups in alerts details
2018-09-11 09:15:48 +02:00
7da4557abc
Added the feature of the new map items (groups) and fixed more bugs
2018-08-17 11:07:42 +02:00
c70475cd38
Added new funcionality to cluster alert configuration: update alert
2018-07-26 10:24:45 +02:00
b5c378d589
fixed bug in meta alert view: action field (other than default) not showing
2018-07-19 13:55:16 +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
064a9d58b9
Show all alerts when select all tags filter - #1676
2018-02-05 15:30:28 +01:00
bff2213e45
Update fired alert when delete it
2017-11-07 14:47:34 +01:00
José González
Jose Gonzalez
alejandro.campos@artica.es
Jose Gonzalez
Daniel Barbero Martin
Daniel Maya
Daniel Rodriguez
Junichi Satoh
Luis Calvo
fbsanchez
manuel
Alejandro Fraguas
marcos.alconada
Ramon Novoa
artica
vgilc
fermin831
samucarc
Alejandro Gallardo Escobar
enriquecd