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

26595 Commits

Author SHA1 Message Date
Daniel Rodriguez 8d7ac33cf1 Merge branch 'ent-6653-Error-enlace-publico-en-Consolas-Visuales-linkadas' into 'develop' 
fix public view link remove hash

See merge request artica/pandorafms!3639
 2021-01-11 13:23:05 +01:00
fbsanchez 6e910f9a68 group select style consistency 2021-01-11 13:09:33 +01:00
fbsanchez b102d42793 minor fix - group containers must be rebuilt... 2021-01-11 13:09:09 +01:00
Jose Gonzalez 199ee732cd Added External tools link 2021-01-11 10:18:52 +01:00
Daniel Rodriguez d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop' 
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
 2021-01-11 09:30:56 +01:00
Daniel Rodriguez 38dd3b960e Merge branch 'ent-4953-local-admin-nunca-prueba-remotos-meta' into 'develop' 
Force try remote before falling back to local if admin user

See merge request artica/pandorafms!3715
 2021-01-11 09:22:14 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
fbsanchez 6962c34f48 Force user to actively select a group while defining a new dashboard 2021-01-08 18:54:04 +01:00
fbsanchez f38ea57c5f group selector updates for report, required 2021-01-08 17:15:23 +01:00
fbsanchez f35ae98e78 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 2021-01-08 13:21:58 +01:00
fbsanchez f89397996f avoid double networkmap creation 2021-01-08 11:59:45 +01:00
fbsanchez 8f2109003b avoid review for non H&D tasks 2021-01-08 10:31:38 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez 96a8dbd0c8 added name method alias of nombre to Group class 2021-01-07 18:25:59 +01:00
fbsanchez 32d09a2353 added name method alias of nombre to Group class 2021-01-07 18:24:51 +01:00
fbsanchez 1f7a68cacc Added group_password to print_agent 2021-01-07 16:37:13 +01:00
fbsanchez dd08b7937c Set default value for review_mode to 1 instead 0 2021-01-07 14:36:56 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser' 
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
 2021-01-07 14:14:33 +01:00
fbsanchez 7aedc39f69 Task list status 2021-01-07 13:48:57 +01:00
Daniel Rodriguez 54c768984a Merge branch 'ent-6652-pandora_db-en-historico' into 'develop' 
Fixes in history db settings and improved pandora_db tool

See merge request artica/pandorafms!3640
 2021-01-07 12:59:48 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop' 
added additional check for token

See merge request artica/pandorafms!3757
 2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es 84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' 
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
 2021-01-05 13:43:42 +01:00
Daniel Rodriguez 6faa827bfa Merge branch 'ent-6896-error-ACL-command-snapshot' into 'develop' 
Fixed module id on snapshot view

See merge request artica/pandorafms!3746
 2021-01-05 12:41:04 +01:00
Daniel Maya 2781b4ab34 Fixed task list groups 2021-01-05 11:42:34 +01:00
Junichi Satoh 818766912f Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'. 2021-01-05 18:06:21 +09:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
Daniel Maya 90d8ac5129 Fixed ip target while creating policy modules 2021-01-04 15:12:55 +01:00
Daniel Maya c11c122032 Fixed custom graph 2021-01-04 12:53:42 +01:00
Daniel Rodriguez 05645afd44 Merge branch 'ent-6797-11099-graficas-informe-de-proyeccion-fallan-en-pdf-de-forma-aleatoria' into 'develop' 
Increased phantomjs timeout to 120 seconds per resource

See merge request artica/pandorafms!3730
 2021-01-04 11:17:37 +01:00
Daniel Rodriguez 2e07d6215f Merge branch 'ent-6822-Error-SQL-en-SNMP-console' into 'develop' 
Ent 6822 error sql en snmp console

See merge request artica/pandorafms!3708
 2021-01-04 11:16:35 +01:00
Daniel Rodriguez f528e47cdc Merge branch 'ent-6582-Bug-con-masivas-de-modulos-y-filtro-module-status' into 'develop' 
fixed status filter when applying changes to a module of any agent

See merge request artica/pandorafms!3630
 2021-01-04 11:16:07 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop' 
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
 2021-01-04 11:15:26 +01:00
Daniel Rodriguez b3861ad2c5 Merge branch 'ent-6534-Migracion-consolas-visuales' into 'develop' 
css simple value css CV

See merge request artica/pandorafms!3684
 2021-01-04 11:13:35 +01:00
Daniel Rodriguez 70fcba1b11 Merge branch 'ent-6765-11050-Bug-en-operaciones-masivas-sobre-modulos-SNMP-v3' into 'develop' 
fixed selector

See merge request artica/pandorafms!3644
 2021-01-04 11:11:48 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop' 
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
 2021-01-04 11:11:16 +01:00
Daniel Rodriguez 5658b52e3f Merge branch 'ent-6498-Alertas-siempre-marcan-modulos-como-critical-en-los-correos-con-el-mail-to-admin-por-defecto' into 'develop' 
changed mail to admin default action

See merge request artica/pandorafms!3656
 2021-01-04 11:10:19 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00