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

30164 Commits

Author SHA1 Message Date
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop' 
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
 2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop' 
Event response creation name required

See merge request artica/pandorafms!4685
 2022-03-08 15:33:57 +00:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Barbero Martin b0d73fa3ff API CV #8677 2022-03-08 14:56:33 +01:00
Daniel Barbero Martin 4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +01:00
Ramon Novoa 9f03db37c1 Fix module precedence for pandora_ha. 2022-03-08 12:10:39 +01:00
Daniel Maya 7e29cd5a60 #8547 added macros _current_username_ and _owner_username_ 2022-03-08 10:44:24 +01:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
Daniel Maya 02fe08903c #8696 Fixed warning status 2022-03-07 15:07:06 +01:00
Daniel Maya 270bb433da added heatmap ajax and class 2022-03-07 13:11:54 +01:00
Daniel Maya 04f6cfc94f added heatmap 2022-03-07 12:50:36 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
Daniel Maya d4439dcf51 heatmap css 2022-03-07 10:47:20 +01:00
José González 89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
Daniel Maya f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
Calvo a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Daniel Rodriguez c130bc8a35 Merge branch 'ent-fix-docker-timeouts' into 'develop' 
adjusted sleep before try to use mysql socket, due slow runners

See merge request artica/pandorafms!4739
 2022-03-04 13:26:54 +00:00
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
fbsanchez d9deb8e8d2 adjusted sleep before try to use mysql socket, due slow runners 2022-03-04 10:15:34 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
vgilc 16c5202987 Merge branch 'ent-fix-pandoradbdata-invalid-components' into 'develop' 
removed invalid components from pandoradb_data

See merge request artica/pandorafms!4737
 2022-03-03 17:51:37 +00:00
Calvo 433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
Rafael Ameijeiras 7a2095c68f removing perl as a dependencie on rh spec 2022-03-03 17:19:54 +01:00
vgilc 69540c2e64 Merge branch 'ent-fix-docker-public-open' into 'develop' 
removed stranger things from community dockerfile

See merge request artica/pandorafms!4735
 2022-03-03 16:04:17 +00:00
fbsanchez 1e76626573 removed stranger things from community dockerfile 2022-03-03 16:42:05 +01:00
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +01:00
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
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00