795d5c055a
merge conflict
2021-10-07 09:56:17 +02:00
8c1838abb7
Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
...
Conflicts:
pandora_console/install.php
2021-09-29 13:47:10 +02:00
4a9f523468
Added unlinked icon to alerts in unlinked module
2021-09-23 19:02:31 +02:00
fe42a8782b
Updated messages in centralised environment status check
2021-09-23 11:16:48 +02:00
44dcdb03bc
Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop'
...
Ent 7542 11882 buscador de acciones no funciona
See merge request artica/pandorafms!4343
2021-08-17 07:09:26 +00:00
21e15752cf
fixed select2 search in action update
2021-08-16 11:04:52 +02:00
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
5acd64bbf7
fixed text inputs in add action modals
2021-08-05 13:05:53 +02:00
39d4466658
Merge branch 'ent-fix-alert-action-creation' into 'develop'
...
Fixed alert action creation problem.
See merge request artica/pandorafms!4313
2021-08-05 07:56:22 +00:00
801f8fc3c4
Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop'
...
Fixed alert command hide on update
See merge request artica/pandorafms!4164
2021-08-03 06:47:41 +00:00
4115bd0cba
Fixed an issue where alert actions belonging to the "All" group could be created by restricted users.
2021-07-21 15:34:46 +09:00
d3fe504241
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-13 13:14:01 +02:00
e7079dd4c4
Fixed all alert actions are shown after alert action creation/edition even if user has access rights only for specific groups.
2021-07-13 09:53:23 +09:00
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
eec373e896
Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url
2021-06-24 19:48:07 +02:00
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
68e1e72b46
Controlled if Integria IMS is selected for show Create workunit switch
2021-04-23 13:43:16 +02:00
317bf0da3d
minnor error fixed
2021-04-15 10:33:31 +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
aaded121a4
Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop'
...
restricted action creation on alerts created from policy
See merge request artica/pandorafms!3891
2021-04-06 17:46:47 +00:00
43cfa383ac
Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop'
...
Add pagination to commands view
See merge request artica/pandorafms!3919
2021-04-06 17:44:54 +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
e689813e2c
fixed icons
2021-03-16 13:37:13 +01:00
373ab32bb5
Add pagination to commands view
2021-03-16 11:54:40 +01:00
0ad3e3fd8b
Merge branch 'develop' into 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas'
...
# Conflicts:
# pandora_console/godmode/alerts/alert_list.list.php
2021-03-16 08:41:55 +00:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
2f7a826253
minor fixes
2021-03-11 17:54:20 +01:00
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
f833429695
restricted action creation on alerts created from policy
2021-03-11 12:38:42 +01:00
38cc8d2ab9
Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop'
...
permissions limitation for command management
See merge request artica/pandorafms!3872
2021-03-10 15:54:31 +00:00
71e9452988
Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora
2021-03-10 10:28:45 +01:00
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +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
af680b5d92
permissions limitation for command management
2021-03-01 13:58:04 +01:00
8ff36ef66f
Merge branch 'ent-5269-añadir-elemento-al-filtro-de-la-vista-de-administracion-general-de-alertas' into 'develop'
...
Ent 5269 añadir elemento al filtro de la vista de administracion general de alertas
See merge request artica/pandorafms!3796
2021-03-01 10:38:51 +00:00
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
74bdab5d00
add status filter on alert list
2021-01-25 11:00:24 +01:00
7a614fcf48
Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop'
...
Ent 6354 bug de creacion de dashboard con permisos no all
See merge request artica/pandorafms!3780
2021-01-25 10:02:41 +01:00
dc455636d9
add status filter alert list
2021-01-22 14:15:26 +01:00
d9309616c4
updates new filter
2021-01-21 17:13:49 +01:00
642258e1a3
add status filter on alert list filter
2021-01-21 13:38:03 +01:00
731d486455
changed behavior of All group and fixed acl vulnerability
2021-01-20 18:22:43 +01:00
adf4c988ec
Added warning
2021-01-19 16:03:34 +01:00
marcos
fbsanchez
Calvo
Daniel Rodriguez
alejandro.campos@artica.es
Junichi Satoh
Daniel Barbero Martin
Daniel Maya
José González