Skip to content

Commit

Permalink
Merge pull request JacksonTian#60 from Mickey-/master
Browse files Browse the repository at this point in the history
去掉了重复的Nodejs和contributor
  • Loading branch information
JacksonTian committed Jan 3, 2014
2 parents 237974f + 5d6ecf5 commit 8e85fc8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Although the project would be maintained in plain text instead, I promise a smal
- [Mocha](http://visionmedia.github.com/mocha/)/[Should](https://github.com/visionmedia/should.js/)/[Chai](http://chaijs.com/)/[Expect](https://github.com/LearnBoost/expect.js/)
- Auto-testing
- [WebDriver](http://docs.seleniumhq.org/docs/03_webdriver.jsp)/[Karma Runner](https://github.com/karma-runner/karma)/[Sahi](http://sahi.co.in/)
- [phantomjs](http://phantomjs.org/)
- Frontend libraries / frameworks
- [jQuery](http://jquery.com/)/[Underscore](http://underscorejs.org/)/[Mootools](http://mootools.net/)/[Prototype.js](http://www.prototypejs.org/)
- [YUI3](http://yuilibrary.com/projects/yui3/)/[Dojo](http://dojotoolkit.org/)/[ExtJS](http://www.sencha.com/products/extjs)/[KISSY](http://docs.kissyui.com/)
Expand Down Expand Up @@ -93,6 +94,7 @@ Although the project would be maintained in plain text instead, I promise a smal
- [GYP](http://code.google.com/p/gyp/)
- [Grunt](http://gruntjs.com/)
- [Yeoman](http://yeoman.io/)
- [FIS](http://fis.baidu.com/)
- Code organizing
- Modularizing libraries
- [CommonJS](http://www.commonjs.org/)/AMD
Expand Down Expand Up @@ -122,6 +124,7 @@ Although the project would be maintained in plain text instead, I promise a smal
- [JSConf](http://jsconf.com/)/[NodeConf](http://www.nodeconf.com/)
- [CSSConf](http://cssconf.com/)
- YDN/YUIConf
- HybridApp
- Computer knowledge
- Compilation principle
- Network
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Frontend Knowledge Structure
- [Mocha](http://visionmedia.github.com/mocha/)/[Should](https://github.com/visionmedia/should.js/)/[Chai](http://chaijs.com/)/[Expect](https://github.com/LearnBoost/expect.js/)
- 自动化测试
- [WebDriver](http://docs.seleniumhq.org/docs/03_webdriver.jsp)/[Karma Runner](https://github.com/karma-runner/karma)/[Sahi](http://sahi.co.in/)
- [phantomjs](http://phantomjs.org/)
- 前端库/框架
- [jQuery](http://jquery.com/)/[Underscore](http://underscorejs.org/)/[Mootools](http://mootools.net/)/[Prototype.js](http://www.prototypejs.org/)
- [YUI3](http://yuilibrary.com/projects/yui3/)/[Dojo](http://dojotoolkit.org/)/[ExtJS](http://www.sencha.com/products/extjs)/[KISSY](http://docs.kissyui.com/)
Expand Down Expand Up @@ -93,6 +94,7 @@ Frontend Knowledge Structure
- [GYP](http://code.google.com/p/gyp/)
- [Grunt](http://gruntjs.com/)
- [Yeoman](http://yeoman.io/)
- [FIS](http://fis.baidu.com/)
- 代码组织
- 类库模块化
- [CommonJS](http://www.commonjs.org/)/AMD
Expand Down Expand Up @@ -122,6 +124,7 @@ Frontend Knowledge Structure
- [JSConf](http://jsconf.com/)/[NodeConf](http://www.nodeconf.com/)
- [CSSConf](http://cssconf.com/)
- YDN/YUIConf
- HybridApp
- 计算机知识储备
- 编译原理
- 计算机网络
Expand Down

0 comments on commit 8e85fc8

Please sign in to comment.