Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cla-assistant/cla-assistant
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: JSFoundation/cla-assistant
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 14 files changed
  • 1 contributor

Commits on Oct 28, 2016

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f7cf21c View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    873f5f0 View commit details

Commits on Nov 1, 2016

  1. Check author before committer (#2)

    Fixes #1
    kborchers authored Nov 1, 2016

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    10c6c06 View commit details

Commits on Apr 17, 2017

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    9c9b6ee View commit details
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -17,4 +17,5 @@ src/client/app.min.js.map
log
log.*
.vscode/*
jsconfig.json
jsconfig.json
.htpasswd
9 changes: 8 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright JS Foundation and contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -201,6 +201,13 @@
See the License for the specific language governing permissions and
limitations under the License.

--------------------------------------------------------------------------------------------------------------------------
CONTRIBUTOR LICENSE AGREEMENT ASSISTANT ATTRIBUTION:

This copy of Contributor License Agreement Assistant, copyright SAP SE, is licensed, modified and redistributed under the Apache License Version 2.0.

--------------------------------------------------------------------------------------------------------------------------


--------------------------------------------------------------------------------------------------------------------------
CONTRIBUTOR LICENSE AGREEMENT ASSISTANT SUBCOMPONENTS:
6 changes: 3 additions & 3 deletions cla-assistant.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"default-cla": [
{
"name": "SAP individual CLA",
"url": "https://gist.github.com/CLAassistant/bd1ea8ec8aa0357414e8"
"name": "JS Foundation Individual CLA",
"url": "https://gist.github.com/JSFOwner/856f22ec80cc2fe7b47becf24d817a46"
}
]
}
}
Binary file removed src/client/assets/images/background.jpg
Binary file not shown.
20 changes: 20 additions & 0 deletions src/client/assets/images/jsf-badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions src/client/assets/images/jsf-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/client/assets/styles/_landing-page.scss
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
bottom: 0;
height: 100vH;
width: 100%;
background-image: url('/assets/images/background.jpg');
background-size: cover;
background-image: url('/assets/images/jsf-logo.svg');
background-repeat: no-repeat;
background-position: center;
background-position: bottom;
background-color: #999;
}

.lp-background-overlay {
15 changes: 13 additions & 2 deletions src/client/assets/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// overwrite bootstrap styles


// fonts
$font-family-sans-serif: 'Source Sans Pro', sans-serif;

@@ -269,7 +270,7 @@ i.fa.hover-icon {
}

a {
color: inherit;
color: #04b8f7;
}

small {
@@ -302,6 +303,11 @@ small {
margin-bottom: 10px;
}

.cla-box-full {
height: inherit;
overflow-y: auto;
}

.dots {
font-size:10px;
margin-left:10px;
@@ -328,6 +334,11 @@ small {
margin-bottom: 50px;
}

.row {
margin-left: 0px;
margin-right: 0px;
}

.content-block .row .right-side {
border-left: solid 1px;
border-color: $gray;
@@ -477,4 +488,4 @@ small {
color: $gray-dark;
font-size: smaller;
display: inline-block;
}
}
37 changes: 1 addition & 36 deletions src/client/home.html
Original file line number Diff line number Diff line change
@@ -18,17 +18,10 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.15/angular-sanitize.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-scroll/0.6.5/angular-scroll.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ng-csv/0.3.3/ng-csv.min.js"></script>
<script src="//www.google-analytics.com/analytics.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angulartics/0.17.2/angulartics.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angulartics/0.17.2/angulartics-ga.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/PapaParse/4.1.2/papaparse.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.5/clipboard.min.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
</script>
<!-- APP -->
<script src="app.min.js"></script>

@@ -72,38 +65,10 @@

<div class="container-fluid" style="margin-bottom:50px;">
<div style="margin-left:15px; margin-right: 15px">
<section ui-view class="col-md-8 col-md-offset-2"></section>
<section ui-view></section>
</div>
</div>

<div class="navbar navbar-default navbar-fixed-bottom">
<div class="navbar-top-border">
<div class="container-fluid">
<div class="navbar-text navbar-left">
<p style="margin-bottom:0px">© 2015 SAP SE</p>
</div>
<div class="navbar-text navbar-center" style="z-index:-1;">
<p class="hidden-xs hidden-sm" style="margin-bottom: 0px;">
Made with <span class="octicon octicon-heart"></span> from the GitHub team at SAP
</p>
</div>
<div class="center-block">
<div class="navbar-text navbar-right">
<a href="https://github.com/cla-assistant/cla-assistant/issues/new" target="space">
<span class="octicon octicon-mark-github"></span> Open an issue
</a>
</div>
</div>
<div class="center-block">
<div class="navbar-text navbar-right">
<a href="https://gist.github.com/CLAassistant/3a73e4cd729c9d0a6e30" target="space" style="margin-right: 10px">
Terms of Service &amp Privacy Policy
</a>
</div>
</div>
</div>
</div>
</div>
</body>

</html>
195 changes: 2 additions & 193 deletions src/client/login.html
Original file line number Diff line number Diff line change
@@ -16,36 +16,13 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-utils/0.1.1/angular-ui-utils.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.15/angular-sanitize.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ng-csv/0.3.3/ng-csv.min.js"></script>
<script src="//www.google-analytics.com/analytics.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angulartics/0.17.2/angulartics.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angulartics/0.17.2/angulartics-ga.min.js"></script>

<script type="text/javascript" charset="utf-8" src="assets/js/edge.5.0.1.min.js"></script>
<style>
.edgeLoad-EDGE-110781156 {
visibility: hidden;
}
</style>

<!-- APP -->
<script src="app.min.js"></script>


<script>
AdobeEdge.loadComposition('assets/js/CLA_signature_MouseOver', 'EDGE-110781156', {
scaleToFit: "none",
centerStage: "none",
minW: "0",
maxW: "undefined",
width: "550px",
height: "400px"
}, {
dom: []
}, {
dom: []
});
</script>

<!-- COMPONENT STYLESHEETS -->
<link href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link href="//cdnjs.cloudflare.com/ajax/libs/octicons/2.0.2/octicons.min.css" rel="stylesheet">
@@ -57,15 +34,13 @@
<body ng-controller="HomeCtrl">
<div style="overflow-x:hidden;">

<div class="lp-background-main">
<div class="lp-row lp-background-overlay"></div>
</div>
<div class="lp-background-main"></div>

<div class="lp-start-view">
<!-- Header -->
<div class="lp-header">
<a class="navbar-brand" href="/">
<img src="/assets/images/CLA_logo.svg" class="img-responsive" alt="CLA assistant" style="width:55px" />
<img src="/assets/images/jsf-badge.svg" class="img-responsive" alt="CLA assistant" style="width:55px" />
</a>
<a class="lp-signin text-invert" href="" ng-click="logAdminIn()" target="_self"><b>Sign in</b></a>
</div>
@@ -82,173 +57,7 @@


</div>
<div style="margin-bottom:50px">


<div class="row lp-white lp-section" style="font-size: 25px;">
<div class="center-block">
<h4>FEATURES</h4>
</div>
<div class="center-block">
<div class="feature-col center-block">
<div feature id="feature1" icon-src="/assets/images/feature1.svg" header="Authentication" text="Sign in with your GitHub account" style="display: inline-block; "></div>
<div feature id="feature2" icon-src="/assets/images/feature2.svg" header="Integration" text="CLA assistant notifies you about new contributions via GitHub pull requests" style="display: inline-block;"></div>
<div feature id="feature3" icon-src="/assets/images/feature3.svg" header="Status updates" text="CLA assistant updates the status of pull requests when a contributor signs your CLA" style="display: inline-block;"></div>
<div feature id="feature4" icon-src="/assets/images/feature4.svg" header="Review" text="Review and export the list of contributors who have signed your CLA" style="display: inline-block;"></div>
</div>
</div>
</div>


<div class="row lp-premium-darker lp-section">
<div class="center-block">
<p>Hassle-free CLA signing
<br>
</p>
</div>
<div id="Stage" class="EDGE-110781156 center-block resize-img"></div>
<div class="center-block" style="font-size:18px">
<ol style="padding: 0; list-style-position: inside;">
<li>Create a pull request</li>
<li>Click to accept the repository's CLA</li>
</ol>
<p>That's it, for real!</p>
<!--<btn class="btn btn-md btn-primary" ng-click="logAdminIn()" style="margin-top:20px; width:195px; font-size: 16px"><span class="octicon octicon-mark-github"></span>&nbsp;My signed CLAs</btn> -->
</div>
</div>

<div class="row lp-section" style="height: 400px;">
<div class="center-block">
<h4 class="lp-premium">ACTIVITY</h4>
</div>
<div class="col-md-4 col-md-offset-4" text-slider active="active" time='5000' style="text-align: center; margin-top: 3em">
<p class="lp-textblock" ng-class="{true:'lp-textblock-animate', false:''}[active === 0]"><i class="octicon octicon-repo"></i> {{numberRepos}} registered repositories</p>
<p class="lp-textblock" ng-class="{true:'lp-textblock-animate', false:''}[active === 1]"><img src="/assets/images/CLA_logo.svg" class="lp-textblock-icon"/> {{numberClas}} signed CLAs</p>
<p class="lp-textblock" ng-class="{true:'lp-textblock-animate', false:''}[active === 2]"><i class="octicon octicon-star"></i> {{numberStars}} GitHub stars</p>
</div>
</div>

<div class="row lp-white lp-section">
<div class="center-block">
<h4>HOW IT WORKS</h4>
<p>Put your CLA into a <a href="https://gist.github.com" target="_blank">Gist</a>, and link it to a repository</p>
</div>

<div class="row lp-bottom-space" style=" margin-top: 75px;">
<div class="center-block">
<div class="col-xs-12 col-sm-4 col-md-4 ">
<img class="float-right " src="/assets/images/howto1.svg" style=" height: 150px;">
</div>
</div>
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="how-to-align how-to-align-left" style="font-size: 24px; color:#009245; margin-top:1em;">
SAVE YOUR CLA IN A GIST
</div>
<div class="how-to-align how-to-align-left" style="font-size: 18px;">
At <a href="https://gist.github.com" target="_blank">gist.github.com</a> enter a title and text for your CLA, and create your Gist.
</div>
</div>
</div>

<div class="row lp-bottom-space">
<div class="center-block">
<div class="col-xs-12 col-sm-4 col-sm-push-8 col-md-4 col-md-push-8 ">
<img class="float-left" src="/assets/images/howto2.svg" style="height: 150px;">
</div>
</div>
<div class="col-xs-12 col-sm-4 col-sm-pull-4 col-md-4 col-md-pull-4 col-sm-offset-4 col-md-offset-4">
<div class="how-to-align how-to-align-right" style="font-size: 24px; color:#009245; margin-top:1em;">
SELECT A REPOSITORY
</div>
<div class="how-to-align how-to-align-right" style="font-size: 18px;">
Select a repository where you need to manage contributions with a CLA.
</div>
</div>
</div>

<div class="row lp-bottom-space">
<div class="center-block">
<div class="col-xs-12 col-sm-4 col-md-4">
<img class="float-right" src="/assets/images/howto3.svg" style="height: 150px;">
</div>
</div>
<div class="col-xs-12 col-sm-4 col-md-4">
<div class="how-to-align how-to-align-left" style="font-size: 24px; color:#009245; margin-top:1em;">
LINK THEM
</div>
<div class="how-to-align how-to-align-left" style="font-size: 18px;">
Now just link that repository to your CLA.
</div>
</div>
</div>

<div class="row lp-bottom-space">
<div class="center-block">
<div class="col-xs-12 col-sm-4 col-sm-push-8 col-md-4 col-md-push-8 ">
<img class=" float-left" src="/assets/images/howto4.svg" style="height: 150px;">
</div>
</div>
<div class="col-xs-12 col-sm-4 col-sm-pull-4 col-md-4 col-md-pull-4 col-sm-offset-4 col-md-offset-4">
<div class="how-to-align how-to-align-right" style="font-size: 24px; color:#009245; margin-top:1em;">
YAY!
</div>
<div class="how-to-align how-to-align-right" style="font-size: 18px; ">
That's it.
<br>CLA assistant will do the rest for you.
</div>
</div>
</div>
</div>

<div class="row lp-premium-darker lp-section">
<div class="center-block">
<h4>PREVIEW</h4>
</div>
<div class="center-block" style="margin-bottom:40px;">
<img src="/assets/images/browser.svg" class="center-block preview-browser"/>
<img src="/assets/images/preview.gif" class="center-block"/>
</div>
</div>

<div class="row lp-premium lp-section center-block">
<div class="center-block">
<btn class="btn btn-md btn-primary" ng-click="logAdminIn()" style="margin-top:20px; width:195px; font-size: 16px">
<span class="octicon octicon-mark-github"></span>&nbsp;Sign in with GitHub</btn>
</div>
</div>
</div>

<div class="navbar navbar-default navbar-fixed-bottom">
<div class="navbar-top-border">
<div class="container-fluid">
<div class="center-block">
<div class="navbar-text navbar-left">
<p style="margin-bottom: 0px">© 2015 SAP SE</p>
</div>
</div>
<div class="navbar-text navbar-center" style="z-index:-1;">
<p class="hidden-xs hidden-sm">
Made with
<span class="octicon octicon-heart"></span> from the GitHub team at SAP
</p>
</div>
<div class="center-block">
<div class="navbar-text navbar-right">
<a href="https://github.com/cla-assistant/cla-assistant/issues/new" target="space">
<span class="octicon octicon-mark-github"></span> Open an issue
</a>
</div>
</div>
<div class="center-block">
<div class="navbar-text navbar-right">
<a href="https://gist.github.com/CLAassistant/3a73e4cd729c9d0a6e30" target="space" style="margin-right: 10px">
Terms of Service &amp Privacy Policy
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</body>

4 changes: 2 additions & 2 deletions src/client/templates/cla.html
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ <h1>Error</h1>
<p>({{noLinkedItemError}})</p>
</div>

<form class="row content-block" ng-hide="!!redirect || noLinkedItemError">
<form class="row" ng-hide="!!redirect || noLinkedItemError">
<div class="col-md-8 col-md-offset-2" >
<h4 ng-hide="signed">Please sign the CLA for {{params.user}}/{{params.repo}}</h4>
<h4 ng-show="signed">You have signed the CLA for {{params.user}}/{{params.repo}}</h4>
<div class="cla-box well">
<div class="cla-box cla-box-full well">
<div ng-bind-html="cla"></div>
</div>
<form ng-if="hasCustomFields">
1 change: 1 addition & 0 deletions src/config.js
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ module.exports = {
// required
user: process.env.GITHUB_USER,
pass: process.env.GITHUB_PASS,
admin_user: process.env.GITHUB_ADMIN_USER,

// required
token: process.env.GITHUB_TOKEN,
2 changes: 1 addition & 1 deletion src/server/controller/user.js
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ router.get('/auth/github', checkReturnTo);
// router.get('/auth/github/callback', passport.authenticate('github', { successReturnToOrRedirect: '/', failureRedirect: '/' }));
router.get('/auth/github/callback', passport.authenticate('github', { failureRedirect: '/' }),
function (req, res) {
if(req.user && req.session.requiredScope != 'public' && ( !req.user.scope || req.user.scope.indexOf('write:repo_hook') < 0 )) {
if(req.user && req.session.requiredScope != 'public' && req.user.login == config.server.github.admin_user && ( !req.user.scope || req.user.scope.indexOf('write:repo_hook') < 0 )) {
return res.redirect('/auth/github?admin=true');
}
res.redirect(req.session.returnTo || '/');
6 changes: 2 additions & 4 deletions src/server/services/repo.js
Original file line number Diff line number Diff line change
@@ -35,10 +35,8 @@ var compareAllRepos = function (ghRepos, dbRepos, done) {
};

var extractUserFromCommit = function (commit) {
var committer = commit.committer || commit.commit.committer;
if (config.server.github.commit_bots.indexOf(committer.login) > -1) {
committer = commit.author || commit.commit.author;
}
var committer = commit.author || commit.commit.author || commit.committer || commit.commit.committer;

return committer;
};