tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
27,566 Commits 34 Branches 30 Tags
Commit Graph

27566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Rodriguez
f134377b37 Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 
Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
 2021-06-21 14:01:32 +00:00
Daniel Maya
878a5321e8 Ent 7547 tree view no filtra bien dashboard 2021-06-21 14:01:32 +00:00
Daniel Rodriguez
19579c0801 Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop' 
Ent 7505 11819 bug en widget tree view

See merge request artica/pandorafms!4125
 2021-06-21 13:58:57 +00:00
Daniel Rodriguez
314639dc30 Merge branch 'ent-7594-custom-profile-acl-enterprise' into 'develop' 
Fix dashboards ACLs

Closes pandora_enterprise#7594

See merge request artica/pandorafms!4154
 2021-06-21 13:43:13 +00:00
Daniel Rodriguez
a12c3ab7d0 Merge branch 'ent-7253-opcion-formato-envio-informes-templates' into 'develop' 
Ent 7253 opcion formato envio informes templates

See merge request artica/pandorafms!4020
 2021-06-21 13:41:14 +00:00
Luis
ebceaebb58 Ent 7253 opcion formato envio informes templates 2021-06-21 13:41:14 +00:00
Daniel Rodriguez
6f98ae05a1 Merge branch 'ent-7038-regex-agent-filter-generacion-informe-tasks' into 'develop' 
Added agent regex to console task template send email

Closes pandora_enterprise#7038

See merge request artica/pandorafms!4135
 2021-06-21 10:21:48 +00:00
Daniel Rodriguez
f4bf9027b1 Merge branch 'ent-7389-Vulnerabilidad-Cross-Site-Scripting-Consola' into 'develop' 
Ent 7389 vulnerabilidad cross site scripting consola

See merge request artica/pandorafms!4096
 2021-06-21 10:18:37 +00:00
Daniel Rodriguez
c5dab9b99b Merge branch 'ent-7488-pantallazo-blanco-config.php-installer-activo' into 'develop' 
Ent 7488 pantallazo blanco config.php installer activo

See merge request artica/pandorafms!4106
 2021-06-21 10:17:12 +00:00
Luis
10059822cd Ent 7488 pantallazo blanco config.php installer activo 2021-06-21 10:17:12 +00:00
Daniel Rodriguez
a2eb62150c Merge branch 'ent-7508-Macro-timestamp-en-alertas-unknown-no-funciona' into 'develop' 
fixed bug in unknown alerts

See merge request artica/pandorafms!4179
 2021-06-21 10:15:15 +00:00
Daniel Rodriguez
a4c2fcd6a6 Merge branch 'ent-7277-11643-it-werke-log-en-agente-provocado-por-omnishell' into 'develop' 
Update rc code after execute omnishell_client - windows only

See merge request artica/pandorafms!4176
 2021-06-21 10:13:54 +00:00
Daniel Rodriguez
7b7265baa5 Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop' 
Fixed CLI update_agent adding duplicate agent address references

See merge request artica/pandorafms!4010
 2021-06-21 09:30:17 +00:00
Daniel Rodriguez
f5221083b1 Merge branch 'ent-7244-Errores-network-tools' into 'develop' 
Solved issues with double quotes and improve the code

Closes pandora_enterprise#7244

See merge request artica/pandorafms!4101
 2021-06-21 09:13:35 +00:00
Daniel Rodriguez
95a152752b Merge branch 'ent-7555-11820-Filtro-de-eventos-en-widget-Lastest-events' into 'develop' 
Ent 7555 11820 filtro de eventos en widget lastest events

See merge request artica/pandorafms!4142
 2021-06-21 09:10:45 +00:00
Daniel Rodriguez
acfa36b380 Merge branch 'ent-7286-Líneas-en-pandora-server-error-con-check_string' into 'develop' 
Ent 7286 líneas en pandora server error con check string

See merge request artica/pandorafms!4208
 2021-06-21 09:09:52 +00:00
artica
447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica
dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica
682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
artica
0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Rafael Ameijeiras
e56e18d49d Merge branch 'ent-7714-update-memory_limit' into 'develop' 
change memory_limit to 800M for new update manager

See merge request artica/pandorafms!4219
 2021-06-17 13:11:00 +00:00
rafael.ameijeiras
84f1710a87 change memory_limit to 800M for new update manager 2021-06-17 15:06:16 +02:00
artica
e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Rodriguez
02dad9a27d Merge branch 'ent-7705-error-500-en-vista-de-licence-management' into 'develop' 
Minor CDE (bonus)

See merge request artica/pandorafms!4211
 2021-06-16 12:38:44 +00:00
fbsanchez
b8d3d962a0 Minor CDE 2021-06-16 12:44:03 +02:00
artica
90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Maya
38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
Daniel Rodriguez
9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
Daniel Rodriguez
b64f15e4d7 Merge branch 'ent-7703-error-en-update-manager-online-en-open' into 'develop' 
Avoid using old data when parsing progress

See merge request artica/pandorafms!4206
 2021-06-15 12:55:26 +00:00
fbsanchez
04e2919497 Avoid using old data when parsing progress 2021-06-15 14:43:11 +02:00
fbsanchez
14495ebdc3 Current package updates 2021-06-15 11:06:46 +02:00
artica
2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez
7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
Daniel Rodriguez
b110fde614 Merge branch 'ent-6280-firmar-instalador-de-agente-macos' into 'develop' 
Added signing and notarizing process

See merge request artica/pandorafms!4156
 2021-06-14 14:30:46 +00:00
Daniel Rodriguez
31871bb792 Merge branch 'ent-7687-modificar-image-um-2' into 'develop' 
new background image UM

See merge request artica/pandorafms!4201
 2021-06-14 14:18:10 +00:00
marcos
2e5073e1ba new background image UM 2021-06-14 16:12:48 +02:00
Daniel Rodriguez
9d57f181f9 Merge branch 'ent-7687-modificar-image-um' into 'develop' 
changed UM image background

See merge request artica/pandorafms!4198
 2021-06-14 13:31:37 +00:00
Marcos Alconada
42274e7252 changed UM image background 2021-06-14 13:31:37 +00:00
Daniel Rodriguez
08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Rodriguez
42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop' 
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
 2021-06-14 11:39:41 +00:00
José González
e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +02:00
artica
595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica
e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica
8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
José González
6db03d943d Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise' 
# Conflicts:
#   pandora_console/index.php
 2021-06-11 13:57:10 +00:00
José González
b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00
Daniel Rodriguez
81c2ebc43b Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop' 
Fix treeview modules sql inner condition

See merge request artica/pandorafms!4195
 2021-06-11 08:44:44 +00:00
Daniel Rodriguez
0adcf5aac2 Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop' 
add new link documentation

See merge request artica/pandorafms!4188
 2021-06-11 08:32:06 +00:00
Daniel Rodriguez
d0c122c193 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4194
 2021-06-11 08:24:27 +00:00