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
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
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
artica 7dc0acf6da Auto-updated build strings. 2024-02-06 01:00:25 +01:00
Enrique Martin 269a9134bb Added net scan options to welcome wizard 2024-02-06 00:09:03 +01:00
Enrique Martin f00e491738 Fix merge issues 2024-02-05 23:30:35 +01:00
Enrique Martin d1c6c9843b Added net scan options to welcome wizard 2024-02-05 23:26:55 +01:00
Jonathan 59fd298215 #12845 fix styles events 2024-02-05 17:24:52 +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
Jonathan 21fe027a62 #12488 tips window move for clicks 2024-02-05 14:34:43 +01:00
artica 64f6825d65 Auto-updated build strings. 2024-02-05 09:21:33 +01:00
Jonathan 3ea38c0455 #12621 dialog tips css 2024-02-05 08:43:26 +01:00
daniel b80f7bdeb1 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-05 08:05:45 +01: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
Jonathan 4c617acefc #12621 dialog tips on click 2024-02-02 13:43:04 +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
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
Daniel Cebrian 64698c4951 #12149 upload max file size in about and diagnostic info 2024-02-01 15:38:52 +01:00
Daniel Cebrian 48d7a63eb1 #12149 added post_max_size notification 2024-02-01 14:54:23 +01:00
Daniel Maya 688f235c6b #12687 Fixed export with json_ref 2 2024-02-01 10:48:34 +01:00
daniel 8bf414b51f Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-01 07:52:52 +01:00
Jonathan eecf92657a #12790 remove entities only name 2024-01-31 17:02:02 +01:00
Daniel Cebrian 5feb11c547 9992 added email test dialog in metaconsole 2024-01-31 16:34:25 +01:00
Rafael Ameijeiras 2daa6f1e87 Merge branch 'ent-12797-error-select2-javascript-discovery' into 'develop' 
Ent 12797 error select2 javascript discovery

See merge request artica/pandorafms!6892
 2024-01-31 14:06:36 +00:00
Rafael Ameijeiras 8d45692b76 Merge branch 'ent-9757-anadir-escalado-de-estados-a-api-y-cli' into 'develop' 
Add warning time to CLI create

Closes pandora_enterprise#9757

See merge request artica/pandorafms!6815
 2024-01-31 14:06:07 +00:00
daniel 80b9fc9af1 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-31 14:22:59 +01:00
daniel 0d87b18898 new api 2.0 2024-01-31 13:17:46 +01:00
daniel 280e5e5a97 new api 2.0 2024-01-31 11:56:11 +01:00
Daniel Maya 9337cc28e7 #12687 added recursive function 2024-01-31 11:41:20 +01:00
Diego Muñoz-Reja 1980b36c17 Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop' 
Ent 11165 Añadir info de whois de una IP dada en Netflow explorer

See merge request artica/pandorafms!6827
 2024-01-31 09:14:44 +00:00
Matias Didier 66eda7368d Merge branch 'ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada' into 'develop' 
Ent 12034 Enlace público de dashboard que ha sido borrado no muestra nada

See merge request artica/pandorafms!6828
 2024-01-31 08:21:45 +00:00
Daniel Maya 7acd687b9b #12687 Fixed export with json_ref 2024-01-31 09:21:27 +01:00
Daniel Maya a83577d1a8 #12687 Added import/export prd 4 2024-01-30 17:34:37 +01:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
daniel 10ee8f572a Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-30 16:27:58 +01:00
daniel 3c3ff1a2e6 new api 2.0 2024-01-30 16:27:02 +01:00
Daniel Cebrian 2531de8cb0 #12034 fixed page not access when dashboard is deleted 2024-01-30 14:58:04 +01:00
Jonathan f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Rafael Ameijeiras 35b5644f9c Merge branch 'ent-12789-busqueda-por-regex-funciona-mal' into 'develop' 
Ent 12789 Búsqueda por regex funciona mal

See merge request artica/pandorafms!6889
 2024-01-30 13:52:57 +00:00
Daniel Cebrian b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
daniel df1d2675ed Merge remote-tracking branch 'origin' into ent-12019-api-2-0 2024-01-30 08:13:47 +01:00
Daniel Maya e07d89883f #12687 Added import/export prd 3 2024-01-29 17:38:01 +01:00
Daniel Cebrian 22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
daniel 7adf296b0f new api 2.0 2024-01-29 16:37:49 +01:00
Rafael Ameijeiras 813deba7a5 Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop' 
Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
 2024-01-29 15:20:27 +00:00
daniel b3dd6cbb4c new api 2.0 2024-01-29 16:09:08 +01:00
Matias Didier 8269f5fcc6 Merge branch 'ent-11014-codigo-qr-en-user-detail-editor-mantiene-fija-su-posicion-mientras-se-redimensiona-ventana' into 'develop' 
Ent 11014 codigo qr en user detail editor mantiene fija su posicion mientras se redimensiona ventana

See merge request artica/pandorafms!6415
 2024-01-29 14:01:15 +00:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop' 
fix filter bug

See merge request artica/pandorafms!6761
 2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Matias Didier a2ea701ef0 Merge branch 'ent-12623-edicion-de-inventory-modules-se-despista-con-el-menu-principal' into 'develop' 
Ent 12623 edicion de inventory modules se despista con el menu principal

See merge request artica/pandorafms!6876
 2024-01-29 12:15:49 +00:00
Daniel Rodriguez 3db0090c0e Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop' 
implement several changes in top-n connection report item

