tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-21 01:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
Daniel Rodriguez
8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
Jose Gonzalez
a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
fbsanchez
3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Jose Gonzalez
3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Daniel Rodriguez
5fbd209a73 Merge branch 'ent-1516-dias-de-la-semana-aparecen-siempre-en-ingles' into 'develop' 
fixed error with weeckly days sla

See merge request artica/pandorafms!3951
 2021-04-15 12:37:38 +00:00
Marcos Alconada
798c1d060f fixed error with weeckly days sla 2021-04-15 12:37:38 +00:00
Daniel Rodriguez
4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos
e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
Jose Gonzalez
a69666aad9 Added Event class 2021-04-15 12:00:32 +02:00
Jose Gonzalez
ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos
24099644be remove log 2021-04-15 11:22:24 +02:00
Daniel Barbero Martin
c28ea4cc9a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 08:40:58 +02:00
artica
fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02: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
marcos
48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Jose Gonzalez
f684cef491 Changed audit log for event and refactor 2021-04-14 12:16:28 +02:00
marcos
b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez
1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
fbsanchez
3dc49bea23 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-14 09:38:44 +02:00
Calvo
3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
Daniel Barbero Martin
1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +02:00
artica
46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez
fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
Jose Gonzalez
3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Jose Gonzalez
fa7ca4d77b Added function for use templates in emails 2021-04-13 12:52:11 +02:00
Daniel Rodriguez
751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya
9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González
4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Daniel Barbero Martin
aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02:00
artica
c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
fbsanchez
1b4251cf49 minor improvement, disabledElements 2021-04-12 20:10:58 +02:00
fbsanchez
6a220208b4 reviewing correlated alerts 2021-04-12 19:16:39 +02:00
alejandro.campos@artica.es
93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Jose Gonzalez
3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +02:00
Daniel Rodriguez
eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez
9184d2b11f Merge branch 'ent-6857-implementar-control-de-descarga-csv-del-log-viewer-en-metaconsola' into 'develop' 
Ent 6857 implementar control de descarga csv del log viewer en metaconsola

See merge request artica/pandorafms!3917
 2021-04-12 08:48:16 +00:00
Daniel Rodriguez
79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Jose Gonzalez
141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Daniel Barbero Martin
319a329aec Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-12 08:04:04 +02:00
artica
4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica
3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica
ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
Jose Gonzalez
9f92a4b6c5 Added CSRF token input for PrintForms 2021-04-09 13:31:11 +02:00
Jose Gonzalez
ee858280e1 Changed CSRF hidden function for allow return 2021-04-09 13:30:31 +02:00
Marcos Alconada
dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Marcos Alconada
225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez
ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez
040fdbae01 Merge branch 'ent-7262-fondo-de-la-grafica-de-acceso-no-es-transparente-casca-en-blactheme' into 'develop' 
set black theme on agent access rate flot

See merge request artica/pandorafms!3997
 2021-04-09 09:29:26 +00:00
Marcos Alconada
a1fceb2e81 set black theme on agent access rate flot 2021-04-09 09:29:26 +00:00
Daniel Rodriguez
bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00