Commit Graph

638 Commits

Author SHA1 Message Date
Joe
d27379fa6f Merge pull request #145 from blackwatchcup/master
The Rest of the Chapter and files
2019-07-19 13:53:09 +08:00
blackwatch
a2c447d5f8 The Rest of the Chapter and files 2019-07-19 10:29:30 +08:00
LingCoder
cbc3e6df1e Merge pull request #144 from AlfredAlan/lowlevel
附录:并发底层原理 翻译至资源竞争小节
2019-07-19 02:56:16 +08:00
AlfredAlan
9edf118e3c Merge branch 'master' of https://github.com/LingCoder/OnJava8 into lowlevel 2019-07-19 01:51:05 +08:00
AlfredAlan
c1f70fe70b 附录:并发底层原理 翻译至资源竞争小节 2019-07-19 01:47:12 +08:00
LingCoder
1d00601bd3 Merge pull request #143 from xiangflight/master
[revision 12](截至 添加元素组)
2019-07-18 23:09:20 +08:00
xiangflight
4c1cc4b778 [revision 12](截至 添加元素组) 2019-07-18 21:47:03 +08:00
LingCoder
e5da73842b Merge pull request #141 from 1326670425/master
附录:编程指南 翻译完成
2019-07-18 16:31:08 +08:00
1326670425
937d2b7826 Update README.md 2019-07-18 15:41:02 +08:00
1326670425
b9e865a13e 附录:编程指南 翻译完成 2019-07-18 15:40:57 +08:00
LingCoder
589d98d3f7 Merge pull request #140 from blackwatchcup/master
The Brutal Truth
2019-07-18 11:23:18 +08:00
blackwatch
d4800ca219 The Brutal Truth 2019-07-18 10:15:02 +08:00
zzw
b7534f98d2 Merge pull request #2 from LingCoder/master
部分代码同步
2019-07-17 22:27:37 +08:00
LingCoder
770fb115e9 Merge pull request #139 from xiangflight/master
[revision 11](内部类完结)
2019-07-17 22:15:27 +08:00
xiangflight
63aef6c387 [revision 11](内部类完结) 2019-07-17 22:00:11 +08:00
Joe
731f1e70f6 Update _sidebar.md
更新不匹配标题
2019-07-17 21:46:24 +08:00
Joe
7b239ed8f5 Update SUMMARY.md 2019-07-17 21:39:18 +08:00
Joe
a5c13b365d Update 11-Inner-Classes.md
解决冲突
2019-07-17 21:38:11 +08:00
LingCoder
b9aa518585 Merge pull request #138 from blackwatchcup/master
修改错别字
2019-07-17 21:09:33 +08:00
blackwatch
8ef843400a 修改部分错别字 2019-07-17 20:19:48 +08:00
Joe
b35306b1bb Merge pull request #136 from 1326670425/master
附录:编程指南 翻译更新了设计小节
2019-07-17 18:07:52 +08:00
1326670425
d588c54f6d 附录:编程指南 翻译更新了设计小节 2019-07-17 17:51:10 +08:00
zzw
98ca3f2a28 Merge pull request #1 from LingCoder/master
pull 更新
2019-07-17 13:31:06 +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