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

28185 Commits

Author SHA1 Message Date
Calvo 538f17441f Fixed missing return on tags_update_policy_module_tag function 2021-06-23 12:49:32 +02:00
fbsanchez de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
artica e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
fbsanchez b88609ca2e Improve error messages while saving a new Agent entity 2021-06-22 20:25:05 +02:00
fbsanchez 9fb7074082 minor fix 2021-06-22 19:44:41 +02:00
fbsanchez 107c934371 Fixed not conditional in where_clause builder (mysql) 2021-06-22 19:31:04 +02:00
Daniel Maya 289e8a3902 #7668 fixed tags 2021-06-22 17:05:45 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
artica 17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
fbsanchez d9bad6f5c6 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_network_components.php
 2021-06-21 17:31:41 +02:00
Daniel Rodriguez 7937a988df Merge branch 'ent-5023-limpiar-toda-referencia-a-event-alert' into 'develop' 
remove help_event_alert.php

See merge request artica/pandorafms!3057
 2021-06-21 14:08:03 +00:00
Daniel Rodriguez 294741b472 Merge branch 'ent-6990-copiar-informes' into 'develop' 
Ent 6990 copiar informes

See merge request artica/pandorafms!4129
 2021-06-21 14:07:03 +00:00
Luis 51844da01b Ent 6990 copiar informes 2021-06-21 14:07:03 +00:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
Daniel Rodriguez 493cce4e6f Merge branch 'ent-7663-vulnerabilidad-hash-file-manager' into 'develop' 
Change token for hash generation

Closes pandora_enterprise#7663

See merge request artica/pandorafms!4182
 2021-06-21 14:05:10 +00:00
Daniel Rodriguez 043b512cc4 Merge branch 'ent-7142-Consola-Visual-me-oculta-los-botones' into 'develop' 
Ent 7142 consola visual me oculta los botones

See merge request artica/pandorafms!4178
 2021-06-21 14:04:11 +00:00
Daniel Maya 104dfdd92e Ent 7142 consola visual me oculta los botones 2021-06-21 14:04:11 +00:00
Daniel Rodriguez ab3a7e9d2d Merge branch 'ent-7629-Error-500-en-borrado-selectivo-de-items-de-informes' into 'develop' 
Ent 7629 error 500 en borrado selectivo de items de informes

See merge request artica/pandorafms!4175
 2021-06-21 14:03:39 +00:00
Daniel Rodriguez 227055446e Merge branch 'ent-7630-bug-visual-enedicion-de-items-de-informes' into 'develop' 
fixed error updating item reporting

See merge request artica/pandorafms!4168
 2021-06-21 14:02:54 +00:00
Daniel Rodriguez 190932f12d Merge branch 'ent-7390-CSRF-login-recovery-pass' into 'develop' 
Added CSRF validation

Closes pandora_enterprise#7390

See merge request artica/pandorafms!4148
 2021-06-21 14:01:59 +00:00
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
fbsanchez fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
marcos 951924dd93 colspan 1 to group selector custom graph 2021-06-21 11:40:48 +02: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
marcos 5aeab363e9 more size for select owner modal events 2021-06-21 11:25:19 +02: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
fbsanchez d22cdf027c Empty variables also translates macros 2021-06-21 10:06:03 +02:00
fbsanchez 6d67a03b78 Merge remote-tracking branch 'origin/develop' into ent-7559-11881-limitacion-en-macro-_snmp_fx_ 2021-06-21 10:03:46 +02:00
Marcos Alconada 827524e6d2 Update delete_files.txt 2021-06-21 06:12:55 +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
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
José González 0c5b8766d0 Change snmpwalk behaviour in module configuration 2021-06-18 14:05:59 +02:00
marcos 43cd308ef1 fixed conflicts and add removed files in delete_files.txt 2021-06-18 12:37:06 +02:00