Modify ERD dia file
Use the remote dia file
Pass lan_id in hash params when clicking the submit button in view vlans/_form.html.erb
Add more comments on passing lan_id in has params in vlans/_form.html.erb
Implementing import functionality
Implement importing functionality continued
Try to pass lan_id from the view to the controller
Fix conflicts in vlans/index.html.erb
Implement the VLAN import functionality ugly
Implement the VLAN import functionality ugly
Add VLANs import template specs in the view
Delete method set_lan from vlans_controller.rb
Remove the code related with lan in VLANs views and vlans_controller.rb
modify controllers
Remove the code related with lan in VLANs views and vlans_controller.rb
Decouple resources vlans & lans
Merge branch 'develop' of https://github.com/guanglindu/ipams
modify reserved_addresses_controller.rb
and views
Beautify routes.rb a little bit
Merge branch 'master' of https://github.com/goodmaoxixi/IPAMS into develop