Pablo Aragon
|
00a5e8e84b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 11:30:40 +01:00 |
|
Pablo Aragon
|
938e8cd777
|
Dashboards widgets
|
2023-03-15 11:30:22 +01:00 |
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
daniel
|
d092495482
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-13 19:31:26 +01:00 |
|
daniel
|
c96ac79726
|
fixed styles
|
2023-03-13 19:30:51 +01:00 |
|
Daniel Cebrian
|
90f0c3771f
|
#10324 fixed deleted element fav menu
|
2023-03-13 17:21:28 +01:00 |
|
Daniel Cebrian
|
64cc261483
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 16:48:47 +01:00 |
|
daniel
|
503a1b2c22
|
Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
pandora_console/include/lib/Dashboard/Widget.php
|
2023-03-13 10:43:38 +01:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +01:00 |
|
daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
|
daniel
|
8778fcea93
|
fixed styles
|
2023-03-10 14:49:38 +01:00 |
Jose Gonzalez
|
bb6bf85537
|
Minor visual fixes
|
2023-03-10 12:48:31 +01:00 |
|
Daniel Cebrian
|
841478a86c
|
Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
# pandora_console/pandoradb.sql
|
2023-03-10 10:41:08 +00:00 |
|
Pablo Aragon
|
4ebe7ee790
|
9680-Conflict
|
2023-03-10 09:38:55 +01:00 |
|
Pablo Aragon
|
2a97b26cfe
|
Admin tools
|
2023-03-09 15:14:47 +01:00 |
|
Pablo Aragon
|
87e82c0410
|
10457-Audit log, save/load filters
|
2023-03-08 15:30:48 +01:00 |
|
Daniel Cebrian
|
11250bd59b
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-08 13:00:18 +01:00 |
|
Daniel Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01:00 |
|
Pablo Aragon
|
3ecbf1e4fa
|
Alerts
|
2023-03-07 16:17:01 +01:00 |
|
Daniel Cebrian
|
a4634717d8
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-07 13:49:39 +01:00 |
|
daniel
|
1db803b8f6
|
fixed styles
|
2023-03-07 12:59:34 +01:00 |
|
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 Cebrian
|
0990fe672e
|
#10324 added system fav menu in agent and events
|
2023-02-23 09:48:13 +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 |
|
Daniel Cebrian
|
35a1a67006
|
#9073 refactoring
|
2023-02-17 12:53:35 +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 |
|
Daniel Cebrian
|
e62dee1c62
|
#9073 create files structure
|
2023-02-13 10:06:14 +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 |