Catch up PR with lots of changes.#1

Open

huxoll wants to merge 279 commits intodrewbrown:masterfrom

MomentumSI:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Jan 31, 2014

Took out forgotten debuggers.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 1, 2014

Implemented the changes on StackStudio UI to add/remove router interface.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Added the name placeholder on the HTML template and displayed it on the model.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 5, 2014

Added UI disable/enable if an interface has already been added/removed from the OpenStack router.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 6, 2014

Commits on Feb 7, 2014

In process of adding UI changes to better handle router destroy in StackStudio.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Fixed JS view to sync with changes in CloudMux. Also, implemented the new warning message if deleting a router with active interfaces.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Fixed minor interface table selection error.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Eliminated jasmine-istanbul dependancy and updated grunt-contrib-jasmine from 0.3.1 to 0.5.2

Luis M. Valerio
authored and
Luis M. Valerio
committed
Clean up code not used.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Merge pull request #82 from TranscendComputing/routers
huxoll
committed

Commits on Feb 11, 2014

Added an update user button to the template. Nonfunctional at the moment..

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 12, 2014

Added UI changes to be able to update a user account. Work in progress.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Added admin info to be sent with request to able to update users from admin panel.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 13, 2014

Tested and got the update user account functionality from the admin dashboard. Also, Refactor some code for better design and working on adding the remove permissions support.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Completed user info update from admin account functionality.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 14, 2014

Added my account link in the naviagation menu for users to update their email and password. Work in progress.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Finished adding update user info functionality for their own account. Removed the temporary feature to update user password. Added a my account page.

Luis M. Valerio
authored and
Luis M. Valerio
committed

Commits on Feb 15, 2014

Finished making changes to UI after code review. Need to display password rules to complete.

Luis M. Valerio
authored and
Luis M. Valerio
committed
Fix spec runner HTML to work; verify with JSCover report.
John Gardner
committed

Commits on Feb 18, 2014

Fix to GitHub issue #83 on StackStudio.

Luis Valerio
authored and
Luis Valerio
committed
Added display password rules to the new homepage.

Luis Valerio
authored and
Luis Valerio
committed
Fix issue on Manage Cloud Account page for OpenStack. The Add Service button wasn't working and the form wasn't updating properly.

Luis Valerio
authored and
Luis Valerio
committed
Final UI format for the new My Account page on StackStudio.

Luis Valerio
authored and
Luis Valerio
committed
Refactor code to improve code quality.

Luis Valerio
authored and
Luis Valerio
committed

Commits on Feb 19, 2014

Merge pull request #84 from TranscendComputing/update_user
huxoll
committed

Commits on Feb 21, 2014

Modify UI to display the list of Route Tables.

Luis Valerio
authored and
Luis Valerio
committed

Commits on Feb 22, 2014

Added the create and destroy route tables functionality. Modify UI to show more info about tables

Luis Valerio
authored and
Luis Valerio
committed

Commits on Feb 24, 2014

UI changes to display routes in every route table

Luis Valerio
authored and
Luis Valerio
committed

Commits on Feb 25, 2014

UI changes to display route table routes, associations, route propagation

Luis Valerio
authored and
Luis Valerio
committed

Commits on Mar 3, 2014

Update to StackStudio Issue #11. Added a dialog to let people know about unfinished features.

Luis Valerio
authored and
Luis Valerio
committed

Commits on Mar 18, 2014

Merge pull request #85 from TranscendComputing/route_tables
huxoll
committed

Commits on Apr 9, 2014

Added instructor.js
phillip
committed
Logic for first-time tutorial
phillip
committed
More views for tutorial
phillip
committed
Tutorial styling
phillip
committed
Templates for tutorial
phillip
committed
forgot some tutorial files
phillip
committed
removed unnecessary check for num_logins within tutorial view
phillip
committed
changed max logins for tutorial to something more reasonable
phillip
committed

Commits on Apr 10, 2014

setting height on input elements tends to mess things up
phillip
committed
corrected error on cloud account service creation
phillip
committed

Commits on Apr 14, 2014

Merge remote-tracking branch 'origin/dev'
phillip
committed
added forms for creating vcloud credentials
phillip
committed
added some scaffolding for VMware integration
phillip
committed
added vmware logo
phillip
committed
vcloud cloud credentials implementation
phillip
committed
vcloud organizations implementation
phillip
committed

Commits on Apr 17, 2014

Added VCloud templates, views
phillip
committed
added vcloud templates/views
phillip
committed

Commits on Apr 21, 2014

Bump jasmine version.
John Gardner
committed
Bump jasmine version.
John Gardner
committed

Commits on Apr 24, 2014

added support for vcloud director api

Phil
authored and
Phil
committed
added treeView styling

Phil
authored and
Phil
committed
added javascript treeview widget

