32593 Commits

Author SHA1 Message Date
Jonathan
5e25f96c76 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:30:55 +01:00
Jonathan
4be8bbd9be SNMP trap generatos create view 2023-02-24 10:30:51 +01:00
Jose Gonzalez
d80dd284ab Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:20:11 +01:00
Jose Gonzalez
6a5c2c58c7 Fix tree view 2023-02-24 10:19:56 +01:00
daniel
6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
Pablo Aragon
a28eb59ce0 10454-Fix filters 2023-02-24 10:06:32 +01:00
Pablo Aragon
a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Jonathan
b8d0e9dda8 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 09:51:59 +01:00
Jonathan
c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
daniel
b34515d03c restyling 2023-02-23 17:57:48 +01:00
Jonathan
831579f9c8 Conflicto solution 2023-02-23 17:10:44 +01:00
Jonathan
a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
Jose Gonzalez
344261eafa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 16:48:02 +01:00
Jose Gonzalez
65c2d09194 Icons added 2023-02-23 16:47:51 +01:00
daniel
1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
Jose Gonzalez
fbca56500a TreeView minor fixes 2023-02-23 16:24:20 +01:00
daniel
929680eb17 restyling 2023-02-23 16:00:13 +01:00
daniel
fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez
f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez
f45a777e5b Added save-load icons 2023-02-23 14:30:57 +01:00
Jose Gonzalez
d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel
598a1b1456 restyling 2023-02-23 12:34:41 +01:00
daniel
e672ba141b restyling 2023-02-23 11:00:38 +01:00
Pablo Aragon
c1342fb6a1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 10:32:18 +01:00
Pablo Aragon
c30dda1718 10519-New login meta 2023-02-23 10:32:01 +01:00
daniel
ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jonathan
0fbf50673a Dashboard multiselect height + delete size modal 2023-02-23 10:11:35 +01:00
Jose Gonzalez
6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel
e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez
0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Pablo Aragon
ac4a76d653 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 15:02:14 +01:00
Pablo Aragon
d414bb2600 10454-Fix event view - td styles 2023-02-22 15:02:08 +01:00
Jose Gonzalez
095caf6fa9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 14:20:20 +01:00
Jose Gonzalez
ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
Pablo Aragon
1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
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
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
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
Jose Gonzalez
8df0c8a66d Fonts changed at Sancho request 2023-02-22 09:39:13 +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