Commit Graph

616 Commits

Author SHA1 Message Date
1326670425
d588c54f6d 附录:编程指南 翻译更新了设计小节 2019-07-17 17:51:10 +08:00
Joe
89a3da5a57 Update README.md
第十八章 字符串更新完成
2019-07-17 13:15:13 +08:00
Joe
fe5836209c Merge pull request #135 from blackwatchcup/master
The Four Maxims of Java Concurrency
2019-07-17 13:13:18 +08:00
张智伟
a2554264f0 Merge commit 'dd987c4df92807b142b0dbbfe3c6053534c6190c' 2019-07-17 12:22:08 +08:00
张智伟
3c4477061a Revert "Concurrency is for Speed"
This reverts commit 3285964edc.
2019-07-17 12:21:30 +08:00
张智伟
dd987c4df9 he Four Maxims of Java Concurrency 2019-07-17 11:57:19 +08:00
LingCoder
bb12083f7b Merge pull request #134 from AlfredAlan/lowlevel
附录:并发底层原理,翻译至异常捕获
2019-07-17 01:53:17 +08:00
AlfredAlan
3058b871ff Merge remote-tracking branch 'upstream/master' into lowlevel 2019-07-17 01:23:23 +08:00
AlfredAlan
aa95791ee7 附录:并发底层原理 翻译至捕获异常 2019-07-17 01:07:51 +08:00
LingCoder
1da8c2f7c4 Merge pull request #133 from xiangflight/master
[revision 11](截至 为什么需要内部类)
2019-07-16 22:50:52 +08:00
xiangflight
28552b35ff [revision 11](截至 为什么需要内部类) 2019-07-16 22:08:09 +08:00
Joe
2de98a17cc Merge pull request #132 from notUlnix/master
Translation Commit
2019-07-16 16:02:41 +08:00
notUlnix
7790b0aa62 Translation Commit
Part translation of Appendix-Understanding-equals-and-hashCode.md
2019-07-16 15:42:13 +08:00
Joe
9e9ce655f9 Merge pull request #130 from chilejiang1024/master
Update 01-What-is-an-Object.md
2019-07-16 13:33:40 +08:00
Joe
ae5ebc28ae Merge pull request #131 from notUlnix/master
update the translation of "derived class"
2019-07-16 13:33:16 +08:00
notUlnix
6800ecebfb update the translation of "derived class" 2019-07-16 13:25:11 +08:00
zhili
312dc55f04 Update 01-What-is-an-Object.md
remove character /u10
2019-07-16 13:17:17 +08:00
LingCoder
7e013f6bdb Merge pull request #129 from blackwatchcup/20190711_Concurrent_Programming
Concurrency is for Speed
2019-07-16 11:17:42 +08:00
‘blackwatch
cbd5c52268 修改标签 2019-07-16 11:05:53 +08:00
‘blackwatch
abea712e7e Concurrency is for Speed 2019-07-16 10:57:11 +08:00
‘blackwatch
3285964edc Concurrency is for Speed 2019-07-16 10:53:59 +08:00
LingCoder
5c2882469a Merge pull request #128 from 1326670425/master
附录:补充 翻译完成
2019-07-16 10:41:51 +08:00
1326670425
cfbd608458 Update README.md 2019-07-16 10:28:14 +08:00
1326670425
670ef1b7d9 附录:补充 翻译完成 2019-07-16 10:24:07 +08:00
1326670425
5c8981e283 添加 第十二章 集合配图 2019-07-16 10:23:52 +08:00
‘blackwatch
78720a92f6 Merge branch '20190711_Concurrent_Programming' 2019-07-16 09:14:35 +08:00
LingCoder
61d1e9edcb Merge pull request #127 from xiangflight/master
[revision 11](截至 内部类方法和作用域)
2019-07-16 08:38:13 +08:00
xiangflight
c961a9452c [revision 11](截至 内部类方法和作用域) 2019-07-15 19:29:22 +08:00
Joe
cc3e6fd72d Merge pull request #124 from blackwatchcup/20190711_Concurrent_Programming
Concurrency Superpowers
2019-07-15 15:04:53 +08:00
张智伟
9f20d1b165 Concurrency Superpowers 2019-07-15 14:54:14 +08:00
Joe
d39f8df5af Merge pull request #123 from 1326670425/master
附录:C++和Java的优良传统 翻译完成
2019-07-15 12:14:44 +08:00
1326670425
e2efb8e7b3 Update README.md 2019-07-15 11:42:04 +08:00
1326670425
093606db17 附录:C++和Java的优良传统 翻译完成 2019-07-15 11:41:56 +08:00
1326670425
f9a5f1c8e8 校订第十二章 集合 2019-07-15 11:41:30 +08:00
Joe
654ec4cb2e Merge pull request #122 from blackwatchcup/20190711_Concurrent_Programming
Concurrent Programming 第一节翻译
2019-07-15 11:19:51 +08:00
张智伟
7653150ca6 Concurrent Programming 第一章翻译 2019-07-15 11:05:55 +08:00
LingCoder
7ab6178af8 Merge pull request #121 from AlfredAlan/lowlevel
附录:并发底层原理 翻译到线程小节
2019-07-15 08:43:10 +08:00
AlfredAlan
1eaab3f359 feat:第一节 线程部分 2019-07-15 01:56:33 +08:00
AlfredAlan
360193eb8b feat:第一节线程部分 2019-07-15 01:38:25 +08:00
LingCoder
8c6a68f192 更新译者信息 2019-07-14 14:33:53 +08:00
LingCoder
6463926a11 Merge pull request #118 from 1326670425/master
第十二章 集合 更新完成
2019-07-14 14:28:01 +08:00
1326670425
1c862babf3 Update README.md 2019-07-14 13:31:04 +08:00
1326670425
7933dc0249 第十二章 集合 添加原文脚注内容 2019-07-14 13:29:38 +08:00
1326670425
84f872317b 第十二章 集合 正文更新完成 2019-07-14 13:28:06 +08:00
Joe
ca60f80c74 Update CONTRIBUTING.md
增加视频演示
2019-07-13 23:29:49 +08:00
Joe
81b9b40407 Merge pull request #116 from xiangflight/master
[feat 10](接口 完结)
2019-07-13 23:28:30 +08:00
xiangflight
60c8e92dc0 [feat 10](接口 完结) 2019-07-13 23:21:29 +08:00
LingCoder
b9848f6a31 Merge pull request #115 from 1326670425/master
第十二章 集合 翻译更新至 队列Queue
2019-07-13 13:22:47 +08:00
1326670425
bbebb8d57c 第十二章 集合 翻译更新至 队列Queue 2019-07-13 12:21:43 +08:00
LingCoder
53701a9ffe Merge pull request #114 from 1326670425/master
第十二章 集合 翻译更新至 堆栈Stack
2019-07-13 00:35:19 +08:00