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

12201 Commits

Author SHA1 Message Date
Enrique Camargo 4eae50f0f1 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2017-11-15 16:03:39 +01:00
Arturo Gonzalez 0513a9e45a Merge branch 'develop' into 1316-new-empty-networkmaps-dev 
Conflicts:
	pandora_console/include/functions_pandora_networkmap.php
 2017-11-15 15:49:21 +01:00
Arturo Gonzalez 088aa51996 Added changes to obtain id from external php 2017-11-15 15:30:55 +01:00
vgilc e91bcf8ad5 Merge branch '1597-pantalla-en-blanco-en-mapas-de-red-dev' into 'develop' 
Fixed null values in js

See merge request artica/pandorafms!1073
 2017-11-15 13:17:06 +01:00
Arturo Gonzalez 72acac8b57 Fixed null values in js 2017-11-15 12:19:41 +01:00
vgilc a72f7b006e Merge branch 'develop' into '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-11-15 12:04:11 +01:00
Arturo Gonzalez 59e1bdd225 Added email login attr to ldap users 2017-11-15 11:57:56 +01:00
danielmaya 66547d28b0 Updated to MR 9 2017-11-15 11:15:12 +01:00
Arturo Gonzalez 1a4502d150 Added new field to ldap config 2017-11-15 10:27:56 +01:00
vgilc 93dd3c226f Merge branch '1476-Los-elementos-no-se-quedan-centrados-en-las-consolas-visuales-dev' into 'develop' 
Fixed margin left and top in visual console

See merge request artica/pandorafms!1050
 2017-11-15 10:18:02 +01:00
vgilc e8076645d0 Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev' 
# Conflicts:
#   pandora_console/extras/mr/9.sql
 2017-11-15 09:47:21 +01:00
vgilc faac4fa46f Merge branch '1240-fictional-node-link-to-other-map-dev' into 'develop' 
Added function to update link to other map

See merge request artica/pandorafms!990
 2017-11-15 09:45:03 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
 2017-11-15 09:43:33 +01:00
vgilc 8ebada6dbf Merge branch '1464-error-in-networkmap-with-weird-agent-names-dev' into 'develop' 
Added safe input to agent name

See merge request artica/pandorafms!996
 2017-11-15 09:43:29 +01:00
vgilc 11d696f209 Merge branch '910-new-real-view-based-on-tags-dev' into 'develop' 
Added new section to menu

See merge request artica/pandorafms!967
 2017-11-15 09:41:17 +01:00
vgilc d430375826 Merge branch '1413-CARREFOUR-Añadir-macros-en-los-label-de-las-consolas-visuales' into 'develop' 
Add visual console macros - #1413

See merge request artica/pandorafms!1019
 2017-11-15 09:40:38 +01:00
vgilc 1789287673 Merge branch '1539-new-flow-in-networkmaps-when-creates-a-map-dev' into 'develop' 
Changed flow

See merge request artica/pandorafms!1031
 2017-11-15 09:39:31 +01:00
vgilc 7354ae534b Merge branch 'snmp-browser-safe-output' into 'develop' 
Remove HTML entities from the SNMP community.

See merge request artica/pandorafms!1037
 2017-11-15 09:36:20 +01:00
vgilc 55ac22055b Merge branch '1457-select-position-and-z-scale-in-networkmaps-dev' into 'develop' 
Added the options in networkmap editor

See merge request artica/pandorafms!997
 2017-11-15 09:35:19 +01:00
Arturo Gonzalez 4db2493cdd Merge branch 'develop' into 1464-error-in-networkmap-with-weird-agent-names-dev 
Conflicts:
	pandora_console/include/functions_networkmap.php
 2017-11-15 09:34:19 +01:00
vgilc b12d529578 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop' 
1276 cascade protection a nivel de módulo dev

See merge request artica/pandorafms!933
 2017-11-15 09:31:05 +01:00
vgilc 4cafe69184 Merge branch 'optimizar-vista-de-eventos' into 'develop' 
[Console > Events view] Removed the events graph to improve ~75% the render time

