33601 Commits

Author SHA1 Message Date
Pablo Aragon
2081459556 10454-Fix event view 2023-02-22 13:08:15 +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
370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez
fd0c181820 Margin reversed 2023-02-22 12:16:04 +01:00
Jose Gonzalez
bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Daniel Cebrian
2980e180d8 Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process'
# Conflicts:
#   pandora_console/include/functions_events.php
2023-02-22 10:45:38 +00:00
Daniel Cebrian
3d5458ae46 #10302 fixed ack date 2023-02-22 11:36:09 +01:00
Matias Didier
cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop'
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
2023-02-22 10:36:00 +00:00
Matias Didier
c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop'
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
2023-02-22 10:15:26 +00:00
Rafael Ameijeiras
3c71213c0d Merge branch 'ent-10435-cambios-intaladores-online' into 'develop'
Ent 10435 cambios intaladores online

See merge request artica/pandorafms!5554
2023-02-22 10:12:00 +00:00
alejandro.campos@artica.es
13186f23ba Merge remote-tracking branch 'origin/develop' into ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db 2023-02-22 11:08:27 +01:00
rafael
df86a428b7 10435 change gotty to be downloaded from firefly 2023-02-22 10:38:14 +01:00
Pablo Aragon
e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon
95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
alejandro.campos@artica.es
2a9494b48d fix conflicts 2023-02-22 10:10:59 +01:00
alejandro.campos@artica.es
b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Jose Gonzalez
8df0c8a66d Fonts changed at Sancho request 2023-02-22 09:39:13 +01:00
Daniel Cebrian
2b7b49db20 #10493 fixed pagination in tags 2023-02-22 09:29:55 +01:00
Daniel Cebrian
2f1060af56 #10493 fixed pagination in collection 2023-02-22 09:05:27 +01:00
Jonathan
4d5891cd02 Select2 z-index for dialogs 2023-02-22 08:56:37 +01:00
rafael
ecf89a7b04 Merge branch 'develop' into ent-10435-cambios-intaladores-online 2023-02-22 08:48:07 +01:00
Jonathan
28d964651f Modal report issue change email input style 2023-02-22 08:12:45 +01:00
Jonathan
fe0bfbe9d6 Close mesage image fix 2023-02-22 08:08:11 +01:00
artica
53ca822779 Auto-updated build strings. 2023-02-22 01:02:03 +01:00
Jonathan
05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Daniel Cebrian
dfadbb0f80 #10493 added pagination in group module 2023-02-21 16:51:05 +01:00
Matias Didier
8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop'
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
2023-02-21 15:31:31 +00:00
Daniel Cebrian
f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Daniel Cebrian
2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
Rafael
9d3f253dd4 10435 fixing os description for ssh banner 2023-02-21 15:36:37 +01:00
alejandro.campos@artica.es
6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Rafael
f98b8baec1 Merge branch 'develop' into ent-10435-cambios-intaladores-online 2023-02-21 15:30:20 +01:00
Daniel Maya
d4f6baa9bb #8642 Added heatmap widget 2 2023-02-21 15:06:58 +01:00
Daniel Maya
6efaa2bbc6 #8642 Added heatmap widget 2023-02-21 15:06:15 +01:00
Jose Gonzalez
7a2cb912b2 Workaround for Status icon 2023-02-21 14:16:37 +01:00
Jose Gonzalez
1d566b4d18 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 14:15:05 +01:00
Jose Gonzalez
2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Pablo Aragon
80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Calvo
47bd0081ef Core: Fix and optimized lag calculaton. Console: optimized and unified queries with server 2023-02-21 12:56:26 +01:00
rafael
77f4f4a680 10435 set new version number 2023-02-21 12:34:11 +01:00
Pablo Aragon
57a6bf97b0 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 11:28:36 +01:00
Pablo Aragon
7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jonathan
005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Rafael Ameijeiras
776f0a69f5 Merge branch 'ent-10459-no-aplica-la-politica-de-contrasenas-en-el-cambio-de-password-usuario-admin' into 'develop'
Draft: Ent 10459 no aplica la politica de contrasenas en el cambio de password usuario admin

See merge request artica/pandorafms!5549
2023-02-21 09:03:33 +00:00
Rafael Ameijeiras
0fa39af4a9 Merge branch 'ent-10483-falla-el-csrf-en-login-despues-de-hacer-logout' into 'develop'
Draft: Ent 10483 falla el csrf en login despues de hacer logout

See merge request artica/pandorafms!5550
2023-02-21 09:02:40 +00:00
artica
490d3db086 Auto-updated build strings. 2023-02-21 01:01:52 +01:00
Jimmy Olano
016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop'
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
2023-02-20 23:00:29 +00:00
rafael
03c40fe582 10435 adding features to online installers 2023-02-20 18:52:35 +01:00
Jose Gonzalez
13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Jose Gonzalez
3ba9b752fe Clean unused items 2023-02-20 17:43:42 +01:00