Merge pull request #17 from MayOneUS/devel

Bringing master up to date
MayOneUS · Oct 13, 2015 · fdd16ce · fdd16ce
2 parents 8a44ac2 + 97298fb
commit fdd16ce
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/assets/favicon.ico → assets/favicon-ico.ico b/assets/favicon.ico → assets/favicon-ico.ico
diff --git a/assets/favicon.png b/assets/favicon.png
diff --git a/assets/js/backbone/apps/profiles/show/templates/profile_show_template.html b/assets/js/backbone/apps/profiles/show/templates/profile_show_template.html
@@ -66,20 +66,6 @@ <h2> Bio </h2>
           </div>
         </div>
 
-        <div class="form-group">
-          <label for="company" class="col-md-3 control-label">Agency</label>
-          <div class="col-md-9">
-            <input type="hidden" id="company" name="company" style="width: 100%"/>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label for="location" class="col-md-3 control-label">Location</label>
-          <div class="col-md-9">
-            <input type="hidden" id="location" name="location" style="width: 100%"/>
-          </div>
-        </div>
-
         <div class="form-group">
           <label for="bio" class="col-md-3 control-label">A brief public biography</label>
           <div class="col-md-9">

diff --git a/assets/js/backbone/config/login.json b/assets/js/backbone/config/login.json
@@ -1,8 +1,6 @@
 {
   "signin": true,
   "oauth": [
-    "linkedin",
-    "myusa"
   ],
   "config": {
     "linkedin": {