瀏覽代碼

Merge branch 'master' of github.com:amber-smalltalk/amber-contrib-web

Conflicts:
	.gitignore
Herbert Vojčík 9 年之前
父節點
當前提交
029c0ace13
共有 3 個文件被更改,包括 28 次插入17 次删除
  1. 4 17
      .gitignore
  2. 22 0
      LICENSE
  3. 2 0
      README.md

+ 4 - 17
.gitignore

@@ -1,20 +1,7 @@
-# Ignoring Mac Finder files
-.DS_Store
-
-# Ignoring test runner
-test_runner.js
-
-# In case amber is also saved in a local Subversion
-.svn
-
-# Ignoring local NPM modules
-node_modules/
-
-# Ignoring local bower modules
-bower_components/
-
-# Ignoring place dedicated to hand-cloned user modules
+/node_modules/
+/bower_components/
 /my/
 
-# Other generated or transient files
+/test_runner.js
 config.js
+the.js

+ 22 - 0
LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Amber
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

+ 2 - 0
README.md

@@ -0,0 +1,2 @@
+# amber-contrib-web
+Seaside-inspired Web page manipulation library for Amber Smalltalk