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

15363 Commits

Author SHA1 Message Date
vgilc 3bdd23e2d7 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola2-dev' into 'develop' 
update info of state in events

See merge request !847
 2017-09-25 09:23:58 +02:00
vgilc 851a8082a4 Merge branch '1338-Graficas_TIP_en_informes_open_rev' into 'develop' 
reajust date in flash graphs

See merge request !849
 2017-09-25 08:50:51 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
daniel 44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
vgilc 5713c6b42f Merge branch '1306-new-functions-in-pandora-manage-to-visual-console-dev' into 'develop' 
Added change to scape double quotes

See merge request !846
 2017-09-22 15:08:07 +02:00
Daniel Maya 4c4a89ecf1 update info of state in events 2017-09-22 15:01:17 +02:00
Arturo Gonzalez 9e01eda73d Added change to scape double quotes 2017-09-22 14:42:26 +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
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
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
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
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
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
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +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
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00