See merge request artica/pandorafms!1002
 2017-11-15 09:30:38 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop' 
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
 2017-11-15 09:28:10 +01:00
vgilc 4e09334718 Merge branch '1592-acceso-con-ldap-sin-establecer-pass-dev' into 'develop' 
1592 acceso con ldap sin establecer pass dev

See merge request artica/pandorafms!1067
 2017-11-15 09:27:39 +01:00
artica e793e3fd4e Auto-updated build strings. 2017-11-15 00:01:16 +01:00
Arturo Gonzalez 75cb2a668f Added a lot of changes to save or not user password, only ldap 2017-11-14 16:20:26 +01:00
Arturo Gonzalez 8a1ba7130f Added restriction to no pass token 2017-11-14 13:11:11 +01:00
Arturo Gonzalez efa762626b Changed text to new token 2017-11-14 12:47:23 +01:00
Arturo Gonzalez 861e112cec Added token to pandora auth conf 2017-11-14 12:36:32 +01:00
danielmaya e6d5adbf22 Changed MR 2017-11-14 10:38:50 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
artica 69aff8a420 Auto-updated build strings. 2017-11-14 00:01:10 +01:00
Arturo Gonzalez 833983e34e Added visual changes to donut graph 2017-11-13 12:54:28 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
vgilc 86a5599aad Revert "Fixed traces" 
This reverts commit 173efae22d
 2017-11-13 10:20:58 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
vgilc 67373e39ac Merge branch '1378-grafica-donut-en-consola-visual-dev' into 'develop' 
1378 grafica donut en consola visual dev

See merge request artica/pandorafms!1051
 2017-11-13 09:39:43 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
vgilc 95ab2701c7 Merge branch '1550-Gráfica-de-eventos-24h-de-vista-de-agente-muy-pequeña' into 'develop' 
Change agent events bar height - #1550

See merge request artica/pandorafms!1028
 2017-11-13 08:47:13 +01:00
artica 301795af83 Auto-updated build strings. 2017-11-13 00:01:08 +01:00
artica 2e6e46c10c Auto-updated build strings. 2017-11-12 00:01:08 +01:00
artica b8e6d7927e Auto-updated build strings. 2017-11-11 00:01:10 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
Arturo Gonzalez de65e7cf27 Fixed element name and leyend separator 2017-11-10 14:43:31 +01:00
danielmaya f77693bce9 Fixed margin left and top in visual console 2017-11-10 13:19:23 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
vgilc 555dc3744d Revert "Merge branch…" 
This reverts merge request !1045
 2017-11-10 12:24:01 +01:00
vgilc 29971f4d38 Merge branch '1512-ldap-atributo-de-login-dev' into 'develop' 
Added changes to fix ldap login

See merge request artica/pandorafms!1047
 2017-11-10 10:13:31 +01:00
vgilc a38f47b4a9 Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714_2' into 'develop' 
fixed errors in TIP

See merge request artica/pandorafms!1045
 2017-11-10 10:12:51 +01:00
Arturo Gonzalez fe4a93f646 Added changes to fix ldap login 2017-11-10 09:33:12 +01:00
artica 680d23038e Auto-updated build strings. 2017-11-10 00:01:09 +01:00
artica f512bea610 Auto-updated build strings. 2017-11-09 00:01:13 +01:00
daniel e6e925cbf6 fixed errors in TIP 2017-11-08 18:57:37 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev 
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
 2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
Ramon Novoa cea0f90117 Remove HTML entities from the SNMP community. 
Ref. pandora_enterprise#1565.
 2017-11-08 09:15:13 +01:00
artica b461121361 Auto-updated build strings. 2017-11-08 00:01:10 +01:00
vgilc 3c920e9d10 Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix-2' into 'develop' 
Fix pdf graph labels 2 - #417

See merge request artica/pandorafms!1032
 2017-11-07 12:04:57 +01:00
