Skip to content

Commit fcafbdc

Browse files
committed
updated: License
added notes for all plugins also updated changelog
1 parent da55def commit fcafbdc

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

CHANGELOG.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ CHANGELOG
5454
- when pinning absolutely positioned elements using `bottom` or `right`, the positioning was off (See issue [226](https://github.com/janpaepke/ScrollMagic/issues/226))
5555

5656
#### project management:
57-
- changed build system to [gulp](http://gulpjs.com/)
58-
- moved all Module dist files to '/scrollmagic'
59-
- TODO: document file structure and gulp options
57+
- changed build system to [gulp](http://gulpjs.com/) [see here](CONTRIBUTING.md#development-contribution)
58+
- moved all Module dist files to '/scrollmagic' [see here](scrollmagic)
59+
- published scrollmagic on npm as `scrollmagic`
60+
- renamed package on bower from `ScrollMagic` to `scrollmagic` to adhere to naming conventions
6061

6162

6263
## 1.3.0 (2014-11-13)

LICENSE.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
21
#License
32

4-
ScrollMagic is dual licensed under the MIT license (below) and [GPL](http://www.gnu.org/licenses/gpl-3.0.html).
3+
ScrollMagic is dual licensed under the terms of the MIT license (below) and the [GPL](http://www.gnu.org/licenses/gpl-3.0.html).
4+
5+
__Plugin License Information:__
6+
7+
* The Greensock Animation Platform (__GSAP__) is used per its ["No Charge" license](http://greensock.com/standard-license).
8+
For some cases the extended ["Business Green" license](http://greensock.com/licensing/) will be necessary.
9+
* __Velocity.js__ is published under the terms of the [MIT license](https://github.com/julianshapiro/velocity/blob/master/LICENSE.md).
10+
* __jQuery__ is published under the terms of the [MIT license](https://jquery.org/license/).
511

6-
The Greensock Animation Platform (GSAP) is used with permission per its license agreement.
7-
For more information, go to http://www.greensock.com/licensing/
12+
---
813

914
##MIT License
1015

11-
Copyright (c) 2014 Jan Paepke
16+
Copyright (c) 2015 Jan Paepke
1217

1318
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1419

dev/todo.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- feature: add mobile plugin for controller
33

44
# Build (gulpfile.js)
5-
-
5+
- autoupdate npm on new git version
66

77
# Testing
88
- cross browser test scrollPosition getter functions
@@ -11,8 +11,6 @@
1111
# Project
1212
- add missing docs (global search TODO)
1313
- review texts
14-
- prepare cdnjs
15-
1614

1715
# Release guide
1816
- fork master to 1.3
@@ -28,5 +26,16 @@
2826
- update gh-pages
2927
- push stub files to gh-pages/js
3028

31-
- push to fork of cdnjs
29+
- publish on npm
30+
31+
- bower unregister current name (camelCase) http://bower.io/docs/creating-packages/#unregister
32+
- boer clear cache
33+
- bower register new name (slugstyle) http://bower.io/docs/creating-packages/#register
34+
35+
- update dist files in cdnjs
36+
- run cdnjs test
37+
- commit to fork of cdnjs and push
3238
- send pull request to cdnjs
39+
40+
- share on twitter
41+
- send mail

0 commit comments

Comments
 (0)