tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,458 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21170 Commits

Author SHA1 Message Date
Daniel Cebrian 09880cadf1 #12999 fixed modal resize 2024-03-07 17:58:56 +01:00
Daniel Maya 966177e8f2 #12984 Fixed importPrd 2024-03-07 17:20:38 +01:00
Rafael Ameijeiras 17f045b2bc Merge branch 'ent-12989-opcion-de-csv-en-recon-task-aparece-descolocada' into 'develop' 
Ent 12989 opcion de csv en recon task aparece descolocada

See merge request artica/pandorafms!6995
 2024-03-07 15:41:12 +00:00
Daniel Maya e94f7e2c59 #12989 Fixed network csv 2 2024-03-07 16:20:17 +01:00
Rafael Ameijeiras c5c92411c9 Merge branch 'ent-11089-crear-el-modo-disabled-para-el-satelite' into 'develop' 
Add agent_disabled functionality

See merge request artica/pandorafms!6994
 2024-03-07 13:56:28 +00:00
Daniel Cebrian c269d4280a #12994 fixed message error in ajax when historical database is down 2024-03-07 13:55:35 +01:00
Daniel Cebrian 1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
Daniel Maya a1bab17ee5 #12989 Fixed network csv 2024-03-07 11:08:35 +01:00
artica 0cde0a5820 Auto-updated build strings. 2024-03-07 01:00:05 +01:00
Félix Suárez 747a63a2ba Add agent_disabled functionality 2024-03-06 09:41:48 -06:00
Daniel Maya b4433e533f #12991 Restored tatctical view 2024-03-06 15:53:04 +01:00
Rafael Ameijeiras d3f931703b Merge branch 'ent-12630-guardia-15143-problemas-con-cifrado-de-contrasenas-smtp' into 'develop' 
Ent 12630 guardia 15143 problemas con cifrado de contrasenas smtp

See merge request artica/pandorafms!6753
 2024-03-06 08:42:13 +00:00
artica f7e31eb92e Auto-updated build strings. 2024-03-06 01:00:04 +01:00
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop' 
visual changes in demo view

See merge request artica/pandorafms!6916
 2024-03-05 07:59:04 +00:00
artica 6bd35b445b Auto-updated build strings. 2024-03-05 01:00:05 +01:00
Matias Didier 53c69af205 Merge branch 'ent-12922-fallos-en-vista-de-grupos-tactical-view' into 'develop' 
Ent 12922 Fallos en Vista de grupos tactical view

See merge request artica/pandorafms!6966
 2024-03-04 12:13:58 +00:00
Daniel Cebrian ecf2765a1c #12968 Disabled delete events when module is deleted. 2024-03-04 12:18:21 +01:00
artica 4acb8f1efd Auto-updated build strings. 2024-03-04 01:00:04 +01:00
artica 290cdd75ac Auto-updated build strings. 2024-03-03 01:00:04 +01:00
artica 2dbe83f1be Auto-updated build strings. 2024-03-02 01:00:06 +01:00
Daniel Rodriguez 44ae109889 Merge branch 'ent-12019-api-2-0' into 'develop' 
new api 2.0

See merge request artica/pandorafms!6845
 2024-03-01 10:21:10 +00:00
