37812 Commits

Author SHA1 Message Date
daniel
6a7dd0de9b new api 2.0 2024-02-09 10:53:32 +01:00
daniel
181f3ae7b3 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-09 08:19:48 +01:00
artica
a8409c33a6 Auto-updated build strings. 2024-02-09 01:00:04 +01:00
Rafael Ameijeiras
06a3fa3f27 Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop'
Ent 12636 error con los iconos y cabecera de sistemas operativos

See merge request artica/pandorafms!6872
2024-02-08 14:50:49 +00:00
daniel
d7172a5308 new api 2.0 2024-02-08 15:32:58 +01:00
daniel
019f5d9bbb Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-08 12:24:18 +01:00
daniel
5ff79dc550 new api 2.0 2024-02-08 12:23:56 +01:00
artica
5acffa86d3 Auto-updated build strings. 2024-02-08 01:00:04 +01:00
daniel
510e8452cf new api 2.0 2024-02-07 15:44:53 +01:00
daniel
c0a2a4fdeb Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-07 08:55:52 +01:00
daniel
8cfb04d243 new api 2.0 2024-02-07 08:53:54 +01:00
artica
4912a4051f Auto-updated build strings. 2024-02-07 01:00:50 +01:00
Rafael Ameijeiras
f072936f21 Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop'
Ent 12845 errores visuales en nuevas modales

See merge request artica/pandorafms!6913
2024-02-06 16:55:38 +00:00
Rafael Ameijeiras
e7f74210dc Merge branch 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola' into 'develop'
get data in file count from module

See merge request artica/pandorafms!6746
2024-02-06 13:49:02 +00:00
Jonathan
644308db4f #12845 fix style hover 2024-02-06 14:34:34 +01:00
Rafael Ameijeiras
adb67e9ff0 Merge branch 'ent-12847-nombres-de-consolas-visuales-favoritas-muestran-entities' into 'develop'
Ent 12847 nombres de consolas visuales favoritas muestran entities

See merge request artica/pandorafms!6912
2024-02-06 11:14:20 +00:00
Rafael Ameijeiras
00b7781ec6 Merge branch 'ent-12848-vista-credential-store-no-autorefresca' into 'develop'
Ent 12848 vista credential store no autorefresca

See merge request artica/pandorafms!6911
2024-02-06 11:14:01 +00:00
Jonathan
e402f713c7 #12845 fix play image 2024-02-06 11:35:28 +01:00
Alejandro Campos
64f13f1ae3 Merge branch 'develop' into 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola'
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
2024-02-06 09:02:36 +00:00
Rafael Ameijeiras
542d1c2b51 Merge branch 'ent-12751-path-traversal-and-untrusted-upload-file' into 'develop'
Ent 12751 Path Traversal and Untrusted Upload File

