Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io into final-fix-for-addon-asset-loading

* 'develop' of https://github.com/CenterForOpenScience/osf.io:
  Display all Gitlab repos   - that user has access to
  remain the change for register page title change
  Revert "[#OSF-8849]Make institutional login more prominent"
  Fix files grid link icons.
  replace the img and make it bigger on pc and mobile
  change to use Jquery 3 style done and fail

Author: Johnetordoff

addons/gitlab/api.py

@@ -47,10 +47,10 @@ def repo(self, repo_id):
         raise NotFoundError
 
     def repos(self):
-        return self.gitlab.getprojects()
+        return list(self.gitlab.getall(self.gitlab.getprojects, per_page=100))
 
     def user_repos(self, user):
-        return self.gitlab.getprojectsowned()
+        return list(self.gitlab.getall(self.gitlab.getprojectsowned, per_page=100))
 
     def create_repo(self, repo, **kwargs):
         return self.gitlab.createproject(repo)

website/static/img/meeting-page/osf-meeting.png

@@ -446,7 +446,7 @@ var NameViewModel = function(urls, modes, preventUnsaved, fetchCallback) {
                 name: self.full()
             },
             dataType: 'json',
-        }).success(function (response) {
+        }).done(function (response) {
             self.imputedGiven(response.given);
             self.imputedMiddle(response.middle);
             self.imputedFamily(response.family);

website/static/img/meeting-page/osf_meetings_white.png

@@ -27,7 +27,7 @@
         <div class="osf-meeting-header">
             <div class="container ">
             <div class="text-center m-b-lg">
-                <h1><img src="/static/img/meeting-page/osf-meeting.png" alt="Logo for OSF meeting" style="width: 40%"></h1>
+                <h1><img src="/static/img/meeting-page/osf_meetings_white.png" alt="Logo for OSF meeting" style="width: 80%"></h1>
                 <h3>A <strong>free poster and presentation sharing service</strong> for academic meetings and conferences</h3>
             </div>
                 <div class="network-img"> </div>

website/static/js/profile.js

@@ -135,22 +135,19 @@
                 </div>
                 </br>
                 <div class="form-group m-t-md">
-                    <div class="col-md-5 col-sm-12" >
-                        <div class="col-xs-12">
-                            <a href="${non_institution_login_url}" >Already have an account?</a>
-                        </div>
+                    <div class="col-md-5 col-sm-12" style="padding-left: 25px">
+                        <a href="${non_institution_login_url}" >Already have an account?</a>
+                        <br>
+                        <a href="${institution_login_url}">Login through your institution  <i class="fa fa-arrow-right"></i></a>
                     </div>
                     <div class="col-md-7 col-sm-12">
                         %if recaptcha_site_key:
                             <div class="col-xs-12">
                                 <div class="pull-right g-recaptcha" data-sitekey="${recaptcha_site_key}"></div>
-
+                            </div>
                         %endif
                             <div class="col-xs-12">
-                                <span class="pull-right p-t-sm">
-                                    <a class="btn btn-default" href="${institution_login_url}">Sign in with your institution</a>
-                                    <button type="submit" class="btn btn-success" data-bind="disable: submitted()">Create account</button>
-                                </span>
+                                <span class="pull-right p-t-sm"><button type="submit" class="btn btn-success" data-bind="disable: submitted()">Create account</button></span>
                             </div>
                     </div>
                 </div>

website/templates/public/pages/meeting_landing.mako

@@ -226,7 +226,7 @@ def _get_nodes(self, node, grid_root=None):
         data = []
         if node.can_view(auth=self.auth):
             serialized_addons = self._collect_addons(node)
-            linked_node_sqs = node.node_relations.filter(is_node_link=True)
+            linked_node_sqs = node.node_relations.filter(is_node_link=True, child=OuterRef('pk'))
             has_write_perm_sqs = Contributor.objects.filter(node=OuterRef('pk'), write=True, user=self.auth.user)
             children = (AbstractNode.objects
                         .filter(is_deleted=False, _parents__parent=node)