artica 3d4202b8d6 Auto-updated build strings. 2024-03-01 01:00:05 +01:00
Rafael Ameijeiras ef8d2cf63c Merge branch 'ent-12943-guardia17145-error-sql-al-hacer-click-en-las-columnas-del-inventario' into 'develop' 
Ent 12943 [GUARDIA][#17145]Error SQL al hacer click en las columnas del inventario.

See merge request artica/pandorafms!6971
 2024-02-29 08:11:25 +00:00
artica 6f808edea0 Auto-updated build strings. 2024-02-29 01:00:05 +01:00
Daniel Maya 24161241fb #12952 Fixed check nfdump 2024-02-28 15:33:37 +01:00
Daniel Cebrian 70818c40b1 #12943 fixed metaconsole inventory 2024-02-28 14:22:57 +01:00
Jonathan 3240c9e44c Merge branch 'develop' into ent-12594-mejorar-vista-de-scheduled-reports 2024-02-28 14:20:12 +01:00
alejandro.campos@artica.es 935e41fe08 visual fix 2024-02-28 11:15:42 +01:00
Rafael Ameijeiras 708b81601a Merge branch 'ent-12945-17144-API-externa-event-custom-id-no-funciona-en-Meta' into 'develop' 
Ent 12945 17144 api externa event custom id no funciona en meta

See merge request artica/pandorafms!6969
 2024-02-28 08:40:42 +00:00
artica 481ba2794e Auto-updated build strings. 2024-02-28 01:00:06 +01:00
Jonathan b4ad2b7584 #12594 schedule view 2024-02-27 19:15:50 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
artica 6344e2544b Auto-updated build strings. 2024-02-27 01:00:05 +01:00
Rafael Ameijeiras cf517cd963 Merge branch 'ent-12938-File-manager-no-funciona-correctamente' into 'develop' 
Ent 12938 file manager no funciona correctamente

See merge request artica/pandorafms!6967
 2024-02-26 16:29:19 +00:00
Daniel Cebrian 293bb5c2fe #12943 fixed inventory filter 2024-02-26 15:08:08 +01:00
alejandro.campos@artica.es e84b522dff fix api call 2024-02-26 14:42:42 +01:00
alejandro.campos@artica.es af23275f5d fix api call 2024-02-26 14:41:09 +01:00
alejandro.campos@artica.es 11a3d1f0c4 fix filemanager 2024-02-26 12:56:55 +01:00
alejandro.campos@artica.es e3f9d53775 fix filemanager 2024-02-26 12:55:17 +01:00
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop' 
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
 2024-02-26 11:51:37 +00:00
Rafael Ameijeiras 81d937ae30 Merge branch 'ent-12768-16921-operator-read-puede-ver-inventario-de-todos-los-grupos' into 'develop' 
Ent 12768 16921 operator read puede ver inventario de todos los grupos

See merge request artica/pandorafms!6853
 2024-02-26 11:50:52 +00:00
Daniel Cebrian 29a42375f2 #12922 fixed status agent in tactical view group 2024-02-26 12:00:50 +01:00
artica bd8711883b Auto-updated build strings. 2024-02-26 01:00:04 +01:00
artica 4bb932732b Auto-updated build strings. 2024-02-25 01:00:03 +01:00
artica c44632a0e0 Auto-updated build strings. 2024-02-24 01:00:05 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
alejandro.campos@artica.es 06107f4773 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-23 10:24:26 +01:00
artica 421598df6b Auto-updated build strings. 2024-02-23 01:00:05 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop' 
Ent 12497 usabilidad implementar boton mas operaciones

See merge request artica/pandorafms!6955
 2024-02-22 16:20:13 +00:00
alejandro.campos@artica.es 77dd8b1fb9 minor fixes 2024-02-22 15:07:18 +01:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00
Matias Didier 9e312890bd Merge branch 'ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode' into 'develop' 
Ent 12783 Errores al borrar módulos que se usan en Safe operation mode

See merge request artica/pandorafms!6921
 2024-02-22 14:03:32 +00:00
Jonathan f36ea56ad7 #12497 css dots 2024-02-22 13:34:53 +01:00
Jonathan 9082fbf798 #12621 tips and size window 2024-02-22 10:49:57 +01:00
Jonathan 260fcfe62b #12695 remove warnings 2024-02-22 10:07:47 +01:00
artica 887a862783 Auto-updated build strings. 2024-02-22 01:00:05 +01:00
Jonathan 50187a8c15 #12695 wip remove warnings 2024-02-21 17:07:25 +01:00
Rafael Ameijeiras 40d612f22a Merge branch 'ent-12883-Widget-general-visual-maps-report-aparecen-entities' into 'develop' 
fix entities

See merge request artica/pandorafms!6938
 2024-02-21 15:24:28 +00:00
Matias Didier 2f6a95dea5 Merge branch 'ent-12909-guardia17097-campos-pluginserver-no-se-guardan-en-politicas-772-3' into 'develop' 
Ent 12909 [GUARDIA][#17097] Campos pluginserver no se guardan en políticas 772.3.

See merge request artica/pandorafms!6954
 2024-02-21 12:36:42 +00:00
alejandro.campos@artica.es 8f02fe3d62 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-21 10:30:20 +01:00
alejandro.campos@artica.es 7773967c71 move mr 2024-02-21 10:11:37 +01:00
alejandro.campos@artica.es 1991b74b9b Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-21 10:05:11 +01:00
Rafael Ameijeiras 6d3c88efc0 Merge branch 'ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas' into 'develop' 
Ent 12524 giss problemas para abrir elementos en nuevas pestañas vista monitores y alertas

See merge request artica/pandorafms!6720
 2024-02-21 07:59:15 +00:00
artica 52d52ef924 Auto-updated build strings. 2024-02-21 01:00:07 +01:00
Jonathan c725624dcb #12621 style tips dialogs 2024-02-20 16:16:48 +01:00
Jonathan 51e7d2d423 #12497 dots 2024-02-20 12:54:35 +01:00
Rafael Ameijeiras f570e25e5d Merge branch 'ent-12633-errores-visuales-en-la-funcionalidad-graph-analytics' into 'develop' 
Ent 12633 errores visuales en la funcionalidad graph analytics

See merge request artica/pandorafms!6918
 2024-02-20 08:02:32 +00:00
artica c513ab5ef2 Auto-updated build strings. 2024-02-20 01:00:05 +01:00
Jonathan bb6e8194f9 #12633 fix z-index bug drag graph analytics 2024-02-19 16:08:54 +01:00
Jonathan 94d12d9010 #12633 fix z-index for graph analytics 2024-02-19 14:11:50 +01:00
Daniel Cebrian 9f000fcc35 #12909 fixed macros plugin in policies 2024-02-19 12:47:15 +01:00
Jonathan 68ff17ebf4 Merge branch 'develop' into ent-12633-errores-visuales-en-la-funcionalidad-graph-analytics 2024-02-19 12:10:11 +01:00
artica bdb51228ac Auto-updated build strings. 2024-02-19 01:00:02 +01:00
artica 6128f28f5e Auto-updated build strings. 2024-02-18 01:00:03 +01:00
artica 1444f3020a Auto-updated build strings. 2024-02-17 01:00:04 +01:00
Jonathan 52bad466ed Merge branch 'develop' into ent-12621-meter-tips-de-ayuda-en-la-interfaz 2024-02-16 11:24:56 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
Daniel Maya ef3bfb35f0 #12350 resolved conflict 2024-02-16 09:25:55 +01:00
Daniel Maya 12eca2dbd4 #12350 added agent name editing 3 2024-02-16 09:14:34 +01:00
artica 7ef9e60b15 Auto-updated build strings. 2024-02-16 01:00:05 +01:00
Daniel Cebrian af0f8a4fc4 #11634 updated url in console supervisor 2024-02-15 16:40:18 +01:00
Daniel Cebrian cc43ab26db #11634 deleted ha legacy 2024-02-15 16:25:11 +01:00
Jonathan 5dd9acb02b #12524 disable auto start alerts 2024-02-15 13:54:14 +01:00
Rafael Ameijeiras 80991a32f9 Merge branch 'ent-12884-item-module-histogram-graph' into 'develop' 
Ent 12884 Item "module histogram graph"

See merge request artica/pandorafms!6939
 2024-02-15 12:07:05 +00:00
Rafael Ameijeiras 86b52d6c70 Merge branch 'ent-12877-17061-comentario-de-evento-no-se-actualiza-al-cambiar-pestanas' into 'develop' 
Ent 12877 [#17061] Comentario de evento no se actualiza al cambiar pestañas

See merge request artica/pandorafms!6929
 2024-02-15 08:28:57 +00:00
Rafael Ameijeiras 62ce18e4dc Merge branch 'ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida' into 'develop' 
Net scan improvements

See merge request artica/pandorafms!6908
 2024-02-15 08:28:12 +00:00
Rafael Ameijeiras f28808f246 Merge branch 'ent-12864-actualizar-libreria-halfpastfouram-de-php' into 'develop' 
Ent 12864 Actualizar librería halfpastfouram de PHP

See merge request artica/pandorafms!6932
 2024-02-15 08:27:44 +00:00
Rafael Ameijeiras 28c71386e8 Merge branch 'ent-12870-Problemas-de-llenado-de-logs-con-pandora-gotty' into 'develop' 
prevent warnings

See merge request artica/pandorafms!6937
 2024-02-15 08:25:17 +00:00
Rafael Ameijeiras 6aab32bb42 Merge branch 'ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola' into 'develop' 
not show servers in metaconsole pandora_enterprise#12178

See merge request artica/pandorafms!6793
 2024-02-15 08:22:11 +00:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
artica e2d3fafda9 Auto-updated build strings. 2024-02-15 01:00:05 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
alejandro.campos@artica.es 5dbf868460 fix entities 2024-02-14 17:37:10 +01:00
Daniel Cebrian 30893762a3 #12884 fixed histogram-graph 2024-02-14 16:58:52 +01:00
Matias Didier 8d3a7e6a7f Merge branch 'ent-12871-16045-16060-Busquedas-eventos-con-2-espacios-no-muestra-resultados' into 'develop' 
search collapsing whitespaces

See merge request artica/pandorafms!6936
 2024-02-14 14:52:27 +00:00
alejandro.campos@artica.es f9ffde3253 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-14 14:21:53 +01:00
alejandro.campos@artica.es b00bb507b6 fix entities 2024-02-14 14:02:31 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
Matias Didier 5ff738eec4 Merge branch 'ent-12879-problema-con-validacion-acl' into 'develop' 
Ent 12879 Problema con validación ACL

See merge request artica/pandorafms!6935
 2024-02-14 10:55:28 +00:00
alejandro.campos@artica.es 3bb61d22f9 prevent warnings 2024-02-14 11:25:31 +01:00
alejandro.campos@artica.es a5759524a1 prevent warnings 2024-02-14 11:22:22 +01:00
Enrique Martin 4ab6b29bef Added references to netwflow filters reports 2024-02-14 10:41:29 +01:00
artica a1a515c9a6 Auto-updated build strings. 2024-02-14 01:00:04 +01:00
Enrique Martin 73c33c15fd FIxed demo data PRDs import 2024-02-14 00:48:10 +01:00
Enrique Martin e80c88214f Improved base64 check for fields 2024-02-13 21:24:50 +01:00
Enrique Martin a41eae8b5c Fixed several items import and export 2024-02-13 20:13:58 +01:00
Enrique Martin 3159c4a50a Fixed several report items import 2024-02-13 19:45:29 +01:00
alejandro.campos@artica.es c7de5a1eba search collapsing whitespaces 2024-02-13 18:28:20 +01:00
Daniel Cebrian d10133e116 #12864 fixed deprecated 2024-02-13 17:21:02 +01:00
Jonathan da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Daniel Cebrian d471845178 Merge branch 'ent-12195-15835-Safe-operation-mode-habilita-modulos-deshabilitados-en-los-modulos-al-recuperarse' into ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode 2024-02-13 16:12:59 +01:00
Daniel Cebrian a432ae4d2d #12879 fixed problem with validation acl in delete group 2024-02-13 15:58:54 +01:00
Enrique Martin 85315fab60 Fixed JSON values import and export for dashboards and autocreate eval 2024-02-13 15:22:37 +01:00
Enrique Martin 23bd170ff0 Fixed JSON values import and export for dashboards 2024-02-13 15:15:10 +01:00
Enrique Martin c7d61902fb Fixed JSON values import and export for dashboards 2024-02-13 15:00:46 +01:00
Enrique Martin 9733ac8717 Set consecutive keys for dashboard items array. Fix JS error when printing imported dashboard 2024-02-13 11:53:35 +01:00
Enrique Martin 57b50e4c85 Fixed skip items creations 2024-02-13 10:43:44 +01:00
Daniel Maya 5a73d708e0 #12872 Fixed gis 2024-02-13 10:37:17 +01:00
Enrique Martin 59020ea572 Fixed skip items creations 2024-02-13 10:36:55 +01:00
Jonathan 7f580cc388 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-13 09:42:00 +01:00
alejandro.campos@artica.es 8ff87ec93a Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-13 09:36:36 +01:00
Rafael Ameijeiras 76a4df9a07 Merge branch 'ent-12859-17048-alc-enterprise-no-filtra-correctamente-en-dashboards' into 'develop' 
Ent 12859 17048 alc enterprise no filtra correctamente en dashboards

See merge request artica/pandorafms!6926
 2024-02-13 08:19:15 +00:00
artica 58aabef5ce Auto-updated build strings. 2024-02-13 01:00:05 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
Daniel Cebrian e5139436ab #12877 fixed reload comments 2024-02-12 17:19:50 +01:00
Daniel Maya a43b2b1c59 #12687 Initialize result 2024-02-12 15:27:56 +01:00
daniel c6a662a070 fix reload server update to license pandora_enterprise#12178 2024-02-12 14:58:00 +01:00
alejandro.campos@artica.es 405f15f9f0 minor fixes 2024-02-12 13:52:45 +01:00
Daniel Maya e8bd4b9e6b #12859 Fixed groups 2024-02-12 13:02:11 +01:00
daniel d5b780ee99 fix visual errors servers notification pandora_enterprise#12178 2024-02-12 12:42:54 +01:00
Daniel Maya 15382049b8 #12687 Fixed delete file 2024-02-12 10:35:01 +01:00
daniel 45ffdb1cc5 fix visual errors not working servers pandora_enterprise#12178 2024-02-12 10:34:43 +01:00
daniel 639fbcc807 Merge remote-tracking branch 'origin/develop' into ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola 2024-02-12 09:51:56 +01:00
daniel 0f6fab06fb new api 2.0 2024-02-12 09:49:44 +01:00
Enrique Martin d382ca4066 Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida 
Conflicts:
	pandora_console/extras/mr/68.sql
 2024-02-12 09:29:28 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
artica b4c8e81e86 Auto-updated build strings. 2024-02-12 01:00:03 +01:00
artica 4b850ff733 Auto-updated build strings. 2024-02-11 01:00:04 +01:00
artica f5ccba67dc Auto-updated build strings. 2024-02-10 01:00:05 +01:00
alejandro.campos@artica.es ecfef0da29 several changes 2024-02-09 18:48:32 +01:00
Enrique Martin 2f24344025 Removed temporal comment 2024-02-09 15:16:48 +01:00
Enrique Martin 07ec59290b Added info messages to import output 2024-02-09 15:11:47 +01:00
Enrique Martin b2df1b3529 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-09 13:56:21 +01:00
Enrique Martin 63b2541e61 Fixed get values from references and viceversa 2024-02-09 13:55:53 +01:00
Jonathan d590961e69 #12695 wip removing warnings 2024-02-09 13:51:56 +01:00
daniel 6a7dd0de9b new api 2.0 2024-02-09 10:53:32 +01:00
alejandro.campos@artica.es df8c14864c improvements 2024-02-09 10:37:04 +01:00
Rafael Ameijeiras 140ed1c304 Merge branch 'ent-12321-widget-mapa-gis' into 'develop' 
Ent 12321 widget mapa gis

See merge request artica/pandorafms!6835
 2024-02-09 09:23:42 +00:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
Daniel Maya 5b0f330491 #12687 changes in css 3 2024-02-09 10:08:54 +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
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 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
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +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
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +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 Cebrian 0d235f3b6d #12460 fixed deprecated 2024-02-07 13:17:39 +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 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
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 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