Phil
authored and
Phil
committed
fixed bug that causes aws resource apps not to display correctly

Phil
authored and
Phil
committed

Commits on May 1, 2014

Merge branch 'dev'
bears4barrett
committed
Modified styling for tutorial and VCloud tree view

Phil
authored and
Phil
committed
updated treeview plugin code

Phil
authored and
Phil
committed
Updated code to add underscore functions

Phil
authored and
Phil
committed
minor changes to tutorial code

Phil
authored and
Phil
committed
updated credentials template for vcloud to say 'vcloud' instead of 'openstack'

Phil
authored and
Phil
committed
added vcloud provisioning functionality (catalogs, networks)

Phil
authored and
Phil
committed
added models, collections, views for vcloud catalogs

Phil
authored and
Phil
committed
moved code to extend underscore

Phil
authored and
Phil
committed
Merge remote-tracking branch 'origin/vcloud'
bears4barrett
committed
made opentip styling a LESS file so it doesn't get ignored

Phil
authored and
Phil
committed
added functionality to allow functions as data source for treeview

Phil
authored and
Phil
committed
Merge pull request #88 from pjschmidt3/0v
pjschmidt3
committed

Commits on May 5, 2014

Updated views for vcloud management

Phil
authored and
Phil
committed
Refactored vcloud managment workflow

Phil
authored and
Phil
committed

Commits on May 6, 2014

Started adding Associate/Disassociate route tables functionality. Still need to finish the dissasociation dialog.

Luis Valerio
authored and
Luis Valerio
committed
fixed resourceModel by stringifying json before sending to cloudmux
bears4barrett
committed
Merge pull request #91 from bears4barrett/resource_model_update
bears4barrett
committed
Fixed some sintax error and the parsing error when sending the request to Cloudmux.

Luis Valerio
authored and
Luis Valerio
committed

Commits on May 7, 2014

Added selection function for the associations table.

Luis Valerio
authored and
Luis Valerio
committed
Added vcloud catalog viewing/instantiating functionality

Phil
authored and
Phil
committed
Merge pull request #92 from pjschmidt3/master
bears4barrett
committed
Added the disassociate route tables from subnets dialog.

Luis Valerio
authored and
Luis Valerio
committed
Merge pull request #93 from lvalerio/route_tables
bears4barrett
committed

Commits on May 8, 2014

Support for displaying, adding and deleting VPC Network ACLs.

Luis Valerio
authored and
Luis Valerio
committed
Fixed minor display issues with the table and changed the parameters sent for the request to the right format.

Luis Valerio
authored and
Luis Valerio
committed
Added rvm default version files to gitignore
Eric Thompson
committed
Merge pull request #95 from lvalerio/route_tables
bears4barrett
committed
Updated dashboard view to only show getstarted div if user is not authed
Eric Thompson
committed
Merge pull request #96 from lifeBCE/master
bears4barrett
committed

Commits on May 9, 2014

Optimized ResourceDetailView's constructor a bit
Eric Thompson
committed
Even better optimization to build route
Eric Thompson
committed
use strict does not like absence of brackets on single instruction conditionals
Eric Thompson
committed
Fixed issues with grunt tests so build can pass
Eric Thompson
committed
Merge pull request #99 from lifeBCE/master
bears4barrett
committed
Refactored vcloud collections a little to remove unnecessary inheritance

Phil
authored and
Phil
committed
Removed old files

Phil
authored and
Phil
committed
updated backbone models/collections for new vcloud support

Phil
authored and
Phil
committed
minor

Phil
authored and
Phil
committed
minor

Phil
authored and
Phil
committed
some refactoring for flatter vcloud UI (dropped treeview)

Phil
authored and
Phil
committed
added views/templates for new vcloud UI

Phil
authored and
Phil
committed
Merge branch 'master' of https://github.com/TranscendComputing/StackStudio

Phil
authored and
Phil
committed

Commits on May 12, 2014

Commits on May 13, 2014

Got jasmine working with grunt and requirejs
Eric Thompson
committed

Commits on May 15, 2014

Large refactor:
Eric Thompson
committed
Merge remote-tracking branch 'upstream/master'
Eric Thompson
committed
Fixed defect in iews/account/navLogin.js preventing views from loading (part of refactor)
Eric Thompson
committed
More cleanup mainly dealing with source formatting
Eric Thompson
committed
Fixed issues with trailing comma in rjs config
Eric Thompson
committed
Holy sh%@!
Eric Thompson
committed
Dang new git add -A!
Eric Thompson
committed

Commits on May 16, 2014

Added function to remove credentials associated with an accoun that has been removed
nalmanza
committed
Massive refactor of cloud management and "Cloud Setup", formerly Account Management

Phil
authored and
Phil
committed
added some new templates/views for the refactor

