Commit Graph

33492 Commits

Author SHA1 Message Date
Pablo Aragon 2f619d1ef6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 10:45:43 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Jonathan 4aaddf063c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 09:52:06 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
daniel d6a1155dbb fixed styles 2023-03-31 08:45:54 +02:00
artica a0828ac25c Auto-updated build strings. 2023-03-31 01:00:22 +02:00
slerena 3d84aea29e Updated color4 2023-03-30 18:11:03 +00:00
slerena 5e273ad4d5 Updated default colors to reflect pandorafms official color palette (2023) 2023-03-30 18:05:05 +00:00
daniel 48d72e2fbb Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5639
2023-03-30 15:38:19 +00:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 98acf2b864 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 16:50:40 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
daniel 72e35de00e fixed styles 2023-03-30 16:49:17 +02:00
Jonathan 9635b4b721 Dashboard slides fix 2023-03-30 16:45:27 +02:00
Daniel Rodriguez 3e51586738 Merge branch 'ent-10451-no-se-puede-actualizar-a-la-769-server-por-update-manager-offline-en-centos-7' into 'develop'
Ent 10451 no se puede actualizar a la 769 server por update manager offline en centos 7

See merge request artica/pandorafms!5606
2023-03-30 13:10:32 +00:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop'
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
2023-03-30 12:39:06 +00:00
Jonathan 8b04d5981d Agent view follow menu change 2023-03-30 14:17:33 +02:00
Jonathan 1a456c0c63 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 13:56:58 +02:00
Jonathan 779849d949 Agent modules view fix filters 2023-03-30 13:56:53 +02:00
Matias Didier ca3ad36fb6 Merge branch 'ent-10378-guardar-estado-del-menu-lateral-al-hacer-acciones' into 'develop'
Ent 10378 guardar estado del menu lateral al hacer acciones

See merge request artica/pandorafms!5640
2023-03-30 11:44:26 +00:00
Daniel Maya 2035d9831b #10378 permanent closed menu 2023-03-30 13:02:36 +02:00
Pablo Aragon a8333801bb Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 13:00:28 +02:00
Pablo Aragon 7c4d353d7c csv 2023-03-30 13:00:23 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
Jonathan ae58add6a9 Dashboard pure fix options 2023-03-30 12:18:16 +02:00
daniel 27e13c26c6 fixed styles 2023-03-30 11:40:32 +02:00
Jimmy Olano 766ecbc308 Merge branch 'ent-10298-cambios-en-script-de-arranque-y-pandora_ha-para-levantar-varias-instancias-del-server' into 'develop', JJOS.
10298 adding multiconfig server support for init.d

See merge request artica/pandorafms!5584
2023-03-30 09:37:27 +00:00
Matias Didier 6da2d233cc Merge branch 'ent-10633-pantalla-de-timeout' into 'develop'
Ent 10633 pantalla de timeout

See merge request artica/pandorafms!5600
2023-03-30 09:01:10 +00:00
Jonathan ace79d3ac1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 10:26:36 +02:00
Jonathan da08d4e802 SNMP Wizard visual changes 2023-03-30 10:26:29 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
daniel 2c1301f542 fixed styles 2023-03-30 08:59:40 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
artica 00ec0dee25 Auto-updated build strings. 2023-03-30 08:05:32 +02:00
slerena 711b75247f Change header copyright and other details 2023-03-30 08:05:32 +02:00
slerena e9fcfe7449 Improved legibility for warning messages (warning class). 2023-03-30 08:05:32 +02:00
artica 392139d22d Auto-updated build strings. 2023-03-30 01:00:16 +02:00
slerena d1e29075a3 Change header copyright and other details 2023-03-29 18:25:00 +00:00
slerena 68f417f3f3 Improved legibility for warning messages (warning class). 2023-03-29 18:24:18 +00:00
daniel d6fdfbc233 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5634
2023-03-29 15:30:12 +00:00
daniel 8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon e067a176a4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 17:09:49 +02:00
Pablo Aragon f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +02:00
Jonathan ee0619cc4a Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 16:50:25 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
daniel 6a6c99dcab fixed styles 2023-03-29 16:31:25 +02:00
Rafael Ameijeiras b5c343f72a Merge branch '9909-14587-anadir-opcion-al-instalador-de-agente-online' into 'develop'
9909 adding ssl dependencies and env variable to enable it on online agent installer

See merge request artica/pandorafms!5607
2023-03-29 14:02:31 +00:00