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>
Loading