See merge request artica/pandorafms!6905
2024-02-06 07:59:50 +00:00
Rafael Ameijeiras
1ae069ce12 Merge branch 'ent-12833-17008-bulk-operations-cuadros-min-critical-y-max-critical-referencian-incorrectamente' into 'develop'
Ent 12833 [#17008] Bulk Operations: Cuadros Min Critical y Max Critical referencian incorrectamente

See merge request artica/pandorafms!6895
2024-02-06 07:59:09 +00:00
Rafael Ameijeiras
39ed351034 Merge branch 'ent-12488-cambiar-funcionamiento-de-reescalado-de-tamano-tips-de-inicio' into 'develop'
Ent 12488 cambiar funcionamiento de reescalado de tamano tips de inicio

See merge request artica/pandorafms!6910
2024-02-06 07:58:05 +00:00
Rafael Ameijeiras
2be3b74032 Merge branch 'ent-12336-implementar-monitorizacion-de-logs-en-linux-con-la-misma-interface-que-en-windows' into 'develop'
Ent-12336-implementar-monitorizacion-de-logs-en-linux-con-la-misma-interface-que-en-windows

Closes pandora_enterprise#12336

See merge request artica/pandorafms!6837
2024-02-06 07:57:31 +00:00
artica
7dc0acf6da Auto-updated build strings. 2024-02-06 01:00:25 +01:00
Jonathan
59fd298215 #12845 fix styles events 2024-02-05 17:24:52 +01:00
Jonathan
5f00166b74 #12847 remove entities title and name 2024-02-05 16:52:12 +01:00
Jonathan
80c0f48774 #12488 when px lower 0 default 100 2024-02-05 16:05:16 +01:00
Jonathan
c984da1ac7 #12848 reload when new credentials 2024-02-05 15:35:38 +01:00
Rafael Ameijeiras
ab706be7e3 Merge branch 'ent-12042-16242-cambiar-el-uso-de-chkconfig-para-dependencias-de-agentes-en-rhel9' into 'develop'
remove chkconfig from redhat9 agent

See merge request artica/pandorafms!6898
2024-02-05 13:47:25 +00:00
Jonathan
21fe027a62 #12488 tips window move for clicks 2024-02-05 14:34:43 +01:00
rafael
599db12dab 12769 fixing typo on systemctl daemon-reload 2024-02-05 12:02:34 +01:00
rafael
1b0bf8470f 12769 update versions 2024-02-05 11:54:30 +01:00
rafael
9c9dabcfa7 Merge branch 'develop' into ent-12042-16242-cambiar-el-uso-de-chkconfig-para-dependencias-de-agentes-en-rhel9 2024-02-05 10:03:01 +01:00
artica
64f6825d65 Auto-updated build strings. 2024-02-05 09:21:33 +01:00
daniel
b80f7bdeb1 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-05 08:05:45 +01:00
Félix Suárez
b9070d3a8e Fix on empty log extraction 2024-02-02 08:56:39 -06:00
Rafael Ameijeiras
4b40a8e9c5 Merge branch 'ent-12810-visualizacion-de-tipo-de-licencia' into 'develop'
Ent 12810 Visualizacion de tipo de licencia

See merge request artica/pandorafms!6907
2024-02-02 13:08:43 +00:00
Rafael Ameijeiras
f65acbd4f3 Merge branch 'ent-9992-9740-introducir-el-boton-de-email-test-en-la-configuracion-de-correo-de-la-metaconsola' into 'develop'
Ent 9992 [#9740] Introducir el botón de email test en la configuración de correo de la Metaconsola

See merge request artica/pandorafms!6901
2024-02-02 13:08:17 +00:00
Rafael Ameijeiras
fc2fa9b346 Merge branch 'ent-12149-comprobar-post_max_size' into 'develop'
Ent 12149 Comprobar post_max_size

See merge request artica/pandorafms!6906
2024-02-02 13:07:55 +00:00
Daniel Cebrian
da1c74e9db #12751 fixed path with spaces and vul 2024-02-02 14:04:37 +01:00
Daniel Cebrian
c6cb0c8747 #12810 changed text licensed in info status 2024-02-02 12:14:49 +01:00
Daniel Cebrian
3e40558443 #12810 fixed license_mode status 2024-02-02 10:55:57 +01:00
Daniel Cebrian
d8fdb22c89 #12810 change value status license in diagnostics 2024-02-02 10:47:36 +01:00
daniel
54e4b8dbfa new api 2.0 2024-02-02 09:15:00 +01:00
Rafael Ameijeiras
67bbaa311c Merge branch 'ent-12824-no-se-pueden-crear-agentes-manualmente-en-develop-775' into 'develop'
Ent 12824 No se pueden crear agentes manualmente en develop (775)

See merge request artica/pandorafms!6899
2024-02-01 16:37:10 +00:00
Rafael Ameijeiras
b114fa852f Merge branch 'ent-12790-se-meten-entities-al-crear-cv' into 'develop'
Ent 12790 se meten entities al crear cv

See merge request artica/pandorafms!6902
2024-02-01 16:36:36 +00:00
alejandro.campos@artica.es
05af441f19 minor fix 2024-02-01 17:36:21 +01:00
alejandro.campos@artica.es
44e546af39 minor fix 2024-02-01 17:34:42 +01:00
Diego Muñoz-Reja
774aa6a17b Merge branch 'ent-12746-No-se-puede-seleccionar-template-en-NCM' into 'develop'
fixed database ncm info

See merge request artica/pandorafms!6894
2024-02-01 16:02:10 +00:00
Diego Muñoz-Reja
83e6ad429d Merge branch 'ent-12794-no-se-puede-cambiar-pass-de-users-locales-con-autenticacion-externa' into 'develop'
Ent 12794 No se puede cambiar pass de users locales con autenticación externa

See merge request artica/pandorafms!6896
2024-02-01 15:07:33 +00:00