Phil
authored and
Phil
committed
just a test

Phil
authored and
Phil
committed

Commits on May 17, 2014

-Refactored massive switch statement in accountManagementView jQuery binding
Eric Thompson
committed

Commits on May 19, 2014

Merge branch 'cloud_management_refactor'
Eric Thompson
committed
Updated line endings.
Eric Thompson
committed
Missed two files in merge conflict resolution
Eric Thompson
committed
Missed index.html in merge conflict
Eric Thompson
committed
Couple of minor bugfixes

Phil
authored and
Phil
committed
Merge branch 'cloud_management_refactor'
Eric Thompson
committed
Addeed xit and jasmine to jshintrc file
Eric Thompson
committed
fixed some dependencies with new require config

Phil
authored and
Phil
committed
Added all file extensions to absolute paths
Eric Thompson
committed
fixed common docker file require error

Phil
authored and
Phil
committed
Merge branch 'cloud_management_refactor'
Eric Thompson
committed
Updates RequireJS config with some needed dependencies.
Eric Thompson
committed
several bugfixes related to cloud management view state

Phil
authored and
Phil
committed
Updated router specs to work with new cloud/setup routes
Eric Thompson
committed

Commits on May 20, 2014

Finished refactoring cloud management views to use bootstrap components

Phil
authored and
Phil
committed
minor bugfix with new rjsConfig refactor

Phil
authored and
Phil
committed
Re-added password change view

Phil
authored and
Phil
committed
Working on getting access to the markup via jQuery and jasmine fuxtures
Eric Thompson
committed
Merge remote-tracking branch 'phillip/develop' into develop
Eric Thompson
committed
minor

Phil
authored and
Phil
committed
Commit to leave branch (no stash)
Eric Thompson
committed
-Commented some javascript loading in index.html to alleviate conflcits with rjs
Eric Thompson
committed
-Commented some javascript loading in index.html to alleviate conflcits with rjs
Eric Thompson
committed
Merge remote-tracking branch 'phillip/develop' into develop
Eric Thompson
committed

Commits on May 21, 2014

-Fixed race condition in cloudSetupView initialize() that relied on ajax calls to take long enough for logic to continue and render template after call. Moved call to render up before all calls to …
Eric Thompson
committed

Commits on May 22, 2014

Merge branch 'jasmine-jquery' into develop
Eric Thompson
committed
Looks like a merge went heywire.
Eric Thompson
committed
More merge fixing
Eric Thompson
committed
Ok, now accountManagementView.js is as it was prior to develop refactor merge
Eric Thompson
committed
Made jshint happy regarding some multi-line concatenation, adding variabled for NewLogin and ===, etc
Eric Thompson
committed
minor

Phil
authored and
Phil
committed
Added more test datasets for group and users list
Eric Thompson
committed

Commits on May 23, 2014

Commits on May 27, 2014

Merge pull request #102 from nalmanza/deleteAssocCredentials
huxoll
committed

Commits on May 28, 2014

Updated cloudSetupView jQuery binding logic
Eric Thompson
committed

Commits on May 29, 2014

Defaulted Cloud Accounts menu item to be active and open in cloudSetupTemplate.html
Eric Thompson
committed

Commits on May 30, 2014

Remove dependency on HTML5 session, greatly enhanced login UX, general refactor

Phil
authored and
Phil
committed
Updated login/register UI and improved markup

Phil
authored and
Phil
committed
Some styling to augment bootstrap design

Phil
authored and
Phil
committed
Converted some tables to definition lists to improve markup semantics and UI appearance

Phil
authored and
Phil
committed
Changed VMware logo to opaque one

Phil
authored and
Phil
committed
fixed bug where clicking on old link to specific cloud account, group, policy, etc wasn't working correctly

Phil
authored and
Phil
committed
merged with eric

Phil
authored and
Phil
committed
Merge pull request #105 from lifeBCE/develop
pjschmidt3
committed
Merge pull request #117 from pjschmidt3/master
pjschmidt3
committed
Merge pull request #118 from TranscendComputing/develop
pjschmidt3
committed
Minor syntax fixes to make grunt happy
Curtis Stewart
committed
Added jasmine-jquery cdn
Curtis Stewart
committed
Added cdn path for jasmine-jquery
Eric Thompson
committed
Merge remote-tracking branch 'upstream/master' into develop
Eric Thompson
committed
Starting better organization of spec files
Eric Thompson
committed
Initial 'mesh' support
Curtis Stewart
committed
Updated jasmine-jquery path
Curtis Stewart
committed
Moved config/package.json back to root, as there are components such as travis CI that depend on that location
Curtis Stewart
committed
Removed old config/package.json
Curtis Stewart
committed

Commits on Jun 2, 2014

Updated generic component templates. Added mock data for appliances
Curtis Stewart
committed

