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

15968 Commits

Author SHA1 Message Date
vgilc 3320bfb669 Merge branch '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev' into 'develop' 
Changed column in tuser_task_scheduled

See merge request artica/pandorafms!958
 2017-11-15 10:14:38 +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 fbbd029812 Merge branch 'ent-1493-problemas-con-las-entidades-html-al-crear-eventos-con-el-pandora_server' into 'develop' 
Added safe_output to server events

See merge request artica/pandorafms!970
 2017-11-15 09:40:10 +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
vgilc 6a71b9a359 Merge branch 'MR-8-dev' into 'develop' 
Changed MR

See merge request artica/pandorafms!1061
 2017-11-14 10:47:39 +01:00
danielmaya e6d5adbf22 Changed MR 2017-11-14 10:38:50 +01:00
vgilc 0f34ff8292 Merge branch '1416-cambios-visuales-en-la-grafica-de-barras-en-consola-visual-dev' into 'develop' 
Added height to bars graph

See merge request artica/pandorafms!1059
 2017-11-14 09:03:03 +01:00
vgilc c65841938a Merge branch '182-fallo-instalador-pwrd' into 'develop' 
Fixed install_pwrd (added logrotate)

Closes #182

See merge request artica/pandorafms!1058
 2017-11-14 08:59:01 +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
fbsanchez d60f35e083 Fixed install_pwrd (added logrotate) 2017-11-13 19:12:56 +01:00
vgilc fa82e0317a Merge branch '1378-cambios-visuales-en-la-grafica-de-donut-en-consola-visual-dev' into 'develop' 
Added visual changes to donut graph

See merge request artica/pandorafms!1056
 2017-11-13 13:02:52 +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
vgilc 319db7709a Merge branch '1416-grafica-de-barras-en-consola-visual-dev' into 'develop' 
Added changes from donut graph

See merge request artica/pandorafms!1052
 2017-11-13 10:20:00 +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
Arturo Gonzalez fa50ac5cdf Added link color 2017-11-10 11:05:53 +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