1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-25 02:57:22 +00:00
Commit Graph

690 Commits

Author SHA1 Message Date
OzzieIsaacs
959e4e5d41 Merge remote-tracking branch 'polish_translation/patch-1' 2017-03-07 19:11:01 +01:00
OzzieIsaacs
edadf84710 Added editing star rating graphically
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
2017-03-07 19:10:17 +01:00
Radosław Kierznowski
557594c3a9 I modified "Quick start" in readme.md
I added a nohup command in the first subparagraph "Quick start".
2017-03-07 17:22:23 +01:00
林檎
53cc84ec18 #fix 148 2017-03-07 16:32:55 +08:00
Kennyl
fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00
林檎
7a14101d6f Merge branch 'master' into travis
# Conflicts:
#	cps/helper.py
#	cps/web.py
2017-03-07 13:33:27 +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
Jack
dda11c25b0 Removed use of tornado 2017-03-06 23:20:37 +00:00
Jack Darlington
a1cb349fda Merge branch 'develop' into personal 2017-03-06 23:18:29 +00:00
Jack Darlington
e4a27be1a9 Made stream download for normal download as well as odds 2017-03-06 23:17:57 +00:00
Jack Darlington
9466228c85 Merge branch 'feature/streaming_gdrive' into develop 2017-03-06 23:02:50 +00:00
Jack Darlington
e3e26d418d Finished code to chunk successfully. 2017-03-06 22:50:24 +00:00
Jack Darlington
10b129cb07 add timestamps 2017-03-06 21:05:21 +00:00
Jack Darlington
76e8117b0c initial version 2017-03-06 20:58:15 +00:00
Jack Darlington
3ba76526ee Merge branch 'master' into feature/ignorable_columns 2017-03-06 19:24:24 +00:00
Jack Darlington
475daaec75 Merge branch 'develop' into personal 2017-03-06 19:23:36 +00:00
Jack Darlington
fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
2017-03-06 19:17:00 +00:00
OzzieIsaacs
789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 2017-03-06 19:25:49 +01:00
OzzieIsaacs
e0c35b7420 Merge remote-tracking branch 'polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
2017-03-06 19:21:17 +01:00
OzzieIsaacs
26438f97ab Bugfix Filename without unidecode dependency 2017-03-06 19:19:14 +01:00
林檎
07ad73caca Merge branch 'fix/syntax-python3-20170305' into travis 2017-03-06 20:06:00 +08:00
林檎
297a08cd5f xrange fix
range to xrange
2017-03-06 19:47:58 +08:00
林檎
dc985e76df python3 fix 2017-03-06 18:23:33 +08:00
林檎
3421db2096 Merge branch 'fix/attachment-patch-20170305' into travis 2017-03-06 18:22:02 +08:00
林檎
0c9eacb024 fix opds 2017-03-06 16:35:00 +08:00
林檎
376eb8752e wrong conflict merge 2017-03-06 14:46:44 +08:00
林檎
5bd34ba6a9 Merge branch 'fix/syntax-python3-20170305' into travis 2017-03-06 14:36:13 +08:00
林檎
197f396e16 validate need include in vendor
PyPi version doesn’t support Python3
2017-03-06 14:35:28 +08:00
林檎
547f3c3456 double requirement fix 2017-03-06 14:31:13 +08:00
林檎
fca1fc23da double requirement fix 2017-03-06 14:30:45 +08:00
林檎
3369972073 Merge branch 'fix/syntax-python3-20170305' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
2017-03-06 14:27:18 +08:00
林檎
4dfa157161 use condition rather than try/catch 2017-03-06 13:42:00 +08:00
林檎
6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
2017-03-06 11:53:17 +08:00
林檎
0bc4f52783 Fix except clause
except: will catch specific error.
2017-03-06 11:44:54 +08:00
林檎
cf4816fc13 download dependency modules to vendor if you want. 2017-03-05 23:21:38 +08:00
林檎
d45ecfafcc Missing site for File validate module 2017-03-05 23:15:43 +08:00
林檎
d06f7979c9 byebye vendor lib 2017-03-05 23:01:34 +08:00
林檎
80bcf131ee add requirement.txt 2017-03-05 22:53:59 +08:00
林檎
1da3b57f5a no need future module for python2
fix missing StringIO
2017-03-05 19:23:49 +08:00
林檎
bf8688fee1 missing urllib migration 2017-03-05 18:48:59 +08:00
林檎
da8d0c2a9f Merge branch 'fix/syntax-python3-20170305' into travis 2017-03-05 18:19:38 +08:00
林檎
c3fd205b7d fix /stat 2017-03-05 18:18:22 +08:00
林檎
b70191ca2a Least change to adapt with python3
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1  (0 is meaningless)

add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)

refer to
http://python-future.org/compatible_idioms.html
2017-03-05 17:40:39 +08:00
林檎
f315d54c87 fix yams 2017-03-05 15:56:27 +08:00
林檎
d56d67ce43 Fix bash 2017-03-05 15:55:10 +08:00
林檎
5bd93186c2 Fix shell script bug 2017-03-05 15:51:20 +08:00
林檎
3a9a327957 Fix build script 2017-03-05 15:43:56 +08:00
林檎
2c32696417 Merge branch 'fix/slugify-filename-20170305' into travis 2017-03-05 15:36:07 +08:00