Skip to content

pull from zhufengnodejs #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yhy6354 wants to merge 18 commits into
base: master
Choose a base branch
from
Open

pull from zhufengnodejs #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4021743
完成练习
zhangrenyang Mar 5, 2016
c8da101
先更新代码
zhangrenyang Mar 5, 2016
7924c99
先更新代码
zhangrenyang Mar 5, 2016
1a658a6
先更新代码
zhangrenyang Mar 5, 2016
8fcae62
git测试
hiBruce Mar 5, 2016
7fb7803
delete idea
zhangrenyang Mar 5, 2016
6928c9b
add exports
zhangrenyang Mar 5, 2016
556fe7f
add exports
zhangrenyang Mar 5, 2016
74bc6d2
add exports
zhangrenyang Mar 5, 2016
e509fd1
add pdf
zhangrenyang Mar 5, 2016
0e807a6
ignore
Mar 6, 2016
cffe417
1.读取文件
Mar 6, 2016
7665d17
1.读取文件
Mar 6, 2016
f879321
Merge pull request #2 from bgl1987/master
zhangrenyang Mar 6, 2016
5a7d20a
Merge pull request #1 from fandonglai/master
zhangrenyang Mar 6, 2016
0528bc2
1.读取文件
Mar 6, 2016
8aad331
Merge remote-tracking branch 'origin/master'
Mar 6, 2016
672fd94
更新到原作者的主分支进度
yhy6354 Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@ node_modules
.npm

# Optional REPL history
<<<<<<< HEAD
.node_repl_history
.idea
=======
.node_repl_history
.idea
>>>>>>> sir/master
1 change: 1 addition & 0 deletions .idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/201601node.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/jsLibraryMappings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/libraries/201601node_node_modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

454 changes: 454 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions 6.file/7.path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ console.log(__dirname);//获取 当前模块所在的绝对目录
//获取一个路径里文件的名
console.log(path.basename('7.path.js','.js'));
//获取一个路径里文件的扩展名
<<<<<<< HEAD
console.log(path.extname('7.path.js'));
=======
console.log(path.extname('7.path.js'));
//从一个相对路径解析出一个绝对路径
//以应用程序的所在目录为根起
console.log(path.resolve('book','node.json','..','mysql.json'));
>>>>>>> sir/master
6 changes: 6 additions & 0 deletions homework/第一周作业.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 1. 玩游戏截图
# 2. 发布一个npm包到服务器上
# 3. 实现一个Buffer.concat方法



Binary file modified pdf/1.开头典礼.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/2.git.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/3.1 NODE安装与配置.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/3.2 webstorm安装与配置.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/4.node基础.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/5.模块.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/6.buffer.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified pdf/7.file.pdf
View file
Open in desktop
Binary file not shown.
Binary file added pdf/8.1 http.pdf
View file
Open in desktop
Binary file not shown.
Binary file added pdf/8.2.ajax.pdf
View file
Open in desktop
Binary file not shown.
Binary file added pdf/8.3 jsonp.pdf
View file
Open in desktop
Binary file not shown.
Binary file added pdf/8.4 cross.pdf
View file
Open in desktop
Binary file not shown.
Binary file added pdf/8.5.restful.pdf
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions 卞功磊/friLessTest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
第一节课git测试
</body>
</html>