Checkpoint: basic network view controllers and network active scaffold config
Checkpoint: basic network view controllers and network active scaffold config
Handle nil or "" as the proposal_id
Merge pull request #118 from cdearborn/pull-req-master-63dfe3a3c387afc82552207b7258fc5a376b93bc

Merged by devtool for aabes
fix unless to be while
Merge pull request #119 from cloudedge/pull-req-master-a5cef33661485f12205db574632537726a51de3b

Barclamp View fix (Trello 73) [2/2]
Use: attr_protected :id instead of # attr_accessible :cidr to allow for nested resources.
Adding support for enable_interface API call.
checkpoint and added user guide network doc.
merge all methods from network_controller to networks_controller to follow RoR conventions.
merge all methods from network_controller to networks_controller to follow RoR conventions.
Merged in lastest code from network_controller.rb which will be deleted
Somehow lost network userguide, adding file, will have to re-add content
Condensing network navigation items into single migration in network barclamp
Condensing network navigation items into single migration in network barclamp
Merge pull request #120 from cdearborn/pull-req-master-fe0917c7e9a995496f74a4c4b8261c69cda8201c

Merged by devtool for cloudedge
This pull adds setting the allocated ip address as a custom attribute on a node,
and adds the first piece of the conduit calculation get_bus_map along
with a custom attribute that fronts it.
small tweaks to network UI around localization and regression issue with back-end change, disabled VLAN link for time being.
removing network_controller.rb as all code is migrated to networks_controller.rb to comply with proper rails plurality convention.
removing uneeded network views.