Permalink
Browse files

updated: License

added notes for all plugins
also updated changelog
  • Loading branch information...
1 parent da55def commit fcafbdc2e445732d49c54417dfe4abf6d132b20c @janpaepke committed Feb 11, 2015
Showing with 27 additions and 12 deletions.
  1. +4 −3 CHANGELOG.md
  2. +10 −5 LICENSE.md
  3. +13 −4 dev/todo.md
View
@@ -54,9 +54,10 @@ CHANGELOG
- when pinning absolutely positioned elements using `bottom` or `right`, the positioning was off (See issue [226](https://github.com/janpaepke/ScrollMagic/issues/226))
#### project management:
- - changed build system to [gulp](http://gulpjs.com/)
- - moved all Module dist files to '/scrollmagic'
- - TODO: document file structure and gulp options
+ - changed build system to [gulp](http://gulpjs.com/) [see here](CONTRIBUTING.md#development-contribution)
+ - moved all Module dist files to '/scrollmagic' [see here](scrollmagic)
+ - published scrollmagic on npm as `scrollmagic`
+ - renamed package on bower from `ScrollMagic` to `scrollmagic` to adhere to naming conventions
## 1.3.0 (2014-11-13)
View
@@ -1,14 +1,19 @@
-
#License
-ScrollMagic is dual licensed under the MIT license (below) and [GPL](http://www.gnu.org/licenses/gpl-3.0.html).
+ScrollMagic is dual licensed under the terms of the MIT license (below) and the [GPL](http://www.gnu.org/licenses/gpl-3.0.html).
+
+__Plugin License Information:__
+
+* The Greensock Animation Platform (__GSAP__) is used per its ["No Charge" license](http://greensock.com/standard-license).
+For some cases the extended ["Business Green" license](http://greensock.com/licensing/) will be necessary.
+* __Velocity.js__ is published under the terms of the [MIT license](https://github.com/julianshapiro/velocity/blob/master/LICENSE.md).
+* __jQuery__ is published under the terms of the [MIT license](https://jquery.org/license/).
-The Greensock Animation Platform (GSAP) is used with permission per its license agreement.
-For more information, go to http://www.greensock.com/licensing/
+---
##MIT License
-Copyright (c) 2014 Jan Paepke
+Copyright (c) 2015 Jan Paepke
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:
View
@@ -2,7 +2,7 @@
- feature: add mobile plugin for controller
# Build (gulpfile.js)
- -
+ - autoupdate npm on new git version
# Testing
- cross browser test scrollPosition getter functions
@@ -11,8 +11,6 @@
# Project
- add missing docs (global search TODO)
- review texts
- - prepare cdnjs
-
# Release guide
- fork master to 1.3
@@ -28,5 +26,16 @@
- update gh-pages
- push stub files to gh-pages/js
-- push to fork of cdnjs
+- publish on npm
+
+- bower unregister current name (camelCase) http://bower.io/docs/creating-packages/#unregister
+- boer clear cache
+- bower register new name (slugstyle) http://bower.io/docs/creating-packages/#register
+
+- update dist files in cdnjs
+- run cdnjs test
+- commit to fork of cdnjs and push
- send pull request to cdnjs
+
+- share on twitter
+- send mail

0 comments on commit fcafbdc

Please sign in to comment.