3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00: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
366d02f203
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
2021-01-14 09:22:06 +01:00
b9a2998c49
Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
...
Ent 6490 errores en edicion de acciones de alertas
See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
02475d25b6
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_console/general/header.php
# pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
3fd983fb72
Fix
2020-12-03 15:51:40 +01:00
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
1cf3381797
Fixed update alert actions
2020-11-26 10:33:32 +01:00
94cfd51501
Ent 6512 error en acls de alertas
2020-10-28 11:41:30 +01:00
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
f69166bd53
Updates style width group selector
2020-09-28 18:04:46 +02:00
12bc9e2b4e
Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop'
...
Ent 6195 10482 entities en tabla de auditoria
See merge request artica/pandorafms!3411
2020-09-23 09:38:29 +02:00
0d19f500b1
Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
...
checkd option by default on creation
See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
4c8414cda5
Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
...
Solved issue with TinyMCE status bar. Now can view it properly
See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
0e3c10a698
Merge
2020-09-17 10:35:18 +02:00
5bd208a95c
checkd option by default on creation
2020-09-14 13:43:18 +02:00
8f477b1833
Avoid XSS in List of special days. Added control for only show help tip if description has data
2020-09-09 12:49:43 +02:00
fe8e7b7d0c
Add new filter search actions
2020-08-31 12:48:00 +02:00
f477919433
Fixed entities in query
2020-08-28 13:56:15 +02:00
5565d839c3
Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp
2020-08-26 09:00:35 +02:00
Marcos Alconada
Alejandro Campos
Daniel Maya
José González
Daniel Rodriguez
Junichi Satoh
José González
fbsanchez
daniel
manuel.montes