daniel
|
d6a1155dbb
|
fixed styles
|
2023-03-31 08:45:54 +02: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 |
Daniel Cebrian
|
b9fc352578
|
merge develop into ent-10633-pantalla-de-timeout
|
2023-03-30 09:15:10 +02:00 |
Jonathan
|
665976e011
|
Bulks masive visual action buttons
|
2023-03-27 11:10:51 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
Rafael Ameijeiras
|
a30ba4cf27
|
Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos
See merge request artica/pandorafms!5587
|
2023-03-24 07:25:52 +00:00 |
Pablo Aragon
|
0fa79e44f1
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-23 17:44:16 +01:00 |
|
Pablo Aragon
|
122f45fcaa
|
Metasetup
|
2023-03-23 17:44:04 +01:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +01:00 |
|
Pablo Aragon
|
8b163cd100
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 16:42:15 +01:00 |
|
Pablo Aragon
|
b0b2778c4a
|
10760-Setup
|
2023-03-22 16:42:03 +01:00 |
|
Jonathan
|
c52ca613b2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-22 14:22:08 +01:00 |
|
Jonathan
|
a063c7a0ac
|
Fix header and menu
|
2023-03-22 14:21:56 +01:00 |
|
daniel
|
e82de5d6aa
|
fixed styles
|
2023-03-22 14:08:03 +01:00 |
|
Rafael Ameijeiras
|
87421e772d
|
Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
# pandora_console/install.php
|
2023-03-22 08:23:07 +00:00 |
|
Jonathan
|
93f5b62bd2
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 14:23:15 +01:00 |
|
Jonathan
|
a960644975
|
Omnishell fix view
|
2023-03-21 14:23:12 +01:00 |
|
Pablo Aragon
|
e8744b5d12
|
10712-New login
|
2023-03-21 13:31:11 +01:00 |
|
Daniel Cebrian
|
563e9e15c4
|
#9624 fixed conflics
|
2023-03-21 10:30:35 +01:00 |
|
Daniel Cebrian
|
9dea38f440
|
Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos
|
2023-03-21 09:38:56 +01:00 |
|
Jonathan
|
a1144ce7ab
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-17 13:35:46 +01:00 |
|
Jonathan
|
de538a10cb
|
setup Performance visual changes
|
2023-03-17 13:35:43 +01:00 |
|
daniel
|
594d34931c
|
fixed styles
|
2023-03-17 13:20:58 +01:00 |
Calvo
|
284e20fc8a
|
Unified default netflow interval and deleted from console setup
|
2023-03-17 10:58:58 +01:00 |
|
daniel
|
3f09fd16a7
|
fixed styles
|
2023-03-16 18:51:54 +01:00 |
Jose Gonzalez
|
211f29c0f9
|
Websocket engine and quickshell
|
2023-03-16 17:49:57 +01:00 |
|
Jose Gonzalez
|
bbb1855d81
|
External Tools
|
2023-03-16 17:38:51 +01:00 |
|
Jose Gonzalez
|
6d37781255
|
Minor fixes visual styles
|
2023-03-16 16:33:08 +01:00 |
|
Jose Gonzalez
|
8d7620e88d
|
Setup updates
|
2023-03-16 13:11:11 +01:00 |
|
Jose Gonzalez
|
21c263c7c4
|
Setup views
|
2023-03-16 11:58:35 +01:00 |
|
Jose Gonzalez
|
d2a807636e
|
General Setup view
|
2023-03-15 17:43:35 +01:00 |
|
Jose Gonzalez
|
84fe5695d8
|
Visual styles Setup view
|
2023-03-15 16:34:18 +01:00 |
|
Daniel Cebrian
|
d315d4cda7
|
#10633 added token for control check conexion interval
|
2023-03-14 13:16:58 +01:00 |
|
Daniel Cebrian
|
be6c15fc58
|
#9624 change icon sflow
|
2023-03-14 10:46:50 +01:00 |
|
Jose Gonzalez
|
1c85038ffa
|
Discovery progress bars
|
2023-03-13 15:44:55 +01:00 |
|
Daniel Cebrian
|
ca78f069f6
|
#9624 added support sflow
|
2023-03-10 17:12:38 +01:00 |
|
daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +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 |
|
Jose Gonzalez
|
edbc9d8f6b
|
Icons review
|
2023-03-09 23:31:40 +01:00 |
|
Pablo Aragon
|
2a97b26cfe
|
Admin tools
|
2023-03-09 15:14:47 +01:00 |
|
Pablo Aragon
|
bb1d9c323d
|
Admin tools
|
2023-03-08 17:12:15 +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 Cebrian
|
135793454c
|
#9073 added images
|
2023-03-06 12:20:08 +01:00 |
|
daniel
|
ff3b7001c3
|
fixed styles
|
2023-03-04 13:22:52 +01:00 |
|
daniel
|
5f8e9a3e3c
|
fixed styles
|
2023-03-02 12:46:47 +01:00 |
|
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
|
daniel
|
f00f974c60
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/alerts/alert_commands.php
pandora_console/godmode/alerts/alert_templates.php
pandora_console/godmode/groups/configure_modu_group.php
pandora_console/godmode/groups/modu_group_list.php
pandora_console/godmode/modules/manage_network_components.php
pandora_console/godmode/users/user_list.php
|
2023-02-28 07:32:43 +01:00 |
|
Daniel Cebrian
|
c8096d73b2
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 14:58:25 +01:00 |
|
Jose Gonzalez
|
6c97fd16a2
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-24 14:34:52 +01:00 |