Commit Graph

38252 Commits

Author SHA1 Message Date
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
alejandro 061ba1fb2d redisign code, added oauth auth 2024-02-08 18:39:28 +01:00
Enrique Martin a41d420245 Fixed inverse import key 2024-02-08 17:47:28 +01:00
Enrique Martin ac016c4c9d Fixed policies export order 2024-02-08 17:36:05 +01:00
Enrique Martin 4e48142205 Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd 2024-02-08 17:33:55 +01:00
Enrique Martin 53964da048 Fixed inverse join key select 2024-02-08 17:33:30 +01:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Daniel Maya b68663b966 #12687 changes in sla_service 2024-02-08 17:01:49 +01:00
Enrique Martin 4ffba029c2 Fixed css issue with selctors 2024-02-08 16:21:07 +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 Maya 7a3bf1a13f #12687 changes in css 2 2024-02-08 15:50:49 +01:00
Daniel Maya cf3b8e7359 #12687 changes in css 2024-02-08 15:42:00 +01:00
daniel d7172a5308 new api 2.0 2024-02-08 15:32:58 +01:00
Jonathan 56e26ab3d5 #12695 wip removing warnings 2024-02-08 13:42:02 +01:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +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
Enrique Martin 86c33119c8 Updated welcome windows styles 2024-02-08 11:32:45 +01:00
alejandro.campos@artica.es 14ae2c5206 Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-08 11:06:58 +01:00
alejandro.campos@artica.es bf4786e8fb fix toggling log in linux agent 2024-02-08 10:22:20 +01:00
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
Daniel Maya 9844f95f16 #12350 resolved conflict 2024-02-08 09:19:13 +01:00
Daniel Maya b9d871cbd9 #12687 Changes in import dialog 2024-02-08 09:07:33 +01:00
artica 5acffa86d3 Auto-updated build strings. 2024-02-08 01:00:04 +01:00
Enrique Martin 9901dea9a0 Fixed services import when agent not found 2024-02-07 21:24:41 +01:00
Enrique Martin afb6892ef0 Remove only not ref keys in items creation 2024-02-07 19:32:08 +01:00
Enrique Martin 47c6b9c335 Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd 2024-02-07 18:26:51 +01:00
Enrique Martin 5d000a03d1 Improved import and export. Supported Array and CSV fields. 2024-02-07 18:26:22 +01:00
Daniel Maya b858527a31 #12687 Changes in export dialog 2024-02-07 16:45:11 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Daniel Cebrian cf12d9dfd0 #12525 added control for verify default emails in update manager 2024-02-07 16:29:39 +01:00
Daniel Maya 8675e60c9b #12687 Changes to the export name 2024-02-07 15:49:20 +01:00
daniel 510e8452cf new api 2.0 2024-02-07 15:44:53 +01:00
Daniel Cebrian f2a15061f0 #12783 check if module is use by agent for safe mode before delete 2024-02-07 15:39:23 +01:00
Daniel Maya 5bc20f9768 #12687 Added message prd 2024-02-07 15:01:53 +01:00
Daniel Cebrian 0d235f3b6d #12460 fixed deprecated 2024-02-07 13:17:39 +01:00
alejandro 32c8d23a93 update version and adding units in datastore modules 2024-02-07 13:05:57 +01:00
Daniel Maya af334e21be #12687 Added import prd 2 2024-02-07 12:13:50 +01:00
Jonathan 834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
Jonathan 499ea9b805 #12633 fix visuals errors 2024-02-07 09:21:42 +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
Enrique Martin 2421f07291 Included parse error message 2024-02-07 04:16:51 +01:00
Enrique Martin 59e53cc4cc Fixed PRD export process 2024-02-07 04:13:43 +01:00
Enrique Martin 3ce2c6ae3e Encoded SQL fields for queries 2024-02-07 03:13:52 +01:00
Enrique Martin ad0984d312 Removed values safe_output and safe_input 2024-02-07 02:53:31 +01:00
Enrique Martin f69b1af3bd Fixed export and import json formats 2024-02-07 02:18:39 +01:00
Enrique Martin 064393ed14 Fixed inverseRecursiveJoin 2024-02-07 01:37:31 +01:00
Enrique Martin 4139910167 Fixed tables crossed references and tables import order 2024-02-07 01:29:43 +01:00