32870 Commits

Author SHA1 Message Date
daniel
c8a963fd87 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' into 'develop'
WIP: Ent 9662 restyling fuentes colores botones

See merge request artica/pandorafms!5231
2023-03-07 08:56:37 +00:00
Jonathan
89780a7085 Container graph visual 2023-03-07 09:53:19 +01:00
Pablo Aragon
6cb78d312f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:52:05 +01:00
Pablo Aragon
6c6943c591 Alerts 2023-03-07 09:51:53 +01:00
Jose Gonzalez
1d93c666ba Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 09:51:23 +01:00
Jose Gonzalez
d0f2f7a9c1 TreeController fixed 2023-03-07 09:48:23 +01:00
Jose Gonzalez
e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Pablo Aragon
62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon
5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
daniel
dba1554d74 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/general/login_page.php
2023-03-07 08:04:45 +01:00
artica
6f5cae9a1f Auto-updated build strings. 2023-03-07 01:00:57 +01:00
Jose Gonzalez
a10e79f663 Dashboard minor fixes and icons 2023-03-07 00:15:26 +01:00
Jose Gonzalez
5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
Jose Gonzalez
d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
daniel
70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
daniel
5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez
44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
Jose Gonzalez
e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Rafael Ameijeiras
3a97227336 Merge branch 'ent-10294-enumeracion-usuarios-en-errores-login-pandora-fms' into 'develop'
Ent 10294 enumeracion usuarios en errores login pandora fms

See merge request artica/pandorafms!5519
2023-03-06 10:43:26 +00:00
Jose Gonzalez
3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez
a4655c221d Added action-button class 2023-03-06 11:34:03 +01:00
Jose Gonzalez
e4f63206eb Network maps minor fixes 2023-03-06 11:33:42 +01:00
Jose Gonzalez
6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Jose Gonzalez
c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
Pablo Aragon
f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
Pablo Aragon
9c5203885e IPAM 2023-03-06 09:23:30 +01:00
Jose Gonzalez
c13b77aea9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 09:22:02 +01:00
Jose Gonzalez
7a2e929d3e CSS styles for services 2023-03-06 09:21:48 +01:00
Rafael Ameijeiras
ec0d270078 Merge branch 'ent-10234-14931-codigo-generado-erroneamente-en-la-descarga-de-ficheros-de-colecciones-en-metaconsola' into 'develop'
Ent 10234 14931 codigo generado erroneamente en la descarga de ficheros de colecciones en metaconsola

See merge request artica/pandorafms!5485
2023-03-06 08:00:53 +00:00
Rafael Ameijeiras
03a7d9e89a Merge branch 'ent-10230-AXITY-Vulnerabilidades-underscore-js' into 'develop'
updated underscore

See merge request artica/pandorafms!5570
2023-03-06 07:59:58 +00:00
Jonathan
d892a0d759 Password mobile required 2023-03-06 08:57:47 +01:00
Pablo Aragon
6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
Jonathan
3b36a15b4d Merge branch 'develop' into ent-10294-enumeracion-usuarios-en-errores-login-pandora-fms 2023-03-06 08:18:52 +01:00
daniel
f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
2023-03-06 08:09:29 +01:00
artica
15dd6e41ed Auto-updated build strings. 2023-03-06 01:01:00 +01:00
Jimmy Olano
6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
2023-03-05 22:56:35 +00:00
daniel
08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
artica
f813af7397 Auto-updated build strings. 2023-03-05 01:01:11 +01:00
daniel
ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
artica
e4a2852be6 Auto-updated build strings. 2023-03-04 01:00:26 +01:00
Jimmy Olano
aea0aa3fb9 Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS.
Draft: Ent 10282 desactivar la edicion de traps en la version open

See merge request artica/pandorafms!5483
2023-03-03 14:00:40 +00:00
Jose Gonzalez
9ad97ee267 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 14:51:07 +01:00
Jose Gonzalez
6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
daniel
95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Jose Gonzalez
df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez
128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Pablo Aragon
f3b9d73855 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 12:43:35 +01:00
Jonathan
5d73f96823 Graphs template wizard visual change 2023-03-03 12:41:32 +01:00
Pablo Aragon
b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
slerena
970c8e4830 Updated "DB First installed", this field was intented to be used on changes of major versions, not used anymore, but doesn't have amy sense to keepit in 6.x 2023-03-03 10:14:43 +00:00