1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-06-29 16:43:21 +00:00
Commit Graph

122 Commits

Author SHA1 Message Date
OzzieIsaacs
12db39523c Merge branch 'master' of https://github.com/wuqi/calibre-web
# Conflicts:
#	.gitignore
#	cps/static/css/colors.css
#	cps/static/css/style.css
#	cps/web.py
2016-10-24 19:04:16 +02:00
OzzieIsaacs
05189f78bc Fix for #67 2016-10-05 12:44:32 +02:00
OzzieIsaacs
7df88e70a3 First step fix for #37 wrong search adress
@ jschuck, @jgillmann, could you please confirm that you can search now?
Do you still have logout/login problems? -> redirects to Hostname instead of hostname/calibre?
(got this too with apache server, where as search worked before)
2016-10-04 20:46:35 +02:00
OzzieIsaacs
753a0a82a1 Fix for #66 advanced search 2016-10-03 12:08:34 +02:00
ouzklcn
cd88af32f2 add fix for janeczku/calibre-web#64 kindlegen conversation error 2016-09-21 11:27:37 +03:00
OzzieIsaacs
897c1648bb Add fix for #58 remove trailing spaces 2016-08-27 10:32:53 +02:00
Cervinko Cera
8a9b4e7fc7 remove print 2016-08-08 21:04:09 +02:00
Cervinko Cera
0f8c308973 Fix for deleting kindle mail adresee #54 2016-08-08 21:01:38 +02:00
Cervinko Cera
eb8b9bf166 Fix for missing metadata in pdf files 2016-08-07 23:34:23 +02:00
Cervinko Cera
ae1ecf6542 Fix for missing metadata in pdf files 2016-08-07 23:32:55 +02:00
cervinko
52ba2adf73 Merge pull request #48 from OzzieIsaacs/patch-1
Fix for #45 DB_ROOT not found
2016-08-07 22:51:06 +02:00
cervinko
79f373d4e6 Merge pull request #49 from OzzieIsaacs/patch-2
Fix for non Ascii Characters in database paths #46
2016-08-07 22:38:10 +02:00
cervinko
df5ab3d294 Merge pull request #50 from OzzieIsaacs/patch-3
Fix #20
2016-08-07 22:32:02 +02:00
Cervinko Cera
8159cf6b1a Merge remote-tracking branch 'upstream/master'
merge with upstream
2016-08-07 22:29:21 +02:00
Cervinko Cera
2b2d485730 upload more than pdf fixes 2016-08-07 22:10:00 +02:00
Cervinko Cera
f5773cc75f resolve conflicts with PR 30 2016-08-07 18:46:38 +02:00
OzzieIsaacs
59136a9cc2 Linux path problem solved (finally) 2016-08-07 10:32:45 +02:00
OzzieIsaacs
5a0faf9950 Now working on linux, too 2016-08-04 09:29:16 +02:00
OzzieIsaacs
9aac40bfc4 Fix #20
Series and custom composite coloums are also excluded in the view
2016-08-03 13:14:24 +02:00
OzzieIsaacs
3b5be5dbc4 Update db.py 2016-08-03 07:37:53 +02:00
OzzieIsaacs
da83af092a Fix for #46 encoding issue 2016-08-03 07:35:58 +02:00
OzzieIsaacs
624737d2e2 Fix for #45 DB_ROOT not found 2016-08-03 07:28:14 +02:00
wuqi
f2de1d4c47 change google fonts to local 2016-07-20 10:41:04 +08:00
wuqi
26c293308c mouse wheel 2016-07-19 14:48:11 +08:00
wuqi
b846cc11d8 fix some error
Fix TypeError: 'bool' object is not callable
2016-07-19 10:59:46 +08:00
Joel Gillman
a7117228aa
Update Google Font protocol to HTTPS 2016-07-18 11:10:45 -07:00
wuqi
3a54ff0eb4 browser icon change back 2016-07-16 17:26:40 +08:00
wuqi
ab97ead264 merge test 2016-07-16 17:17:43 +08:00
wuqi
350f4e21e6 Add txt reader
add txt file reader,and add select for read the book
2016-07-16 16:44:47 +08:00
janeczku
d051a1dbeb Fix login/logout redirect with reverse proxy 2016-07-15 14:29:57 +02:00
janeczku
f95ac38c54 Fix redirects with reverse proxy
See #36
2016-07-15 01:28:12 +02:00
janeczku
34e11fab79 Support reverse proxy subdirectory
Closes #19
2016-07-14 02:12:21 +02:00
wuqi
9a8d795eff Update epub reader and pdf reader
Update epub reader and use pdf.js tu view pdf files
2016-07-09 16:54:13 +08:00
Pavel Yakunin
8a9c97bf69 fb2 uploading 2016-06-18 16:51:16 +03:00
Pavel Yakunin
8b5bd61467 fb2 uploading 2016-06-18 16:50:32 +03:00
janeczku
82574d2118 Support SMTP without authentication 2016-06-17 21:32:00 +02:00
janeczku
91eb7129ac Update epub.js 2016-06-17 21:22:09 +02:00
janeczku
62f9120a0f Merge branch 'zip-check' 2016-06-17 21:08:59 +02:00
janeczku
e42f768909 Check if epub file exists before trying to extract 2016-06-17 20:59:44 +02:00
janeczku
374cfd866d Disable autocomplete in user edit 2016-06-17 20:01:44 +02:00
janeczku
46c83bbe8b Fix recursive path creation 2016-06-17 20:01:27 +02:00
janeczku
af1691f919 Fix missing import 2016-06-17 14:42:39 +02:00
Pavel Yakunin
43d6077815 cleanup 2016-06-05 22:32:26 +03:00
Pavel Yakunin
18e341d650 epub uploading 2016-06-05 22:28:30 +03:00
Pavel Yakunin
dc5074a865 default upload logic 2016-06-05 19:52:28 +03:00
Pavel Yakunin
44df873f33 logging, tmp cleanup 2016-06-05 19:42:18 +03:00
Pavel Yakunin
027e103ce3 refactoring to make adding new formats possible 2016-06-05 18:41:47 +03:00
Jan B
db70e47557 Merge pull request #18 from cervinko/feature-advanced-search
add advanced search
2016-05-22 14:05:40 +02:00
Cervinko Cera
c26eb6aa08 add exclude tags to advanced search 2016-05-03 14:27:38 +02:00
Cervinko Cera
80c3c19c01 some fixes for advanced search 2016-05-03 11:00:45 +02:00