Skip to content
Snippets Groups Projects
Commit fb5d72a3 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'master' into enhance_table_controls

parents 3050f4ac c8625864
Branches
Tags
No related merge requests found
......@@ -10,33 +10,33 @@
},
"dependencies": {
"ace-builds": "git://github.com/ajaxorg/ace-builds",
"angular": "^1.2.28",
"angular-animate": "^1.2.28",
"angular-bootstrap": "^0.12.0",
"angular": "1.2.28",
"angular-animate": "1.2.28",
"angular-bootstrap": "0.12.0",
"angular-cookie": "git://github.com/ivpusic/angular-cookie#v4.0.6",
"angular-cookies": "^1.2.28",
"angular-gridster": "^0.11.7",
"angular-cookies": "1.2.28",
"angular-gridster": "0.11.7",
"angular-http-auth": "git://github.com/tamlyn/angular-http-auth#1eb4a08d08b400956c0848f84d8fcaa9ad1357a2",
"angular-readable-time": "git://github.com/wildlyinaccurate/angular-readable-time#0.1.1",
"angular-resource": "^1.2.28",
"angular-route": "^1.2.28",
"angular-sanitize": "^1.2.28",
"angular-ui-ace": "^0.2.3",
"angular-resource": "1.2.28",
"angular-route": "1.2.28",
"angular-sanitize": "1.2.28",
"angular-ui-ace": "0.2.3",
"angular-xeditable": "git://github.com/vitalets/angular-xeditable#0.1.9",
"angularytics": "^0.3.0",
"crossfilter": "^1.3.11",
"d3": "^3.5.3",
"dc": "^2.0.0-beta.1",
"fixed-data-table": "^0.2.0",
"jquery": "^2.1.4",
"moment": "^2.9.0",
"ng-sortable": "^1.2.0",
"ngreact": "^0.1.5",
"react": "^0.12.2",
"react-datepicker": "^0.5.1",
"react-onclickoutside": "^0.2.2",
"tether": "^0.6.5",
"underscore": "^1.8.3"
"angularytics": "0.3.0",
"crossfilter": "1.3.11",
"d3": "3.5.3",
"dc": "2.0.0-beta.1",
"fixed-data-table": "0.2.0",
"jquery": "2.1.4",
"moment": "2.9.0",
"ng-sortable": "1.2.0",
"ngreact": "0.1.5",
"react": "0.12.2",
"react-datepicker": "0.5.1",
"react-onclickoutside": "0.2.2",
"tether": "0.6.5",
"underscore": "1.8.3"
},
"devDependencies": {
"angular-mocks": "^1.2.28",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment