Merge pull request #20 from scottrice10/search-users

(#1) Display languages to search on in input box.
FatalBadgers · Feb 4, 2015 · 4f01bda · 4f01bda
2 parents 126711a + 19de986
commit 4f01bda
Show file tree

Hide file tree

Showing 18 changed files with 4,197 additions and 173 deletions.
diff --git a/bower.json b/bower.json
@@ -14,7 +14,8 @@
     "font-awesome": ">=4.1.0",
     "lodash": "~2.4.1",
     "angular-ui-router": "~0.2.10",
-    "c3": "~0.4.9"
+    "c3": "~0.4.9",
+    "angular-ui-select": "*"
   },
   "devDependencies": {
     "angular-mocks": ">=1.2.*",

diff --git a/client/app/app.js b/client/app/app.js
@@ -5,7 +5,8 @@ angular.module('tikrApp', [
   'ngResource',
   'ngSanitize',
   'ui.router',
-  'ui.bootstrap'
+  'ui.bootstrap',
+  'ui.select'
 ])
   .config(function ($stateProvider, $urlRouterProvider, $locationProvider, $httpProvider) {
     $urlRouterProvider