Skip to content

Catch up PR with lots of changes. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huxoll wants to merge 279 commits into
base: master
Choose a base branch
from
Open

Catch up PR with lots of changes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
279 commits
Select commit Hold shift + click to select a range
e787fc9
Took out forgotten debuggers.
Jan 31, 2014
ebff9c7
Implemented the changes on StackStudio UI to add/remove router interf…
Feb 1, 2014
52655d2
Added the name placeholder on the HTML template and displayed it on t…
Feb 1, 2014
c6ae7b4
Added UI disable/enable if an interface has already been added/remove…
Feb 5, 2014
7616a6a
Adding UI change for routers so that interfaces are displayed on a ta…
Feb 6, 2014
074bfd4
added validate funtion to 'ping' servers
bears4barrett Feb 6, 2014
5da7d0c
refactored ciServer add/edit to validate url prior to save/update
bears4barrett Feb 6, 2014
cb8873b
scope resolved, removed unnecessary code
bears4barrett Feb 6, 2014
2a1f3a8
Final UI changes to OpenStack Routers in StackStudio. Routers now hav…
Feb 6, 2014
f104208
In process of adding UI changes to better handle router destroy in St…
Feb 7, 2014
4536e30
Fixed JS view to sync with changes in CloudMux. Also, implemented the…
Feb 7, 2014
8145675
Fixed minor interface table selection error.
Feb 7, 2014
0651e45
Eliminated jasmine-istanbul dependancy and updated grunt-contrib-jasm…
Feb 7, 2014
ce3c378
Clean up code not used.
Feb 7, 2014
2d99921
Merge pull request #82 from TranscendComputing/routers
huxoll Feb 7, 2014
5dbcb3d
Added an update user button to the template. Nonfunctional at the mom…
Feb 11, 2014
7b876c2
Added UI changes to be able to update a user account. Work in progress.
Feb 12, 2014
cf1ff52
Added admin info to be sent with request to able to update users from…
Feb 12, 2014
86c1434
Tested and got the update user account functionality from the admin d…
Feb 13, 2014
f78ea8f
Completed user info update from admin account functionality.
Feb 13, 2014
6effacc
Added my account link in the naviagation menu for users to update the…
Feb 14, 2014
7a70e6c
Finished adding update user info functionality for their own account.…
Feb 14, 2014
2f1db30
Finished making changes to UI after code review. Need to display pass…
Feb 15, 2014
1ff8102
Fix spec runner HTML to work; verify with JSCover report.
Feb 15, 2014
3f32650
Fix to GitHub issue #83 on StackStudio.
Feb 18, 2014
269af95
Added display password rules to the new homepage.
Feb 18, 2014
aab89d3
Fix issue on Manage Cloud Account page for OpenStack. The Add Service…
Feb 18, 2014
676e5dd
Final UI format for the new My Account page on StackStudio.
Feb 18, 2014
c6e4dcc
Refactor code to improve code quality.
Feb 18, 2014
f50353c
Merge pull request #84 from TranscendComputing/update_user
huxoll Feb 19, 2014
446bff1
Modify UI to display the list of Route Tables.
Feb 21, 2014
95c453d
Added the create and destroy route tables functionality. Modify UI to…
Feb 22, 2014
a249d9f
UI changes to display routes in every route table
Feb 24, 2014
e9e5ba2
UI changes to display route table routes, associations, route propaga…
Feb 25, 2014
8703975
Update to StackStudio Issue #11. Added a dialog to let people know ab…
Mar 3, 2014
b62fb7e
Merge pull request #85 from TranscendComputing/route_tables
huxoll Mar 18, 2014
7fff25c
Added instructor.js
Apr 9, 2014
f3a1fc4
Logic for first-time tutorial
Apr 9, 2014
07a0242
More views for tutorial
Apr 9, 2014
efaf012
Tutorial styling
Apr 9, 2014
4a8edf8
Templates for tutorial
Apr 9, 2014
26a3318
forgot some tutorial files
Apr 9, 2014
5ad68fd
removed unnecessary check for num_logins within tutorial view
Apr 9, 2014
3abb4aa
changed max logins for tutorial to something more reasonable
Apr 9, 2014
200fe46
setting height on input elements tends to mess things up
Apr 10, 2014
e485844
corrected error on cloud account service creation
Apr 10, 2014
cdc3601
Merge remote-tracking branch 'origin/dev'
Apr 14, 2014
ee8d8f8
added forms for creating vcloud credentials
Apr 14, 2014
1ccfff1
added some scaffolding for VMware integration
Apr 14, 2014
0a6660c
added vmware logo
Apr 14, 2014
1f7f6a1
vcloud cloud credentials implementation
Apr 14, 2014
ae3b020
vcloud organizations implementation
Apr 14, 2014
588dfec
Added VCloud templates, views
Apr 17, 2014
7776c7f
added vcloud templates/views
Apr 17, 2014
c494642
Bump jasmine version.
Apr 21, 2014
8cd3f40
Bump jasmine version.
Apr 21, 2014
52e047c
added support for vcloud director api
Apr 24, 2014
8f94aa5
added treeView styling
Apr 24, 2014
755b3f0
added javascript treeview widget
Apr 24, 2014
fd4f2e3
fixed bug that causes aws resource apps not to display correctly
Apr 24, 2014
eaba94e
Merge branch 'dev'
bears4barrett May 1, 2014
25bd969
Modified styling for tutorial and VCloud tree view
May 1, 2014
478263d
updated treeview plugin code
May 1, 2014
36f072e
Updated code to add underscore functions
May 1, 2014
a721ea2
minor changes to tutorial code
May 1, 2014
4dbca8d
updated credentials template for vcloud to say 'vcloud' instead of 'o…
May 1, 2014
c6887e3
added vcloud provisioning functionality (catalogs, networks)
May 1, 2014
f53186b
added models, collections, views for vcloud catalogs
May 1, 2014
914e841
moved code to extend underscore
May 1, 2014
d94b657
Merge remote-tracking branch 'origin/vcloud'
bears4barrett May 1, 2014
4a95fda
made opentip styling a LESS file so it doesn't get ignored
May 1, 2014
59db3b3
added functionality to allow functions as data source for treeview
May 1, 2014
b484248
Merge pull request #88 from pjschmidt3/0v
May 1, 2014
bb9faec
Updated views for vcloud management
May 5, 2014
463d1b6
Refactored vcloud managment workflow
May 5, 2014
2274858
Started adding Associate/Disassociate route tables functionality. Sti…
May 6, 2014
3218ec3
fixed resourceModel by stringifying json before sending to cloudmux
bears4barrett May 6, 2014
9aa6a9a
Merge pull request #91 from bears4barrett/resource_model_update
bears4barrett May 6, 2014
0086dfc
Fixed some sintax error and the parsing error when sending the reques…
May 6, 2014
286f045
Added selection function for the associations table.
May 7, 2014
4849699
Added vcloud catalog viewing/instantiating functionality
May 7, 2014
5e24eb4
Merge pull request #92 from pjschmidt3/master
bears4barrett May 7, 2014
a4393c9
Added the disassociate route tables from subnets dialog.
May 7, 2014
f02ccfb
Merge pull request #93 from lvalerio/route_tables
bears4barrett May 7, 2014
3c65a9e
Support for displaying, adding and deleting VPC Network ACLs.
May 8, 2014
4d2dc82
Fixed minor display issues with the table and changed the parameters …
May 8, 2014
41832ff
Added rvm default version files to gitignore
May 8, 2014
ce8ebed
Merge pull request #95 from lvalerio/route_tables
bears4barrett May 8, 2014
71da1c3
Updated dashboard view to only show getstarted div if user is not authed
May 8, 2014
6238fca
Merge pull request #96 from lifeBCE/master
bears4barrett May 8, 2014
79ff87c
Optimized ResourceDetailView's constructor a bit
May 9, 2014
4c37d36
Even better optimization to build route
May 9, 2014
8e2a6c2
use strict does not like absence of brackets on single instruction co…
May 9, 2014
2407be3
Fixed issues with grunt tests so build can pass
May 9, 2014
c3f08f5
Merge pull request #99 from lifeBCE/master
bears4barrett May 9, 2014
f895fdf
Refactored vcloud collections a little to remove unnecessary inheritance
May 9, 2014
95d4943
Removed old files
May 9, 2014
66bbf33
updated backbone models/collections for new vcloud support
May 9, 2014
7fb2a4b
minor
May 9, 2014
9fc4de0
minor
May 9, 2014
b90ab23
some refactoring for flatter vcloud UI (dropped treeview)
May 9, 2014
883249b
added views/templates for new vcloud UI
May 9, 2014
adc3f41
Merge branch 'master' of https://github.com/TranscendComputing/StackS…
May 9, 2014
ced467b
More optimization around resource options when building route path to…
May 12, 2014
50c185f
Updated Dashboard nav item to utilized nav_selected class like all ot…
May 12, 2014
1571960
Merge pull request #100 from lifeBCE/master
huxoll May 12, 2014
d549b65
Got jasmine working with grunt and requirejs
May 13, 2014
a7e62d8
Large refactor:
May 15, 2014
36b7978
Merge remote-tracking branch 'upstream/master'
May 15, 2014
f96c64b
Fixed defect in iews/account/navLogin.js preventing views from loadin…
May 15, 2014
2a8bdef
More cleanup mainly dealing with source formatting
May 15, 2014
61479be
Fixed issues with trailing comma in rjs config
May 15, 2014
7b93283
Holy sh%@!
May 15, 2014
74d269a
Dang new git add -A!
May 15, 2014
1a4e81b
Added function to remove credentials associated with an accoun that h…
nalmanza May 16, 2014
78a2927
Massive refactor of cloud management and "Cloud Setup", formerly Acc…
May 16, 2014
328dd42
added some new templates/views for the refactor
May 16, 2014
265c16a
just a test
May 16, 2014
b8213b1
-Refactored massive switch statement in accountManagementView jQuery …
May 17, 2014
5d8d352
Merge branch 'cloud_management_refactor'
May 19, 2014
7957177
Updated line endings.
May 19, 2014
e676b10
Missed two files in merge conflict resolution
May 19, 2014
d4fea83
Missed index.html in merge conflict
May 19, 2014
b335bf6
Couple of minor bugfixes
May 19, 2014
a72e80a
Merge branch 'cloud_management_refactor'
May 19, 2014
40b4179
Addeed xit and jasmine to jshintrc file
May 19, 2014
dce116d
fixed some dependencies with new require config
May 19, 2014
3bdd368
Added all file extensions to absolute paths
May 19, 2014
ca310cf
fixed common docker file require error
May 19, 2014
f791b60
Merge branch 'cloud_management_refactor'
May 19, 2014
4f366d7
Updates RequireJS config with some needed dependencies.
May 19, 2014
338281b
several bugfixes related to cloud management view state
May 19, 2014
560f627
Updated router specs to work with new cloud/setup routes
May 19, 2014
4a2eb4e
Finished refactoring cloud management views to use bootstrap components
May 20, 2014
d21b6ae
minor bugfix with new rjsConfig refactor
May 20, 2014
0cc03ca
Re-added password change view
May 20, 2014
f94444d
Working on getting access to the markup via jQuery and jasmine fuxtures
May 20, 2014
5d0a67a
Merge remote-tracking branch 'phillip/develop' into develop
May 20, 2014
af5aa19
minor
May 20, 2014
4ef6c0d
Commit to leave branch (no stash)
May 20, 2014
e427267
-Commented some javascript loading in index.html to alleviate conflci…
May 20, 2014
50fd7af
-Commented some javascript loading in index.html to alleviate conflci…
May 20, 2014
290d756
Merge remote-tracking branch 'phillip/develop' into develop
May 20, 2014
2803cfa
-Fixed race condition in cloudSetupView initialize() that relied on a…
May 21, 2014
7a0aa5b
Merge branch 'jasmine-jquery' into develop
May 22, 2014
1055d84
Looks like a merge went heywire.
May 22, 2014
2e5fe6e
More merge fixing
May 22, 2014
ecbdf1c
Ok, now accountManagementView.js is as it was prior to develop refact…
May 22, 2014
8b42895
Made jshint happy regarding some multi-line concatenation, adding var…
May 22, 2014
18a57fc
minor
May 22, 2014
1506926
Added more test datasets for group and users list
May 22, 2014
465b103
Fixed isue with CloudSetup nav item not showing nav_selected class (n…
May 23, 2014
6b74d08
Updated cloudSetupSpec to include datasets and specs for verifying cl…
May 23, 2014
9408127
Cleaned up jshint warning
May 23, 2014
e245e3d
Updated cloudSetupSpec to include dataset and spec for verifying conf…
May 23, 2014
cb56e92
Merge pull request #102 from nalmanza/deleteAssocCredentials
huxoll May 27, 2014
dd93bfd
Updated cloudSetupView jQuery binding logic
May 28, 2014
c04de60
Defaulted Cloud Accounts menu item to be active and open in cloudSetu…
May 29, 2014
8bd8456
Remove dependency on HTML5 session, greatly enhanced login UX, genera…
May 30, 2014
824e0db
Updated login/register UI and improved markup
May 30, 2014
b77274c
Some styling to augment bootstrap design
May 30, 2014
4558a8c
Converted some tables to definition lists to improve markup semantics…
May 30, 2014
f79e395
Changed VMware logo to opaque one
May 30, 2014
13a3cd0
fixed bug where clicking on old link to specific cloud account, group…
May 30, 2014
5162a1a
merged with eric
May 30, 2014
df832d2
Merge pull request #105 from lifeBCE/develop
May 30, 2014
494710c
Merge pull request #117 from pjschmidt3/master
May 30, 2014
03171e5
Merge pull request #118 from TranscendComputing/develop
May 30, 2014
a959939
Minor syntax fixes to make grunt happy
May 30, 2014
67f9393
Added jasmine-jquery cdn
May 30, 2014
5b558db
Added cdn path for jasmine-jquery
May 30, 2014
a1a78d6
Merge remote-tracking branch 'upstream/master' into develop
May 30, 2014
2fb4b8d
Starting better organization of spec files
May 30, 2014
7d044f3
Initial 'mesh' support
May 30, 2014
8f7f394
Updated jasmine-jquery path
May 30, 2014
2789a4d
Moved config/package.json back to root, as there are components such …
May 30, 2014
82854b7
Removed old config/package.json
May 30, 2014
6b980b2
Updated generic component templates. Added mock data for appliances
Jun 2, 2014
e1a0640
Added capsule view support. Used underscore template for capsule
Jun 3, 2014
c896875
Additional logic for empty or undefined TunnelTo attributes
Jun 3, 2014
6064ca9
Updated template logic for secure tunnels
Jun 3, 2014
cae1f1b
Merge branch 'syntax_fixes' into cstewart/containermesh_init
Jun 3, 2014
ef2b6be
fixed jasmine tests
Jun 3, 2014
cb66678
Merge remote-tracking branch 'phil/master' into syntax_fixes
Jun 3, 2014
39958af
Removed remaining 'JSON.parse(Common.account....' references
Jun 3, 2014
d52d2a5
Added default ServicePorts
Jun 3, 2014
1171c79
Updated capsules mock data
Jun 3, 2014
3b9a0fe
some cleanup for code climate
Jun 3, 2014
fda3844
Merge pull request #121 from pjschmidt3/master
Jun 3, 2014
2491de9
Initial support for grids
Jun 3, 2014
b89faa3
Merge branch 'master' into cstewart/containermesh_init
Jun 3, 2014
45e384f
Fixed appending issue in gridsView
Jun 3, 2014
e02e3d9
Updated travis build to use config/package.json
Jun 3, 2014
07a8696
Updated default grid values. Reordered main mesh tabs
Jun 3, 2014
1b8ca77
Removed unneccessary config/package.json. Updated travis.yml to crea…
Jun 3, 2014
fde3f48
Merge pull request #122 from cstewart87/cstewart/containermesh_init
Jun 3, 2014
b623275
Added TESTING.md doc
Jun 4, 2014
fb1d864
Added form for new capsule
Jun 4, 2014
d6eef21
Merge pull request #124 from cstewart87/testing_doc
Jun 4, 2014
7cfadde
Removed unused event
Jun 4, 2014
29b150a
Updated capsules list to display name
Jun 4, 2014
789df46
Removed extra elements from appliance html
Jun 4, 2014
dac59d4
Updated new appliance view
Jun 4, 2014
16bd2ae
Updated grid view layout. Also added NewGrid form
Jun 5, 2014
5c9fb3f
Merge remote-tracking branch 'upstream/master'
Jun 5, 2014
520e686
Got cloudSetup view back in shape.
Jun 5, 2014
075f383
Missing semi-colon
Jun 5, 2014
8fdc5db
Disabled logic preventing user from editing their own user account fr…
Jun 5, 2014
7ca1cc5
Merge pull request #126 from lifeBCE/cloudSetup_route_refactor
Jun 5, 2014
1958062
Merge pull request #125 from cstewart87/new_capsule_form
Jun 5, 2014
e18797d
Simple fix to point URL at proper route. (Issue #129)
Jun 5, 2014
eebc802
Fixes issue #131.
Jun 5, 2014
df5d95b
Merge pull request #130 from lifeBCE/issue_129
Jun 6, 2014
9ea72d4
Merge pull request #132 from lifeBCE/issue_131
Jun 6, 2014
614e671
Removed 'category' stuff from jQuery router binding. This logic was t…
Jun 9, 2014
280cc09
Merge pull request #136 from lifeBCE/cloud_setup_cleanup
Jun 9, 2014
d8e58a6
Initial model unit tests for cloud
Jun 10, 2014
3f718bc
Added unit tests to short-circuit Backbone fetch() and save() to chec…
Jun 10, 2014
e034d46
Updated some spacing and indentions (mixed tabs and spaces)
Jun 11, 2014
f7d1c10
Missing semi-colon.
Jun 11, 2014
b6330d0
Fixed all issues with Common.credentials type
Jun 11, 2014
9527675
fixes issue #143
Jun 11, 2014
c38d493
Uncommented url attribute of stacks collection so Backbone will stop …
Jun 12, 2014
7ff92f4
Disabled stacks collection unit tests for now (was just single test P…
Jun 13, 2014
366a423
Removing Common.account.id from collection URL so anonymous users can…
Jun 13, 2014
fc69413
fixed bug with registration where countries didn't show up
Jun 13, 2014
4cd7fe3
Merge pull request #152 from pjschmidt3/master
huxoll Jun 13, 2014
ef41f3c
Merge pull request #134 from cstewart87/mesh_view_updates
huxoll Jun 13, 2014
cad2484
fixed bug with saving cloud credentials
Jun 13, 2014
ca69c3c
Merge branch 'master' of github.com:pjschmidt3/StackStudio into pjsch…
Jun 13, 2014
08841b3
Merge pull request for broken cloud credential create.
Jun 13, 2014
86e7e54
Merge pull request #150 from lifeBCE/issue_147
huxoll Jun 13, 2014
0a7725b
Merge pull request #138 from lifeBCE/model_unit_tests
huxoll Jun 13, 2014
4736eff
Merge pull request #144 from lifeBCE/issue_143
huxoll Jun 16, 2014
6d8d3b1
Updated some spacing and indentions (mixed tabs and spaces)
Jun 11, 2014
a1543bf
Missing semi-colon.
Jun 11, 2014
beec433
Fixed all issues with Common.credentials type
Jun 11, 2014
d44a891
Merge branch 'issue_139' of github.com:lifeBCE/StackStudio into issue…
Jun 16, 2014
e985e37
Merge pull request #141 from lifeBCE/issue_139
huxoll Jun 17, 2014
bbc79f9
Initial cleanup starting in main.js and common.js
Jun 12, 2014
0a96c4b
Enabled the accountManagementiView within main.js again
Jun 12, 2014
edffd4f
Removed view files that were not referenced anywhere in the application.
Jun 12, 2014
d194bb0
Think main.js is set now
Jun 12, 2014
11143ff
Initial migration of all common vendor libs to common.js and then ref…
Jun 13, 2014
3445358
All top-level views have now been migrated to utilize common vendor l…
Jun 13, 2014
aba40e5
Restructured offline support logic for loading vendor library files
Jun 16, 2014
317abb2
Re-accomplished fix for issue #143, defaulting selectedId to id when …
Jun 17, 2014
d10f2d0
Enabled meshes views in main.js
Jun 17, 2014
a9432dc
Remove datatables plugin; not working.
Jul 30, 2014
808c5db
Remove cruft.
huxoll Aug 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ js/vendor/jquery.js
js/vendor/jquery-ui.js
js/vendor/lodash.js
js/vendor/ace/*.js
js/vendor/jasmine*.js
js/vendor/jquery.jstree.js
js/vendor/jquery.dataTables*.js
js/vendor/dataTables*.js
Expand All @@ -50,3 +51,7 @@ js/vendor/ICanHaz.js
js/vendor/require.js
js/vendor/twitter/*.js
js/vendor/URI

#RVM default version files
.ruby-version
.ruby-gemset
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ node_js:
- "0.10"
before_install:
- npm install -g grunt-cli
- cp config/backend.json.sample config/backend.json
install:
- npm install
Loading