Commits on Jun 3, 2014

Added capsule view support. Used underscore template for capsule
Curtis Stewart
committed
Additional logic for empty or undefined TunnelTo attributes
Curtis Stewart
committed
Updated template logic for secure tunnels
Curtis Stewart
committed
Merge branch 'syntax_fixes' into cstewart/containermesh_init
Curtis Stewart
committed
fixed jasmine tests

Phil
authored and
Phil
committed
Merge remote-tracking branch 'phil/master' into syntax_fixes
Curtis Stewart
committed
Removed remaining 'JSON.parse(Common.account....' references
Curtis Stewart
committed
Added default ServicePorts
Curtis Stewart
committed
Updated capsules mock data
Curtis Stewart
committed
some cleanup for code climate

Phil
authored and
Phil
committed
Merge pull request #121 from pjschmidt3/master
pjschmidt3
committed
Initial support for grids
Curtis Stewart
committed
Merge branch 'master' into cstewart/containermesh_init
Curtis Stewart
committed
Fixed appending issue in gridsView
Curtis Stewart
committed
Updated travis build to use config/package.json
Curtis Stewart
committed
Updated default grid values. Reordered main mesh tabs
Curtis Stewart
committed
Removed unneccessary config/package.json. Updated travis.yml to create config/backend.json before running tests
Curtis Stewart
committed
Merge pull request #122 from cstewart87/cstewart/containermesh_init
Curtis Stewart
committed

Commits on Jun 4, 2014

Added TESTING.md doc
Curtis Stewart
committed
Added form for new capsule
Curtis Stewart
committed
Merge pull request #124 from cstewart87/testing_doc
Curtis Stewart
committed
Removed unused event
Curtis Stewart
committed
Updated capsules list to display name
Curtis Stewart
committed
Removed extra elements from appliance html
Curtis Stewart
committed
Updated new appliance view
Curtis Stewart
committed

Commits on Jun 5, 2014

Updated grid view layout. Also added NewGrid form
Curtis Stewart
committed
Merge remote-tracking branch 'upstream/master'
Eric Thompson
committed
Got cloudSetup view back in shape.
Eric Thompson
committed
Missing semi-colon
Eric Thompson
committed
Disabled logic preventing user from editing their own user account from this interface
Eric Thompson
committed
Merge pull request #126 from lifeBCE/cloudSetup_route_refactor
Curtis Stewart
committed
Merge pull request #125 from cstewart87/new_capsule_form
pjschmidt3
committed
Simple fix to point URL at proper route. (Issue #129)
Eric Thompson
committed
Fixes issue #131.
Eric Thompson
committed

Commits on Jun 6, 2014

Merge pull request #130 from lifeBCE/issue_129
Curtis Stewart
committed
Merge pull request #132 from lifeBCE/issue_131
Curtis Stewart
committed

Commits on Jun 9, 2014

Commits on Jun 10, 2014

Commits on Jun 11, 2014

Updated some spacing and indentions (mixed tabs and spaces)
Eric Thompson
committed
Missing semi-colon.
Eric Thompson
committed
Fixed all issues with Common.credentials type
Eric Thompson
committed
fixes issue #143
Eric Thompson
committed

Commits on Jun 12, 2014

Uncommented url attribute of stacks collection so Backbone will stop complaining
Eric Thompson
committed

Commits on Jun 13, 2014

Commits on Jun 16, 2014

Merge pull request #144 from lifeBCE/issue_143
huxoll
committed
Updated some spacing and indentions (mixed tabs and spaces)
Eric Thompson
committed
Missing semi-colon.
Eric Thompson
committed
Fixed all issues with Common.credentials type
Eric Thompson
committed
Merge branch 'issue_139' of github.com:lifeBCE/StackStudio into issue_139
Eric Thompson
committed

Commits on Jun 17, 2014

Merge pull request #141 from lifeBCE/issue_139
huxoll
committed
Initial cleanup starting in main.js and common.js
Eric Thompson
committed
Enabled the accountManagementiView within main.js again
Eric Thompson
committed
Removed view files that were not referenced anywhere in the application.
Eric Thompson
committed
Think main.js is set now
Eric Thompson
committed
Initial migration of all common vendor libs to common.js and then referenced as such in each view, etc.
Eric Thompson
committed
All top-level views have now been migrated to utilize common vendor libs via Common
Eric Thompson
committed
Restructured offline support logic for loading vendor library files
Eric Thompson
committed
Re-accomplished fix for issue #143, defaulting selectedId to id when selectedId is undefined so index list items are clickable.
Eric Thompson
committed
Enabled meshes views in main.js
Eric Thompson
committed

Commits on Jul 30, 2014

Remove datatables plugin; not working.
John Gardner
committed

Commits on Aug 12, 2016

Remove cruft.
huxoll
committed