Commit Graph

162 Commits

Author SHA1 Message Date
JG
c82335d556 Revert "Revert "勘误改错字 from animalize"" 2018-03-20 15:48:45 +08:00
JG
4122f4a629 Merge pull request #48 from chinese-poetry/revert-10-master
Revert "勘误改错字 from animalize"
2018-03-20 13:30:54 +08:00
JG
d265c00ade Revert "勘误改错字 from animalize" 2018-03-20 10:40:56 +08:00
JG
d09e5606f5 Merge pull request #10 from animalize/master
勘误改错字 from animalize
2018-03-20 10:35:59 +08:00
90bf5e6569 Merge branch 'master' into master 2018-03-20 10:34:27 +08:00
11d11dc15f 1 2018-03-19 21:16:07 +08:00
c65b7b18ba 1 2018-03-19 21:14:21 +08:00
3b926950b2 1 2018-03-19 21:08:10 +08:00
2f5fb6bc29 1 2018-03-19 21:04:15 +08:00
e3e055a497 1 2018-03-19 21:02:25 +08:00
eb9719e36d 1 2018-03-19 20:55:46 +08:00
7c6cbac2b7 1 2018-03-19 17:39:00 +08:00
456ccb01e9 2 2018-03-19 17:37:48 +08:00
3c16f05ac8 1 2018-03-19 17:36:53 +08:00
8df8b40d82 1 2018-03-19 17:34:33 +08:00
02478f3f10 1 2018-03-19 17:33:01 +08:00
12fa1f2eee 1 2018-03-19 17:31:49 +08:00
80bebb3417 1 2018-03-19 17:30:03 +08:00
fb0ec3f091 1 2018-03-19 17:29:11 +08:00
f34e4e11ca 1 2018-03-19 17:27:49 +08:00
6bbe4dc316 1 2018-03-19 17:25:35 +08:00
d1476c14c2 1 2018-03-19 17:21:45 +08:00
f414c7f2ef 1 2018-03-19 17:14:31 +08:00
2d43865b81 1 2018-03-19 17:12:26 +08:00
16f71e5c44 1 2018-03-19 17:11:25 +08:00
fcaf7074b6 1 2018-03-19 17:07:12 +08:00
eca9b1fe11 1 2018-03-19 17:05:07 +08:00
e77c0c63c4 匹配括号 2018-03-19 16:46:48 +08:00
7b0dadfbdf 匹配括号 2018-03-19 11:51:06 +08:00
83467b8fe7 匹配括号 2018-03-19 11:29:54 +08:00
31fb781cde 去掉数字 2018-03-18 19:44:36 +08:00
JG
d6275ca4fa Merge pull request #46 from woodylan/master
doc: add a tool
2018-03-15 18:18:22 +08:00
5881c0befc Update README.md
add a tool
2018-03-15 18:16:39 +08:00
JG
ada220ef64 Merge pull request #45 from kc910521/master
补充遗失
2018-03-14 16:06:23 +08:00
c3e1b721c2 fix 2018-03-14 15:57:15 +08:00
JG
c6a2280c55 Merge pull request #44 from kc910521/patch-1
poetry: 修正补齐诗词
2018-03-13 00:54:16 -05:00
JG
9a16864b75 fix json
fix json
2018-03-13 13:52:03 +08:00
8a56fa4f00 fix 2018-03-13 10:36:32 +08:00
6779633b91 尝试修一下 2018-03-12 20:05:18 +08:00
3153310e34 tag: 增加通用 Tag 2018-03-11 10:07:19 +08:00
0869f590fc Merge branch 'master' of https://github.com/chinese-poetry/chinese-poetry 2018-03-02 18:02:53 +08:00
JG
3e884668b3 Merge pull request #41 from cclauss/patch-1
reload() was moved into importlib in Python 3
2018-03-02 17:55:05 +08:00
616c2b04a3 reload() was moved into importlib in Python 3
The builtin __reload()__ was moved into [importlib](https://docs.python.org/3/library/importlib.html#importlib.reload) in Python 3 because it was being overused and led to odd behavior that was often difficult to diagnose.  Here we are trying to __reload(sys)__ probably because 'utf-8' encoding and Unicode strs are not the default in Python 2.  They are however the default in Python 3 so this PR therefor suggests that a __pass__ would be satisfactory in Python 3.
2018-03-02 10:48:48 +01:00
6d343dca12 tag: 增加『宋词三百首』标签 2018-03-02 16:01:51 +08:00
6561d1c84a tag: 增加著名名胜标签 2018-03-02 09:58:43 +08:00
9efc28fa93 test: 增加词内容 JSON 文件校验,去除 ci.db 文件校验 2018-03-01 13:32:42 +08:00
fc17a59e73 doc: 改正 chinese-poetry-zhCN 链接地址 2018-03-01 13:31:42 +08:00
507e812605 ci: 为了方便贡献修改, 构建词及词作者json文件 2018-02-28 15:13:55 +08:00
08910c45ec ci: 为了方便贡献修改, 构建词及词作者json文件 2018-02-28 15:08:02 +08:00
6458ccc587 poetry: 使用有序map 2018-02-28 13:15:39 +08:00