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

15522 Commits

Author SHA1 Message Date
Arturo Gonzalez f738fa2fce Added ldap login adv conf v1 2017-09-22 13:54:02 +02:00
vgilc 07ba50e499 Merge branch '1338-Graficas_TIP_en_informes_open' into 'develop' 
add tip reports simple graph

See merge request !845
 2017-09-22 12:02:08 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
enriquecd 00eba72a99 Fix data 64 images in dialog for command_snapshot config token - #1250 2017-09-22 10:56:52 +02:00
vgilc e73e20e98c Merge branch '1306-fixes-in-pandora-manage-visual-console-functions-dev' into 'develop' 
Added minor changes to duplicate and export functions

See merge request !843
 2017-09-22 10:22:54 +02:00
Arturo Gonzalez 49d3c2574b Added minor changes to duplicate and export functions 2017-09-22 10:18:18 +02:00
vgilc a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00
vgilc 6bb182bf8f Merge branch '1155-Fallo_en_conexion_con_LDAP_merge_roto_Dani_' into 'develop' 
fixed error bad merge ldap

See merge request !841
 2017-09-22 09:30:29 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
daniel 3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
Arturo Gonzalez 9d09f9a436 LDAP in progress 2017-09-21 18:00:32 +02:00
Arturo Gonzalez 98a05f7850 Added changes to ldap adv config 2017-09-21 15:55:21 +02:00
daniel d86d622340 fixed error bad merge ldap 2017-09-21 15:53:45 +02:00
vgilc 3348267a8f Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz' into 'develop' 
tip in graph interfaces

See merge request !840
 2017-09-21 15:42:23 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
Arturo Gonzalez 8d6e6d2161 Added ldap new fields to conf 2017-09-21 13:43:46 +02:00
vgilc d34f34f4cb Merge branch '972-agents-disabled-in-policy-view-dev' into 'develop' 
Added disable agents in policy when js is crazy

See merge request !838
 2017-09-21 12:40:16 +02:00
Arturo Gonzalez bc077c8a7d Added disable agents in policy when js is crazy 2017-09-21 12:22:55 +02:00
vgilc 6dbbb84f42 Merge branch 'ent-1218-agente-linux-configuracion-remota-modo-local' into 'develop' 
Ent 1218 agente linux configuracion remota modo local

See merge request !837
 2017-09-21 12:07:37 +02:00
fermin831 484022a7c9 Marked some config options like undocumented and added transfer_mode_user on all unix confs 2017-09-21 10:09:06 +02:00
artica 581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
vgilc f3b0b663dd Merge branch '1360-corregir_errores_en_graficas_sparse_de_tipo_TIP' into 'develop' 
fixed errors in TIP SPARSE

See merge request !836
 2017-09-20 17:52:03 +02:00
daniel edb2865430 fixed errors in TIP SPARSE 2017-09-20 17:29:17 +02:00
vgilc 4df624a7c5 Merge branch '1217-name-macros-in-pdf-view-dev' into 'develop' 
Added fix to macros in pdf view

See merge request !835
 2017-09-20 17:25:17 +02:00
Arturo Gonzalez f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
vgilc c080ad6350 Merge branch '1217-name-macros-in-template-html-view-dev' into 'develop' 
Added restriction when report comes from template

See merge request !834
 2017-09-20 16:01:29 +02:00
Arturo Gonzalez 3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
enriquecd be0655334d Change installer next button style - #1349 2017-09-20 13:04:36 +02:00
vgilc ffbd013ac0 Merge branch '1355-user-with-group-all-is-a-pandora-admin-dev' into 'develop' 
Added minor change to fix this issue

See merge request !832
 2017-09-20 12:24:50 +02:00
Arturo Gonzalez 526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
Arturo Gonzalez 3652f0a0ea Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-09-20 11:05:35 +02:00
vgilc a16827e788 Merge branch '1217-error-in-report-template-label-in-meta-dev' into 'develop' 
Added some changes to label and name macros in custom graphs

See merge request !830
 2017-09-20 10:59:40 +02:00
enriquecd 3ae202ff15 Fix error showing image when there is no data to show in graphs - #1283 2017-09-20 10:49:52 +02:00
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
enriquecd 4aa4d44d0f Prevent select any and others options at the same time for agents/modules multiselect in modules bulk operations - #1266 2017-09-19 19:14:25 +02:00
Arturo Gonzalez ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +02:00
vgilc 2b5240cedc Merge branch '1337-optimization-error-in-check-acl-dev' into 'develop' 
Added a minor change to test optimization

See merge request !827
 2017-09-19 12:15:23 +02:00
Arturo Gonzalez da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
vgilc 843c190655 Merge branch '1345-corregir_errores_en_graficas_boleanas_de_tip' into 'develop' 
fixed errors in TIP boolean graphs

See merge request !826
 2017-09-19 09:30:56 +02:00
artica 2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
daniel d54509fd1e fixed errors in TIP boolean graphs 2017-09-18 17:57:43 +02:00
vgilc 6347c4d3db Merge branch 'ent-1247-calculo-para-determinar-servidores-caidos' into 'develop' 
Fixed down server time calculation

See merge request !825
 2017-09-18 11:58:20 +02:00
fermin831 4d27093679 Fixed down server time calculation 2017-09-18 11:50:40 +02:00
vgilc a51952b3ed Merge branch '1245-Añadir-resumen-de-grupos-como-elemento-de-consola-visual-all-browsers-compatible' into 'develop' 
Compatible with all browsers - #1245

See merge request !824
 2017-09-18 11:13:59 +02:00
enriquecd e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc d0f8b9d2a5 Merge branch '118-pandora_db-pl-use-uninisialized-config-value' into 'develop' 
Resolve "pandora_db.pl use uninisialized config value"

Closes #118

See merge request !361
 2017-09-18 10:53:17 +02:00
vgilc 4e840651be Merge branch '1217-errors-in-pandora-report-templates-macros-dev' into 'develop' 
1217 errors in pandora report templates macros dev

See merge request !822
 2017-09-18 10:28:54 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
vgilc bfbee7179d Merge branch 'Problemas_con_full_scale' into 'develop' 
fixed error in full_scale

See merge request !809
 2017-09-18 09:25:10 +02:00