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

35155 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 31ec1b8209 Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver 2023-07-24 13:49:28 +02:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop' 
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
 2023-07-24 10:54:24 +00:00
Rafael Ameijeiras db62d257df Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop' 
Ent 11716 text area plugin parameters se rompe si no anadimos espacios

See merge request artica/pandorafms!6244
 2023-07-24 10:52:56 +00:00
Rafael Ameijeiras 6c73fdf8af Merge branch 'ent-11135-mover-codigo-javascript-de-la-funcion-ui_print_datatable-a-archivo-js' into 'develop' 
Ent 11135 mover codigo javascript de la funcion ui print datatable a archivo js

See merge request artica/pandorafms!5852
 2023-07-24 10:44:18 +00:00
Rafael Ameijeiras d0e38a97df Merge branch 'ent-10752-mejora-usabilidad-ipam' into 'develop' 
Ent 10752 mejora usabilidad ipam

See merge request artica/pandorafms!5793
 2023-07-24 10:41:25 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Pablo Aragon ade275fb8f Merge branch 'develop' into ent-10752-mejora-usabilidad-ipam 2023-07-24 10:24:42 +02:00
Pablo Aragon 2a89a494cc 10640-Report task. Resolve conflict 2023-07-24 10:06:43 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
Félix Suárez 1fc1c0e9a4 Add current date to error logs without date 2023-07-23 17:02:26 -06:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
Jorge Rincon e979403a54 #11218 Fixed the icons of the policies adopted to the module 2023-07-21 15:33:50 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
slerena a1dcd52631 Upload New File 2023-07-20 11:18:45 +00:00
slerena eb70d65027 Upload New File 2023-07-20 11:18:32 +00:00
slerena 42f23e667b Upload New File 2023-07-20 11:18:18 +00:00
slerena 6cb4709539 Upload New File 2023-07-20 11:18:03 +00:00
slerena 7f3a90df37 Upload New File 2023-07-20 11:17:45 +00:00
slerena 86b91c48d7 Upload New File 2023-07-20 11:17:30 +00:00
slerena 8a66b41280 Upload New File 2023-07-20 11:17:06 +00:00
slerena 4d83071f1c Add new directory 2023-07-20 11:02:02 +00:00
miguel angel rasteu 9978bbe645 #11754 Add pagination 2023-07-20 09:42:09 +02:00
Rafael Ameijeiras 52b1887a19 Merge branch 'ent-9594-habilitar-arranque-de-agente-sf-para-linux-en-el-tar' into 'develop' 
Added systemd and sysvinit startup for pandora_agent_daemon

See merge request artica/pandorafms!6261
 2023-07-20 07:26:16 +00:00
artica 1f722998e6 Auto-updated build strings. 2023-07-20 01:01:06 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop' 
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
 2023-07-19 11:54:01 +00:00
Enrique Martin a9ae04cdc4 Added systemd and sysvinit startup for pandora_agent_daemon 2023-07-19 10:46:10 +02:00
Daniel Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
artica e645f65e8e Auto-updated build strings. 2023-07-19 01:00:45 +02:00
Rafael Ameijeiras 7a9629a4e5 Merge branch 'ent-11487-sunburst-no-muestra-elementos-en-su-interior' into 'develop' 
Ent 11487 sunburst no muestra elementos en su interior

See merge request artica/pandorafms!6257
 2023-07-18 12:35:01 +00:00
Daniel Rodriguez 3482ef7d8e Merge branch 'ent-11448-comportamiento-extrano-tras-cambios-del-ticket-https-brutus-artica-es-8081-artica' into 'develop' 
Ent-11448-comportamiento-extrano-tras-cambios-del-ticket-https-brutus-artica-es-8081-artica

See merge request artica/pandorafms!6124
 2023-07-18 10:41:22 +00:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop' 
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
 2023-07-18 10:14:29 +00:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Rafael Ameijeiras 2a03a9ae2f Merge branch 'ent-11296-problemas-merging-tool-y-cambios-en-el-instalador-online' into 'develop' 
11296 remove dependencies and add proxytimeout

See merge request artica/pandorafms!6194
 2023-07-18 08:03:19 +00:00
Rafael Ameijeiras ab94dbba4c Merge branch 'ent-9785-14479-widgets-en-dashboard-no-se-actualizan-de-forma-recursiva-con-el-borrado-de-agentes' into 'develop' 
Clean deleted agents from dashboards, reports, etc

See merge request artica/pandorafms!6171
 2023-07-18 08:01:49 +00:00
Rafael Ameijeiras 36d9f6bb37 Merge branch 'ent-11737-sale-mensaje-php-update-required-solo-en-ubuntu' into 'develop' 
Ent 11737 sale mensaje php update required solo en ubuntu

See merge request artica/pandorafms!6255
 2023-07-18 07:55:42 +00:00
Daniel Cebrian 092e1dfd62 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:46:19 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop' 
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
 2023-07-18 05:30:04 +00:00
artica 20e05f677e Auto-updated build strings. 2023-07-18 01:01:01 +02:00
Calvo 24b555da87 Optimize pandora_db iterations when possible 2023-07-17 16:31:40 +02:00
Daniel Maya a0dc60a49f #11493 Added png 2023-07-17 14:57:54 +02:00
Daniel Cebrian 8aaa98a741 #10254 added message timeout 2023-07-17 14:10:08 +02:00
Rafael Ameijeiras a8597e1cb4 Merge branch 'ent-11735-listado-de-modulos-rotos-en-develop' into 'develop' 
Ent 11735 listado de modulos rotos en develop

See merge request artica/pandorafms!6254
 2023-07-17 12:09:09 +00:00
Rafael Ameijeiras 9ad7ea0d6f Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop' 
Ent 11420 botones incorrectos en config remota del servidor

See merge request artica/pandorafms!6035
 2023-07-17 11:12:17 +00:00
miguel angel rasteu 567bfdcbb7 #11737 Fix version 2023-07-17 13:08:13 +02:00
Calvo d3fded0fa8 Deleted missing Dumper 2023-07-17 12:02:48 +02:00