 dalin
|
03cca1d1c0
|
update Simplified Chinese
|
2021-04-28 16:15:21 +08:00 |
|
|
dalin
|
354b075885
|
Merge remote-tracking branch 'upstream/master'
|
2021-04-28 14:15:42 +08:00 |
|
|
Ethan Lin
|
ee28e3346b
|
Merge pull request #21 from janeczku/master
merge from janeczku/master
|
2020-12-29 10:31:41 +08:00 |
|
|
Ethan Lin
|
8143bc7873
|
Merge pull request #20 from janeczku/master
merge janeczku/master
|
2019-03-26 11:27:11 +08:00 |
|
|
dalin
|
947622800c
|
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
|
2018-11-14 18:14:11 +08:00 |
|
|
Ethan Lin
|
dec50b5682
|
Merge pull request #19 from janeczku/master
merge from janeczku/master
|
2018-11-14 11:45:09 +08:00 |
|
|
idalin
|
b103ecdb5c
|
update simplified Chinese
|
2018-09-06 16:59:30 +08:00 |
|
|
Ethan Lin
|
9d8c10e24b
|
Merge pull request #18 from janeczku/master
merge from janeczku/master
|
2018-09-06 10:33:59 +08:00 |
|
|
Ethan Lin
|
282e79f4d8
|
Merge pull request #16 from janeczku/master
merge from janeczku/master
|
2017-10-30 11:26:05 +08:00 |
|
|
Ethan Lin
|
54d8240dc0
|
Merge pull request #14 from janeczku/master
merge from janeczku/master
|
2017-10-10 14:19:40 +08:00 |
|
|
Ethan Lin
|
4c030700fb
|
Merge pull request #12 from janeczku/master
merge from janeczku/master
|
2017-08-28 11:32:19 +08:00 |
|
|
idalin
|
274d0f6577
|
update Chinese translations
|
2017-08-11 09:32:01 +08:00 |
|
|
idalin
|
2b27d6570f
|
Merge branch 'janeczku-master'
|
2017-08-11 09:26:36 +08:00 |
|
|
idalin
|
b5cca553b3
|
update Chinese translations
|
2017-08-11 09:25:39 +08:00 |
|
|
Ethan Lin
|
16d80dcb8e
|
Merge pull request #11 from janeczku/master
merge
|
2017-07-27 09:36:57 +08:00 |
|
|
Ethan Lin
|
2272013d80
|
Merge pull request #9 from janeczku/master
merge from janeczku/master
|
2017-07-06 10:36:52 +08:00 |
|
|
idalin
|
4d8b43bd54
|
update Simplified Chinese translation
|
2017-03-21 10:16:40 +08:00 |
|
|
idalin
|
bdf28e1475
|
fix bug for metadata searching result.
|
2017-03-07 09:49:59 +08:00 |
|
|
idalin
|
a6b2977286
|
add i18n message for getmeta feature.
|
2017-03-07 09:46:09 +08:00 |
|
|
idalin
|
f8e4bed8bf
|
Merge branch 'janeczku-master'
|
2017-03-07 09:01:56 +08:00 |
|
|
idalin
|
338ca61cf9
|
fixed douban api not working in some cases
|
2017-02-28 15:17:37 +08:00 |
|
|
idalin
|
f44574af67
|
update Chinese translation.
|
2017-02-28 15:05:14 +08:00 |
|
|
idalin
|
54bc299e88
|
get metadata from douban and google while editing.
|
2017-02-28 14:58:11 +08:00 |
|
|
idalin
|
67df150aba
|
Merge branch 'janeczku-master'
|
2017-02-28 14:54:43 +08:00 |
|
|
idalin
|
e100702345
|
get metadata from douban and google while editing.
|
2017-02-28 14:52:55 +08:00 |
|
|
idalin
|
4a2b5b46a3
|
merge
|
2017-02-24 14:36:10 +08:00 |
|
|
idalin
|
2f1fdab9de
|
delete douban_meta.js in master.(This is for Chinese user only)
|
2017-02-24 14:34:08 +08:00 |
|
|
idalin
|
d6dd28e703
|
limit search results to 20
|
2017-02-24 14:29:44 +08:00 |
|
|
idalin
|
c98617a1cb
|
Merge branch 'master' into prod
|
2017-02-23 13:53:36 +08:00 |
|
|
idalin
|
3dcfebca60
|
update translations
|
2017-02-23 13:52:58 +08:00 |
|
|
idalin
|
b488af4c76
|
Merge branch 'master' into prod
|
2017-02-23 12:06:56 +08:00 |
|
|
idalin
|
9020c35819
|
fixed send to kindle not working problem for some smtp provider. #94
|
2017-02-23 11:26:39 +08:00 |
|
|
idalin
|
a09a2d9ed0
|
Merge branch 'master' into prod
|
2017-02-23 09:31:51 +08:00 |
|
|
idalin
|
2853ed1477
|
Merge branch 'janeczku-master'
|
2017-02-23 09:31:04 +08:00 |
|
|
idalin
|
80e6311b93
|
fetch metadata from douban while editing metadata
|
2017-02-21 17:49:43 +08:00 |
|
|
idalin
|
4ec3050082
|
merge from janeczku/master
|
2017-02-21 09:40:55 +08:00 |
|
|
idalin
|
829319403c
|
Merge branch 'janeczku-master'
|
2017-02-20 09:24:22 +08:00 |
|
|
idalin
|
42eea35682
|
Merge branch 'janeczku-master'
|
2017-02-17 15:07:24 +08:00 |
|
|
idalin
|
e02a91526e
|
bug fix with uploading limit
|
2017-02-17 15:05:17 +08:00 |
|
|
idalin
|
fe2383516d
|
limit the extensions of uploading files
|
2017-02-15 14:11:35 +08:00 |
|
|
idalin
|
eb38a9723f
|
update translations
|
2017-02-13 09:09:49 +08:00 |
|
|
idalin
|
bff86f02ca
|
settings for default role of new register user
|
2017-02-09 13:46:07 +08:00 |
|
|
idalin
|
df2eb82408
|
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
|
2017-02-09 11:37:23 +08:00 |
|
|
idalin
|
219f36be0e
|
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
|
2017-02-07 10:12:40 +08:00 |
|
|
idalin
|
a1cca00ba3
|
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
|
2017-02-06 10:23:37 +08:00 |
|
|
idalin
|
9ef8aa7914
|
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
|
2017-02-05 16:46:59 +08:00 |
|
|
Ethan Lin
|
e92d78870b
|
Merge pull request #8 from janeczku/master
Fix for simplified chinese language
|
2017-02-05 16:22:26 +08:00 |
|
|
Ethan Lin
|
29fd395433
|
Merge pull request #7 from janeczku/master
merge from janeczku
|
2017-02-05 09:25:47 +08:00 |
|
|
idalin
|
23969b18f5
|
update translations
|
2017-02-04 15:58:11 +08:00 |
|
|
idalin
|
f11b123686
|
merge conflicts
|
2017-02-04 10:57:32 +08:00 |
|
|
idalin
|
348a7fd24c
|
merge janeczku-master
|
2017-01-22 14:00:25 +08:00 |
|
|
idalin
|
e4ac186f3c
|
temp
|
2017-01-22 13:55:09 +08:00 |
|
|
idalin
|
04729ae8ac
|
update translations
|
2017-01-22 10:59:33 +08:00 |
|
|
idalin
|
15d314db33
|
update translations
|
2017-01-22 10:12:36 +08:00 |
|
|
Ethan Lin
|
89d1c8ead4
|
Merge pull request #3 from janeczku/master
merge from master
|
2017-01-19 16:22:09 +08:00 |
|
|
idalin
|
4bf5c05b8b
|
fix wrong translations
|
2017-01-17 17:47:14 +08:00 |
|
|
idalin
|
ac5d39dfd8
|
fix wrong translations
|
2017-01-17 17:45:43 +08:00 |
|
|
Ethan Lin
|
9303fce5fd
|
Merge pull request #2 from janeczku/master
Bugfix search in opds feed (#79 again)
|
2017-01-17 11:16:42 +08:00 |
|
|
idalin
|
9f1f678bef
|
reset to last commit url_for without _external
|
2017-01-17 11:09:02 +08:00 |
|
|
idalin
|
4a2f67bc00
|
fixed url_for return without port when port is not the standard port.
|
2017-01-16 16:26:20 +08:00 |
|
|
idalin
|
eb22fbf9fa
|
fixed url_for return without port when port is not the standard port.
|
2017-01-16 16:18:53 +08:00 |
|
|
idalin
|
0458ea5acb
|
fixed wrong translations. fixed smtp with ssl has no response.
|
2017-01-16 15:37:42 +08:00 |
|
|
idalin
|
6fcd65b4ce
|
added identifier for Douban
|
2017-01-16 11:14:49 +08:00 |
|
|
Ethan Lin
|
6d99b9bc25
|
Merge pull request #1 from janeczku/master
update from janeczku/calibre-web
|
2017-01-16 11:01:24 +08:00 |
|
|
idalin
|
9f65eae024
|
add default language configuration
|
2017-01-09 13:47:50 +08:00 |
|
|
idalin
|
571bec6363
|
add Simplified Chinese translation
|
2017-01-09 09:56:58 +08:00 |
|