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

411 Commits

Author SHA1 Message Date
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
fbsanchez 6756c16c35 Added correlation server to server list 2021-09-02 12:21:31 +02:00
fbsanchez 4d2f9fb4c9 missing messages 2021-06-25 12:54:14 +02:00
fbsanchez 81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
fbsanchez b032beb559 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-16 17:27:06 +02:00
Daniel Barbero Martin c6877154fb Wip command center, Plugins in meta 2021-06-16 17:26:19 +02:00
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
Daniel Barbero Martin 5b1498e08c Wip command center, Plugins in meta 2021-06-15 17:40:48 +02:00
Daniel Barbero Martin 64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Maya 1d472ec480 #7455 Fixed check_process 2021-04-29 08:55:16 +02:00
Daniel Maya 6a9dff3355 Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista 2021-03-18 16:00:14 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Maya 0b722f3b62 Fixed master server 2021-01-29 14:02:35 +01:00
Daniel Rodriguez 485220a527 Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop' 
implemented new server file editor

See merge request artica/pandorafms!3495
 2021-01-25 10:17:35 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop' 
fixed security vulnerability

See merge request artica/pandorafms!3591
 2020-12-02 17:16:05 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop' 
Added server component status - crash -

See merge request artica/pandorafms!3547
 2020-11-04 16:39:28 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Marcos Alconada f8511de008 fixed error 6495 2020-10-29 16:39:00 +01:00
fbsanchez ea87392bc1 minor fix 2020-10-21 17:03:46 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
alejandro-campos 3956fb1d2f implemented new server file editor 2020-10-01 17:39:34 +02:00
Daniel Maya db452f41f5 Added trim in address 2020-06-26 10:11:41 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez a7c783242d Remaining stuff 2020-03-30 12:51:52 +02:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Daniel Maya a7fdd4cc20 change in metaconsole advanced setup 2020-03-11 16:21:25 +01:00
alejandro-campos 8b6c1261a9 change order of form port input 2020-01-15 15:37:42 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Alejandro Fraguas 7b97855dd7 Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop' 
Fixed file.png in plugin

See merge request artica/pandorafms!2725
 2019-12-23 17:10:56 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Jose Gonzalez 5ffa93bb25 Modified character for string fusion 2019-10-11 13:49:19 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
Daniel Maya 482037b378 Fixed file.png in plugin 2019-09-12 15:28:32 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
Alejandro Fraguas 9ea7ac0859 Merge branch 'ent-4080-nombre-agente-lista-modulos' into 'develop' 
Modified agent alias name

See merge request artica/pandorafms!2556
 2019-07-15 13:02:37 +02:00
fbsanchez 7c8cb75faf WIP discovery agent deployment 2019-07-11 13:25:29 +02:00
Jose Gonzalez 03edb75b7c Modified agent alias name 2019-06-27 17:19:48 +02:00
Jose Gonzalez 411e62fb0d Changed link to Discovery task list and added ui_get_full_url function over other links 2019-06-27 16:38:00 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
Daniel Rodriguez 63eca254f6 Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop' 
changed title plugin creation to plugin registration

See merge request artica/pandorafms!2358
 2019-06-25 14:25:34 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez ddf3b7a258 Review 1 2019-06-03 11:21:44 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts 
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
 2019-05-14 11:11:27 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
marcos.alconada 2bafba0764 Se añade el contenido del fichero borrado 
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
 2019-04-23 17:40:49 +02:00
marcos.alconada fb87b97cd4 Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola 
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
 2019-04-17 15:12:56 +02:00
marcos.alconada 553ec48f54 changed title plugin creation to plugin registration 
Former-commit-id: bd5ee299d91c52d3064eafa85b092b525b70381a
 2019-04-15 15:21:07 +02:00
Marcos Alconada 8c27411be6 Delete plugin.php 
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
 2019-04-15 15:18:22 +02:00
