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

29757 Commits

Author SHA1 Message Date
vgilc 94ab35dd7e Merge branch 'ent-fix-docker-image-from' into 'develop' 
Ent fix docker image from

See merge request artica/pandorafms!4733
 2022-03-03 13:40:12 +00:00
fbsanchez 73052974a3 force fallback to develop if desired branch does not exist 2022-03-03 14:28:55 +01:00
fbsanchez 4ed2d65f21 force fallback to develop if desired branch does not exist 2022-03-03 14:28:38 +01:00
vgilc a4d7653cf9 Merge branch 'ent-fix-docker-image-from' into 'develop' 
Adapted to centos7

See merge request artica/pandorafms!4732
 2022-03-03 10:01:43 +00:00
fbsanchez a8d669989f Adapted to centos7 2022-03-03 10:40:42 +01:00
vgilc b53b1e8a02 Merge branch 'ent-fix-docker-image-from' into 'develop' 
fix-docker-image-from

See merge request artica/pandorafms!4731
 2022-03-03 08:50:35 +00:00
fbsanchez d80582eead fix-docker-image-from 2022-03-03 09:39:10 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
Daniel Rodriguez 991893fa8f Merge branch 'ent-8666-error-repetitivo-en-el-pandora_server-error-llena-el-log' into 'develop' 
errata fix0

See merge request artica/pandorafms!4730
 2022-03-02 12:39:51 +00:00
fbsanchez 690de69aea agentmodule status str is N/A If is not defined 2022-03-02 12:20:47 +01:00
fbsanchez 9c3a6665eb str comparation 2022-03-02 12:13:20 +01:00
fbsanchez 3aaa868155 errata fix0 2022-03-02 12:09:13 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f5bf7bbd72 Merge branch 'ent-5620-nuevo-compilador-para-backend' into 'develop' 
Ent 5620 nuevo compilador para backend

See merge request artica/pandorafms!4653
 2022-03-01 18:13:27 +00:00
Daniel Rodriguez f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop' 
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
 2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es 69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Daniel Rodriguez d1cc6f6295 Merge branch 'ent-8631-no-se-disparan-las-alertas-correladas-con-schedule-en-formato-antiguo' into 'develop' 
extra checks before translate

See merge request artica/pandorafms!4722
 2022-02-25 13:16:49 +00:00
Daniel Rodriguez db3e74a2f6 Merge branch 'ent-8623-error-sql-filtro-agentes' into 'develop' 
Fixed missing char

See merge request artica/pandorafms!4718
 2022-02-25 09:19:37 +00:00
Calvo 3ef537ceb2 Do not show servers header icon if user has no permission node 2022-02-25 10:16:12 +01:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
fbsanchez ce87cc6ec2 extra checks before translate 2022-02-24 19:09:09 +01:00
Ramon Novoa 86db050753 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2022-02-24 18:47:25 +01:00
Ramon Novoa 49512027e3 Fix pidof_pandora_ha to work with PAR::Packer binaries. 2022-02-24 18:03:33 +01:00
Calvo 4f3c509bde Fix credential store ACL, only accces to PM or UM 2022-02-24 17:33:13 +01:00
Luis b2bc884ec6 Fix minor bug 2022-02-24 15:53:56 +00:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
Calvo 39a971ad5b Fix permission vulnerabilities on profile massive operations 2022-02-24 12:17:21 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
Daniel Rodriguez a4b6c996d1 Merge branch 'ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos' into 'develop' 
UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages

See merge request artica/pandorafms!4701
 2022-02-24 09:54:19 +00:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Rodriguez e2d6b30d51 Merge branch 'ent-7821-pandora-db-historico-solo-ejecute-funciones-historico' into 'develop' 
Run only a subset of maintenance tasks on the history DB.

See merge request artica/pandorafms!4675
 2022-02-23 08:38:31 +00:00
Daniel Rodriguez 9f96c4e287 Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop' 
Moved migrate fielename

See merge request artica/pandorafms!4708
 2022-02-23 08:25:09 +00:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Daniel Rodriguez 4c31e4cda3 Merge branch 'ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server' into 'develop' 
Alert server improved

See merge request artica/pandorafms!4673
 2022-02-22 17:03:12 +00:00
Calvo 3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00