daniel
|
ebffb004e9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-27 21:22:06 +02:00 |
|
daniel
|
0461881420
|
fixed styles
|
2023-03-27 17:13:23 +02:00 |
Pablo Aragon
|
98f812b757
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-27 17:03:45 +02:00 |
|
Pablo Aragon
|
55ff0e0597
|
wux and wmi
|
2023-03-27 17:03:38 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
Daniel Cebrian
|
fd9dfcf08f
|
Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500'
# Conflicts:
# pandora_console/install.php
|
2023-03-27 11:01:24 +00:00 |
|
Daniel Cebrian
|
aeab39737b
|
Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500
|
2023-03-27 12:11:59 +02:00 |
|
daniel
|
3beec9bfab
|
fixed styles
|
2023-03-27 11:47:08 +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 |
|
daniel
|
abf9fcf200
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-24 14:05:30 +01:00 |
|
daniel
|
25ea15fe0f
|
fixed styles
|
2023-03-24 14:04:38 +01: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 |
|
daniel
|
96d03ca31c
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-23 17:47:58 +01: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 |
|
daniel
|
bac1a7bf65
|
fixed styles
|
2023-03-23 17:44:06 +01:00 |
|
Pablo Aragon
|
122f45fcaa
|
Metasetup
|
2023-03-23 17:44:04 +01:00 |
Daniel Rodriguez
|
b09d65dd91
|
Merge branch 'ent-10010-mejorar-filtrado-logs-en-informe-de-logs' into 'develop'
Ent 10010 mejorar filtrado logs en informe de logs
See merge request artica/pandorafms!5602
|
2023-03-23 11:46:49 +00: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 |
|
daniel
|
5eaa4a10bb
|
fixed styles
|
2023-03-22 11:13:56 +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 |
|
Pablo Aragon
|
583ec8209c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-21 18:12:11 +01:00 |
|
Pablo Aragon
|
99b845db3f
|
progress bar
|
2023-03-21 18:12:02 +01:00 |
|
Jonathan
|
e2615b9593
|
Visual changes header
|
2023-03-21 17:02:03 +01: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 |
|
daniel
|
64fc4bcd46
|
fixed styles
|
2023-03-21 14:06:28 +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 |
|
Jonathan
|
82dd6ebb37
|
Metaconsole view reports change
|
2023-03-21 09:52:21 +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 |
|
Jonathan
|
fd5347e893
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-17 12:15:13 +01:00 |
|
Jonathan
|
dfbdfbaf60
|
Create module message error correction
|
2023-03-17 12:15:10 +01:00 |
|
daniel
|
a9633085bc
|
fixed styles
|
2023-03-17 12:00:51 +01:00 |
|
daniel
|
f83acb99f0
|
fixed create user and add profile
|
2023-03-17 10:09:11 +01:00 |
|
Jonathan
|
c219ad91c7
|
Visual minor fix
|
2023-03-17 08:53:58 +01:00 |
|
daniel
|
0934b75cbd
|
fixed styles
|
2023-03-17 08:10:19 +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 |
|
daniel
|
a22b5479d9
|
fixed styles
|
2023-03-16 16:48:03 +01:00 |
|
Jose Gonzalez
|
1500edc06e
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-16 16:33:22 +01:00 |