tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1148 Commits

Author SHA1 Message Date
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Jonathan e6eed5e471 fix visual module graph and monitor details more details 2023-02-17 11:54:48 +01:00
Matias Didier c6f6a6b9d3 Merge branch 'ent-10410-Carga-muy-lenta-de-comentarios-de-eventos-en-tyr-saga' into 'develop' 
fixed comment loading in event dialog

See merge request artica/pandorafms!5543
 2023-02-16 09:34:35 +00:00
Jose Gonzalez e42c4575d5 Double authentication active 2023-02-16 07:25:26 +01:00
alejandro.campos@artica.es 5c57954b50 fixed comment loading in event dialog 2023-02-15 19:38:57 +01:00
Jose Gonzalez 1d682521e9 Minor fixes in agent/module view 2023-02-14 10:41:40 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Rafael Ameijeiras 2c619540e0 Merge branch 'ent-10188-13786-arreglar-filtros-de-alertas-sonoras' into 'develop' 
fix filter events sounds pandora_enterprise#10188

See merge request artica/pandorafms!5469
 2023-02-10 08:03:34 +00:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Daniel Cebrian ea789804f4 #10190 fixed response option 2023-02-07 17:41:27 +01:00
Daniel Cebrian 6117e1741f #10190 added popup for edit events in sound console 2023-02-07 16:48:23 +01:00
alejandro.campos@artica.es e4f5a9a61a Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-01 09:36:42 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
daniel 81ae7fdb08 fix filter events sounds pandora_enterprise#10188 2023-01-27 12:41:06 +01:00
Rafael Ameijeiras 1488504e56 Merge branch 'ent-10175-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop' 
fix validate events pandora_enterprise#10175

See merge request artica/pandorafms!5453
 2023-01-26 12:56:20 +00:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
Calvo 0458f4357e Added recursion to delete modules children warning 2023-01-25 18:03:54 +01:00
alejandro.campos@artica.es ce57a3cc4b minor change 2023-01-25 17:41:46 +01:00
alejandro.campos@artica.es 902a843765 implemented agents view filter management 2023-01-25 17:22:54 +01:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Rafael Ameijeiras 9bf789dd26 Merge branch 'ent-10215-mapa-de-calor-pinchar-en-un-elemeno-de-tipo-agente-no-muestra-info' into 'develop' 
Ent 10215 mapa de calor pinchar en un elemeno de tipo agente no muestra info

See merge request artica/pandorafms!5443
 2023-01-24 12:00:34 +00:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01:00
Rafael Ameijeiras 1d33c0cb69 Merge branch 'ent-10095-14748-ordenar-alertas-por-fecha-en-detalles-de-alerta' into 'develop' 
Ent 10095 14748 ordenar alertas por fecha en detalles de alerta

See merge request artica/pandorafms!5409
 2023-01-23 15:24:33 +00:00
Daniel Maya 5a4d9739d3 #10215 Fixed open heatmap 2023-01-23 13:58:06 +01:00
alejandro.campos@artica.es 67b7234e58 implement filter save and load feature in monitor view 2023-01-19 10:49:48 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
Daniel Cebrian 57bac825d2 #10095 fixed order last triggered 2023-01-12 16:44:29 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 118099cd24 Minor fixes and solve issues with module templates 2023-01-11 13:02:18 +01:00
Jose Gonzalez 33c9b50ddc Polishing agent detail view 2023-01-10 14:57:40 +01:00
Daniel Cebrian f37db99337 #9618 deleted hd() 2023-01-10 11:46:14 +01:00