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

354 Commits

Author SHA1 Message Date
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