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

14095 Commits

Author SHA1 Message Date
vgilc 976c02c653 Merge branch 'fixed_bad_function_in_mr_system' into 'develop' 
Fixed bad bucle

See merge request !350
 2017-04-06 17:56:57 +02:00
Arturo Gonzalez df42f2a26b Fixed bad bucle 2017-04-06 17:38:05 +02:00
vanessa gil 3d506d2967 new file. 2017-04-06 15:43:02 +02:00
vanessa gil 12548bddc8 new file. 2017-04-06 14:13:19 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
vanessa gil 5582240770 removed file. 2017-04-05 17:47:27 +02:00
vgilc 7094f8c1c3 Merge branch '693-UM_in_meta' into 'develop' 
Added lost url to um open online

See merge request !346
 2017-04-05 17:00:06 +02:00
Arturo Gonzalez 640fee4b82 Added lost url to um open online 2017-04-05 16:23:30 +02:00
vanessa gil 0d21e46939 new file. 2017-04-05 11:09:48 +02:00
vgilc abbc22335c Merge branch '701-UM_and_RR_in_meta' into 'develop' 
Added some modifications to adapt um and rr in meta

See merge request !345
 2017-04-05 10:44:37 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
vgilc 09b9866b89 Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378' into 'develop' 
Added disk free (in MB) in percent disk free native windows module

See merge request !263
 2017-04-04 09:30:57 +02:00
vgilc fb0cca8bad Merge branch 'cherry-pick-b333e79e' into 'develop' 
Fixed name of agents and images status in report Agents/Modules. Gitlab: #553

See merge request !286
 2017-04-04 09:16:01 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
vgilc 1f7a4a13b7 Merge branch 'Networkmaps_time_improvements' into 'develop' 
Added time improvements to networkmaps

See merge request !341
 2017-04-03 14:32:16 +02:00
Arturo Gonzalez 12203f9c2b Added time improvements to networkmaps 2017-04-03 14:20:11 +02:00
vgilc 6fbd8b9978 Merge branch '673-674-networkmap_visual_changes' into 'develop' 
Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
 2017-04-03 13:53:17 +02:00
vgilc 4c8ebe44a3 Merge branch '112-error-footer-en-mapas-de-red' into 'develop' 
Reposition of footer after load ajax elements in networkmap dialog - #112

See merge request !337
 2017-04-03 13:50:00 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
nramon 5036ad9467 Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop' 
Metaconsole nodes will always sync the agent cache.

See merge request !333
 2017-03-31 14:50:12 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Arturo Gonzalez 5f29a8f831 Added visual changes to module nodes in networkmap and added a new option to change the node name 2017-03-31 13:18:28 +02:00
Ramon Novoa 03b0b3cb33 Metaconsole nodes will always sync the agent cache. 2017-03-31 11:39:25 +02:00
vanessa gil a445877497 new file. 2017-03-31 10:36:05 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
vgilc c65d7d27a3 Merge branch '664-665-visual_modifications_to_networkmaps_in_footer_and_interface_text' into 'develop' 
Added a few modifications to move the footer when nodes table is too long and re…

See merge request !327
 2017-03-30 16:26:42 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
nramon 2cd8a790ca Merge branch '560-modificar-la-metaconsola-consola-para-sincronizar-licencias-con-los-nodos' into 'develop' 
Add support for the new metaconsole licensing mode.

See merge request !326
 2017-03-30 15:49:45 +02:00
m-lopez-f ce5b5dab66 Fixed images. Only simple images in item Agent/modules report 2017-03-30 13:23:30 +02:00
Ramon Novoa 7f1030abd6 Add support for the new metaconsole licensing mode. 2017-03-30 09:47:00 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
vgilc f7b4523b1f Merge branch 'problems-with-interfaces-snmp' into 'develop' 
Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
 2017-03-29 10:12:53 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
vgilc 81e15f3d9c Merge branch '555-Network_maps_must_show_all_mm_links' into 'develop' 
555 network maps must show all mm links

See merge request !311
 2017-03-28 16:38:14 +02:00
Arturo Gonzalez a8b7f055f4 Added a lot of changes to networkmaps 2017-03-28 14:37:40 +02:00
Arturo Gonzalez bcb8968bec Added a few modifications to networkmaps 2017-03-28 11:32:58 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
Arturo Gonzalez a0d9ddd8e6 Added some changes to networkmap 2017-03-27 17:55:17 +02:00
Arturo Gonzalez 27e8ddcdaf Added AMA edges to list of links with the same parent and children 2017-03-27 16:37:26 +02:00
Arturo Gonzalez 311143067a Fixed identical text to multiple links delimiter 2017-03-27 16:28:24 +02:00
Arturo Gonzalez 9512d61e16 Added interface text to add i.link or u.link 2017-03-27 16:03:25 +02:00
Arturo Gonzalez 949fbc3660 Added the second interface text 2017-03-27 15:33:27 +02:00
Arturo Gonzalez fc7afffb2c Added curved lines to networkmap to support more than 1 MM edges between the same node 2017-03-27 14:28:11 +02:00
vgilc ff55cd831a Merge branch 'cambio_logo_login_for_defect' into 'develop' 
fixed custom logo login

See merge request !303
 2017-03-27 12:25:58 +02:00
daniel 13620b1489 fixed custom logo login 2017-03-27 12:01:31 +02:00