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 |
|
artica
|
4912a4051f
|
Auto-updated build strings.
|
2024-02-07 01:00:50 +01:00 |
|
Enrique Martin
|
e0d1352201
|
Get result, errors, items. Fix create items function.
|
2024-02-06 20:28:43 +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 |
|
Daniel Maya
|
d308aa6822
|
#12687 Added import
|
2024-02-06 16:02:37 +01:00 |
|
Enrique Martin
|
bff917bdaf
|
Remove console.log() entries
|
2024-02-06 15:30:39 +01: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 |
|
Jonathan
|
f869c18b69
|
#12843 fix node db update massive
|
2024-02-06 10:57:26 +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 |