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

374 Commits

Author SHA1 Message Date
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
José González f8043a43f7 Fix issue with ACLs 2022-04-28 10:07:44 +02:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
Daniel Rodriguez 6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Jose Gonzalez 6fb7f317a6 Fix issues with links 2022-01-17 17:13:29 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
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