marcos.alconada a3787c687c prueba 
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
 2019-04-15 15:10:43 +02:00
Luis Calvo 6276936e1d Added info message 
Former-commit-id: 11f4c9c8b52f6ef3bed2236534010f2caa3bb8e0
 2019-04-10 17:51:50 +02:00
Luis Calvo 5998b30a16 Added css hint to discovery tasks when task list is empty 
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
 2019-04-10 17:30:35 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side 
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
 2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
 2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707 
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
 2019-03-27 17:03:55 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
 2019-03-27 12:11:23 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them 
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
 2019-03-26 15:42:33 +01:00
fbsanchez 05c03d2d46 NetworkMap class 
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
 2019-03-20 17:22:06 +01:00
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
 2019-03-12 13:07:12 +01:00
daniel 560c6090a4 deprecated files 
Former-commit-id: e5c9fb8f58ee78207514d045b478f5d534d86f89
 2019-03-07 11:13:44 +01:00
daniel db150470cb fixed errors in custom net scan 
Former-commit-id: 15243259cbffa8c639e6412866349357753e1198
 2019-03-07 11:09:28 +01:00
fbsanchez 63ee3b0329 wip: style checks 
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
 2019-03-05 19:02:23 +01:00
Daniel Rodriguez e18eaaf415 Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop' 
Ent 3287 sincronizacion plugin de servidor

See merge request artica/pandorafms!2199

Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
 2019-02-27 09:58:42 +01:00
Daniel Maya 2c0c050507 Disabled cache in server plugin synchronization 
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
 2019-02-26 17:20:23 +01:00
Daniel Maya 45419fbfb0 Fixed href in plugins with centralized node 
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
 2019-02-26 12:23:46 +01:00
fbsanchez cdca720d9a minor fix user_edig 
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
 2019-02-25 14:41:27 +01:00
daniel 504a8e9d1a fixed warnings php 
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
 2019-02-25 13:02:39 +01:00
fbsanchez 797f922748 Discovery Tasklist minor fixes 
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
 2019-02-23 12:13:54 +01:00
Daniel Maya 12b8042c53 Added server plugins in meta 
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
 2019-02-22 14:26:58 +01:00
fbsanchez 64679ee72e discovery minor fixes 
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
 2019-02-21 18:00:50 +01:00
manuel ad3e2b88bf Minor fixes Wiz.Discovery 
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
 2019-02-21 11:19:38 +01:00
fermin831 0ed6c6d620 Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
 2019-02-20 16:54:52 +01:00
fbsanchez 1b82a970b1 WIP: App wiz 
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
 2019-02-19 14:36:16 +01:00
fermin831 cb94692491 Added function addBreadcrum in Wizard main 
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
 2019-02-18 14:30:03 +01:00
fermin831 a6bbd17423 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
 2019-02-18 10:24:35 +01:00
fermin831 a9caebbbf4 Put the list into a function 
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
 2019-02-18 10:24:19 +01:00
fermin831 2332001884 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Conflicts:
	pandora_console/godmode/servers/discovery.php

Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
 2019-02-18 08:50:54 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes 
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
 2019-02-15 18:05:59 +01:00
manuel e04a61df98 Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices 
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
 2019-02-15 14:03:29 +01:00
manuel 32d34cd09b Changed styles in host and devices 
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
 2019-02-15 14:02:32 +01:00
fbsanchez ec672d6bfb H&D network scan 
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
 2019-02-15 13:57:33 +01:00
Fermin 6c485795c7 Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
 2019-02-15 13:48:08 +01:00
Fermin c9c855da9a Added new Cloud Wizard class 
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
 2019-02-15 13:47:11 +01:00
fbsanchez efdc17b801 WIP: H&D 
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
 2019-02-15 13:08:44 +01:00
fbsanchez f777c59a83 WIP: H&D skel files css wiz&discov 
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
 2019-02-15 10:00:23 +01:00