See merge request artica/pandorafms!6833
 2024-01-29 11:14:58 +00:00
Rafael Ameijeiras c1b74ab7f0 Merge branch 'ent-12267-dashboard-mejora-del-widget-de-module-status' into 'develop' 
add new filters widget modules status pandora_enterprise#12267

See merge request artica/pandorafms!6734
 2024-01-29 09:33:56 +00:00
Rafael Ameijeiras 8bb2b46c48 Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop' 
fix missing fields

See merge request artica/pandorafms!6766
 2024-01-29 09:32:50 +00:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop' 
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
 2024-01-29 09:30:55 +00:00
daniel daa2a09e82 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-29 10:24:54 +01:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' 
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
 2024-01-26 13:42:59 +00:00
Diego Muñoz-Reja 04126c2407 Merge branch 'ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql' into 'develop' 
add tables merge process pandora_enterprise#12352

See merge request artica/pandorafms!6722
 2024-01-26 12:27:59 +00:00
alejandro.campos@artica.es 2ba5dd767d visual changes in demo view 2024-01-26 12:41:32 +01:00
daniel bfca07dbd1 Merge remote-tracking branch 'origin/develop' into ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola 2024-01-26 10:30:24 +01:00
daniel 65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
daniel b84d2aeec9 Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
 2024-01-26 08:10:07 +01:00
artica c5cefb3c13 Auto-updated build strings. 2024-01-26 01:00:30 +01:00
alejandro.campos@artica.es 18cb14bec6 minor fixes 2024-01-25 16:03:48 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
daniel f1e3328f37 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/include/constants.php
 2024-01-25 15:46:40 +01:00
daniel 375c2879f6 new api 2.0 2024-01-25 15:44:50 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' 
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
 2024-01-25 14:00:56 +00:00
Rafael Ameijeiras b271cff73e Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop' 
Ent 12754 widget modules by status bug al filtrar por estados

See merge request artica/pandorafms!6858
 2024-01-25 13:58:02 +00:00
daniel cb367985ba Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-25 08:20:11 +01:00
daniel a8fc9c767d new api 2.0 2024-01-25 08:19:49 +01:00
artica 8bbfa2803f Auto-updated build strings. 2024-01-25 01:00:29 +01:00
Diego Muñoz-Reja 077252d9cb Merge branch 'ent-11605-item-weekly-sla-mete-salto-de-pagina-si-el-siguiente-elemento-es-del-mismo-tipo-aunque-haya' into 'develop' 
quit pagebreak pandora_enterprise#11605

See merge request artica/pandorafms!6737
 2024-01-24 13:41:00 +00:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Maya 401b1973be #12687 Added import/export prd 2 2024-01-24 12:15:16 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
daniel b35af80afb new api 2.0 2024-01-24 09:23:01 +01:00
Rafael Ameijeiras 5dc0e35be8 Merge branch 'ent-12753-os-command-injection' into 'develop' 
Ent 12753 OS Command Injection

See merge request artica/pandorafms!6868
 2024-01-24 08:15:58 +00:00
Daniel Cebrian 4fc3013cc3 #12522 fixed multiple audit when update setup 2024-01-24 09:15:32 +01:00
artica dd252daaf2 Auto-updated build strings. 2024-01-24 01:00:32 +01:00
Daniel Cebrian 7f604f0c8d #12460 fixed deprecated 2024-01-23 17:47:26 +01:00
daniel 2a46720b80 new api 2.0 2024-01-23 17:21:02 +01:00
Daniel Cebrian 538177c3e5 #12753 fixed vul command in ajax 2024-01-23 17:08:06 +01:00
daniel a11ebc6a57 new api 2.0 2024-01-23 17:02:23 +01:00
Rafael Ameijeiras e1478f61e5 Merge branch 'ent-12364-vista-de-logs-filtro-para-agentes-y-sources' into 'develop' 
Ent 12364 vista de logs filtro para agentes y sources

See merge request artica/pandorafms!6855
 2024-01-23 15:46:03 +00:00
Rafael Ameijeiras d2bdbc9e42 Merge branch 'ent-12767-passwords-de-ldap-no-se-pueden-visualizar' into 'develop' 
Ent 12767 passwords de ldap no se pueden visualizar

See merge request artica/pandorafms!6856
 2024-01-23 15:45:23 +00:00
Rafael Ameijeiras b019abbb97 Merge branch 'ent-12782-vista-de-eventos-se-ve-feo-la-paginacion-en-una-pantalla-de-1300px-de-ancho' into 'develop' 
Ent 12782 Vista de eventos: se ve feo la paginacion en una pantalla de 1300px de ancho

See merge request artica/pandorafms!6871
 2024-01-23 15:44:49 +00:00
Matias Didier a93c9985ec Merge branch 'ent-12792-error-500-en-inventario-al-cambiar-de-agente' into 'develop' 
Ent 12792 error 500 en inventario al cambiar de agente

See merge request artica/pandorafms!6877
 2024-01-23 14:43:51 +00:00
Matias Didier e47b8eb364 Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop' 
Ent 12323 Campo para configurar rotado de netflow_interval

See merge request artica/pandorafms!6824
 2024-01-23 12:51:28 +00:00
daniel 62b03c05cd Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-23 13:05:24 +01:00
daniel 3c68356b81 new api 2.0 2024-01-23 13:04:44 +01:00
Matias Didier 1cce0a3cea Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop' 
Ent 12777 export qr mete html encoding

See merge request artica/pandorafms!6865
 2024-01-23 11:23:33 +00:00