vgilc 68a6770a45 Merge branch '145-plain-text-mail-cannot-be-send-by-email_2' into 'develop' 
Resolve "plain text mail cannot be send by 'eMail'."

See merge request artica/pandorafms!1033
 2017-11-07 11:56:41 +01:00
vgilc 601d67fc7e Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714' into 'develop' 
fixed errors in fullscale graph and normal graph

See merge request artica/pandorafms!1025
 2017-11-07 11:50:23 +01:00
daniel baab22bb28 add queries mr8 and migrate 2017-11-07 11:44:09 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
enriquecd 2eec3dc766 Fix pdf graph labels 2 - #417 2017-11-07 11:43:42 +01:00
Arturo Gonzalez 35ec64e2ea Changed flow 2017-11-07 11:41:40 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop' 
Fixed problems with unit

See merge request artica/pandorafms!1027
 2017-11-07 11:23:02 +01:00
vgilc 47171418cd Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop' 
Modified simple value

See merge request artica/pandorafms!1026
 2017-11-07 11:22:28 +01:00
enriquecd fa419aa367 Change agent events bar height - #1550 2017-11-07 11:00:33 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
artica 3763a1a93c Auto-updated build strings. 2017-11-07 00:01:10 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop' 
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
 2017-11-06 17:41:45 +01:00
enriquecd b6d3444212 Fix PDF reports labels - #417 2017-11-06 17:02:54 +01:00
enriquecd 74fbd11628 Fix maximum data column - #654 2017-11-06 16:15:06 +01:00
Alejandro Gallardo Escobar ac70caac71 [Console] Fixed XSS vulnerabilities 2017-11-06 15:20:24 +01:00
Alejandro Gallardo Escobar 83becb3e80 [Console] Fixed an error into the 'ui_print_truncate_text' function 2017-11-06 15:18:55 +01:00
enriquecd cffbfd3fb3 Add visual console macros - #1413 2017-11-06 12:19:31 +01:00
vgilc 9b163ce3e0 Merge branch '1367-radial-dinamic-rotate-texts-around-center-dev' into 'develop' 
Added some modifications to sunburst d3 function

See merge request artica/pandorafms!1018
 2017-11-06 12:15:30 +01:00
Arturo Gonzalez b01d0e78af Added some modifications to sunburst d3 function 2017-11-06 10:52:27 +01:00
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
vgilc c45154e9d7 Merge branch '179-Se-han-dejado-una-traza-en-la-vista-de-agente-dev' into 'develop' 
Fixed traces

See merge request artica/pandorafms!1015
 2017-11-03 14:48:47 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop' 
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
 2017-11-03 13:49:40 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
vgilc 49d5f0878f Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop' 
Initialize the group cache.

See merge request artica/pandorafms!1006
 2017-11-03 12:10:55 +01:00
vgilc 43fdb65e92 Merge branch '1394-Errores-tema-black-2-open' into 'develop' 
Change pandora black styles - #1394

See merge request artica/pandorafms!1013
 2017-11-03 11:36:39 +01:00
vgilc 6ddf744163 Merge branch '1511-visual-console-elements-not-sorted-in-creation-dev' into 'develop' 
Added changes to sort json in ajax return

See merge request artica/pandorafms!1001
 2017-11-03 10:46:17 +01:00
enriquecd 1e138f240f Change pandora black styles - #1394 2017-11-03 10:27:01 +01:00
vgilc dbe717c1fc Merge branch '1441-Búsqueda-y-ordenación-no-funcionan-correctamente-dev' into 'develop' 
Fixed order by remote

See merge request artica/pandorafms!1009
 2017-11-03 09:04:51 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +01:00
enriquecd 8ae61c9a84 Change agent group and gis maps icons - #1121 2017-11-02 17:33:33 +01:00
danielmaya d198cbf597 Fixed order by remote 2017-11-02 17:23:57 +01:00
enriquecd f0fe30fc3a Now can create static graphs a group items without images, fix bugs - #1407 2017-11-02 15:54:18 +01:00