林檎
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
2017-03-09 12:19:46 +08:00
林檎
d7d29827f4
fix behind
2017-03-08 23:59:56 +08:00
林檎
7bae79d826
fix conflict
2017-03-08 23:56:20 +08:00
林檎
a7d361a0ff
merge conflict
2017-03-08 23:52:41 +08:00
林檎
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
2017-03-08 23:50:14 +08:00
林檎
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08:00
林檎
d7afbdc349
use quote instead of urllib.quote
2017-03-08 13:26:52 +08:00
林檎
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
2017-03-08 11:48:12 +08:00
Jack Darlington
e3a2bd348c
Merge branch 'develop' into personal
2017-03-08 00:30:00 +00:00
Jack Darlington
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
2017-03-08 00:26:15 +00:00
Jack Darlington
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
2017-03-07 22:05:56 +00:00
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
a752e62963
Fix Import problem on python2
2017-03-07 21:08:28 +01:00
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
2017-03-07 20:36:43 +01:00
OzzieIsaacs
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
2017-03-07 20:30:55 +01:00
OzzieIsaacs
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
2017-03-07 20:22:28 +01:00
OzzieIsaacs
acac0570e5
Merge remote-tracking branch 'use_pip/use-pip'
...
# Conflicts:
# cps.py
# readme.md
# vendor/wand/api.py
# vendor/wand/drawing.py
# vendor/wand/exceptions.py
# vendor/wand/image.py
# vendor/wand/version.py
2017-03-07 19:46:23 +01:00
OzzieIsaacs
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
2017-03-07 19:15:40 +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
林檎
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 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
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
林檎
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
林檎
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
林檎
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
2017-03-05 15:36:07 +08:00
林檎
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-05 15:35:57 +08:00
林檎
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
2017-03-05 15:30:35 +08:00
Radosław Kierznowski
cbc47c754e
Update polish translation
...
I fixed some of the phrases more understandable.
2017-03-04 21:41:54 +01:00
林檎
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
2017-03-05 00:28:37 +08:00
林檎
a850e64bfb
Refactor cover detection
...
obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now %cover_id% retrieve from <meta name=“cover” content=%cover_id%>
2017-03-04 15:48:59 +08:00
林檎
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
2017-03-04 15:37:30 +08:00
Jack Darlington
c702b14340
Fixes for READ/UNREAD
2017-03-03 21:38:54 +00:00
Jack Darlington
27cbab6cb7
Fixes for READ/UNREAD
2017-03-03 21:09:53 +00:00
OzzieIsaacs
8c7ba2ccdf
Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
...
# Conflicts:
# cps/epub.py
2017-03-03 19:48:02 +01:00
林檎
1a10859a57
When upload pub, add description to comment accord opf file
2017-03-03 12:50:06 +08:00
Jack Darlington
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
2017-03-03 00:03:46 +00:00
Jack Darlington
b6da3c3153
Fix for read/unread for anonymous users
2017-03-02 23:56:07 +00:00
Jack Darlington
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
2017-03-02 23:55:32 +00:00
Kennyl
19f939a46c
Update epub.py
...
initialize covefile to None first
2017-03-03 00:27:54 +08:00
林檎
d5e525305d
Lower case text, some epub have uppercased which is beyond iso639 standard.
2017-03-02 23:20:37 +08:00
林檎
13b4ae4c24
more error adaptive
2017-03-02 23:15:15 +08:00
林檎
879510da82
Upload support detection of language
2017-03-02 22:57:02 +08:00
林檎
4afb486986
add languages field for BookMeta
2017-03-02 19:59:35 +08:00
Jack Darlington
df9124f78b
Fix OPDS download
2017-03-02 09:14:46 +00:00
Jack
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
2017-03-02 00:28:30 +00:00
Jack Darlington
8e85d1b5bd
Merge branch 'develop' into personal
2017-03-01 22:40:28 +00:00
Jack Darlington
78abf81b2f
Fix for editing metadata and uploading for GDrive
2017-03-01 22:38:03 +00:00
OzzieIsaacs
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
2017-03-01 18:10:14 +01:00
林檎
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
2017-03-01 17:20:58 +08:00
林檎
9a2877ebd5
situation when opf file content is
...
<meta name="cover" content="cover.jpg"/>
2017-03-01 14:36:31 +08:00
林檎
7972b987d4
Read img tag of cover file if cover is (x)html
...
for example
‘<item id="cover" href="Text/cover.xhtml" media-type="application/xhtml+xml”/>’
2017-03-01 13:18:14 +08:00
Jack Darlington
8745d65ff6
Merging ignorable columns
2017-02-28 23:53:32 +00:00
Jack Darlington
141eb7901c
Add ignorable columns
2017-02-28 23:42:46 +00:00
Jack Darlington
ee5870c6cf
Merge branch 'master' into develop
2017-02-28 22:19:44 +00: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
e100702345
get metadata from douban and google while editing.
2017-02-28 14:52:55 +08:00
Radosław Kierznowski
9dfd30e6f3
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-02-27 23:04:34 +01:00
Radosław Kierznowski
2f7fd1d957
Aktualizacja stanu tłumaczenia
2017-02-27 22:57:29 +01:00
Radosław Kierznowski
76c907484b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
2017-02-27 22:40:42 +01:00
OzzieIsaacs
90aa269e92
Merge remote-tracking branch 'polish_translation/master'
...
@radzio1993 : Thanks
2017-02-27 21:15:36 +01:00
Radosław Kierznowski
36264e7400
Update polish translation (POT: 2017-02-20 19:47)
2017-02-27 20:48:46 +01:00
Jack Darlington
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2017-02-26 19:49:49 +00:00
Radosław Kierznowski
9ec5303fdc
Update polish translation (POT: 2017-02-20 19:47)
2017-02-26 18:29:38 +01:00
OzzieIsaacs
679effbaef
Bugfix placement of "recent downloads in "edit user section"
2017-02-25 13:34:33 +01:00
OzzieIsaacs
156a653c49
Make better usage of big screens in lists
2017-02-25 13:28:57 +01:00
OzzieIsaacs
00763d6e4c
Read book is now tied to the right downlolad books for guest users ( fixes #110 )
2017-02-25 11:14:45 +01:00
OzzieIsaacs
1a83ad713c
Additional version info for sqlite database
2017-02-25 09:02:59 +01:00
Ozzie Isaacs
b876505f22
Delete doubtable.js
2017-02-25 06:15:00 +01:00
OzzieIsaacs
40c6ef3a18
More generic aproach for postion of epub coverfile ( #122 )
2017-02-24 20:20:41 +01: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
OzzieIsaacs
41a20fe3e1
Added version info of dependencys in about section
2017-02-23 19:58:56 +01:00
OzzieIsaacs
0277d08706
Merged #123 .
...
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94 )
2017-02-23 19:06:52 +01: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
Jack Darlington
51bd888765
Fix registering watch callback
2017-02-23 00:17:14 +00:00
Jack Darlington
82d01c9001
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
2017-02-22 22:45:19 +00:00
Jack Darlington
7b709c15c2
GitIgnore update + fixes for initial setup
2017-02-22 22:06:59 +00:00
OzzieIsaacs
7e19e1dd9d
Added Publisher and search/advanced search/opds search for publisher
2017-02-22 20:59:48 +01:00
Jack Darlington
6d30382ae0
Initial gdrive commit
...
Work on watching metadata
More efficient storing folder keys to database
Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally
Changed callback for file changes from being hard coded to mine
used url_for in template as apposed to hard coded links
Fix to drive template
First attempt at redownload metadata.db
Fixed incorrect call to downloadFile
Added logging
Fixed call to copy file
Added exception logging to gdriveutils + fixed string long concat
Fix file download
Fix backup metadata
Added slashes to paths
Removed threading temporarily
Fix for reloading database
Fix reinitialising of variables
Fix check to see if custom column already setup
Update to showing authenticate google drive callback + fix for reinitialising database
Fixed logic for showing authenticate with google drive
2017-02-22 11:20:41 +00:00
OzzieIsaacs
6ec4e0a651
Bugfix Updater
...
Improved logging
2017-02-21 19:40:22 +01:00
idalin
80e6311b93
fetch metadata from douban while editing metadata
2017-02-21 17:49:43 +08:00
OzzieIsaacs
709fa88c62
Navbar reduced to icons on smaller screens
...
Feedback updater improved (#81 )
2017-02-20 19:52:00 +01:00
Jack Darlington
f71fa5d935
Accidentally committed WIP google drive integration
2017-02-19 22:56:07 +00:00
Jack Darlington
d29d079d15
Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)
2017-02-19 20:08:22 +00:00
OzzieIsaacs
3cadde6579
Fix for ( #117 )
2017-02-18 20:12:07 +01:00
OzzieIsaacs
eaccc3f408
Merge branch 'master' of https://github.com/janeczku/calibre-web
2017-02-18 10:38:35 +01:00
OzzieIsaacs
e712649612
Improvement for #83 , higher contrast of hamburger menu
...
Improvement for #84 , search is excluded from mobile view
2017-02-18 10:38:16 +01:00
Ozzie Isaacs
075c4c58e7
Revert os.rename to os.renames
2017-02-17 22:54:14 +01:00
OzzieIsaacs
ad40a2b5a6
Bugfix parsing publishing date with milliseconds ( #114 )
2017-02-17 18:22:08 +01:00
OzzieIsaacs
ed459ddb9b
Bugfix display of commit date
2017-02-15 18:19:48 +01:00
OzzieIsaacs
93b19165cf
Added polish in readme to supported UI languages
...
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
2017-02-15 18:09:17 +01:00
OzzieIsaacs
13caa54aad
Merge remote-tracking branch 'Polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-02-12 08:14:44 +01:00
Radosław Kierznowski
437358d685
Updated Polish translations (170210.2017)
...
The update is based on the .pot file on 2017-02-10 20:17
2017-02-11 16:08:39 +01:00
OzzieIsaacs
1692044d46
Merge remote-tracking branch 'default_user_settings/master' ( #105 )
2017-02-10 20:18:37 +01:00
OzzieIsaacs
8ededba350
Merged #106 (polish translation)
2017-02-10 20:01:26 +01:00
Radosław Kierznowski
c49d5e22cd
Upload polish version
2017-02-10 12:45:48 +01:00
Radosław Kierznowski
b686498593
I added Polish translation calibre-web
...
Translation requires a small fixes.
2017-02-10 00:21:59 +01: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
OzzieIsaacs
ba8e107402
Move vendored css/js to libs folders to fix language stats
2017-02-07 20:33:08 +01:00
OzzieIsaacs
ea305ff578
Merge remote-tracking branch 'origin/move-js-libs'
2017-02-07 20:27:47 +01:00
OzzieIsaacs
98ed740e73
Fixed missing js files for sorting shelfs
2017-02-07 20:14:43 +01:00
janeczku
13919a1d23
Move vendored css/js to libs folders to fix language stats
2017-02-07 19:21:14 +01:00
idalin
219f36be0e
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-07 10:12:40 +08:00
OzzieIsaacs
7957827b2d
Merge branch 'env-port'
2017-02-06 17:47:36 +01:00
janeczku
0e883f0b46
Allow overriding default port with environment variable
2017-02-06 16:00:29 +01:00
janeczku
8d9ed56864
Fix typo; raise exception when creating database
2017-02-06 15:34:31 +01:00
idalin
a1cca00ba3
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-06 10:23:37 +08:00
OzzieIsaacs
63379fe5db
Fix for #101
2017-02-05 14:27:57 +01:00
OzzieIsaacs
18a06e4a25
Fixed typeahead with reverse proxy
...
fixed marking of tags in advanced search
seperated js and html
2017-02-05 13:40:53 +01:00
idalin
9ef8aa7914
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-05 16:46:59 +08:00
OzzieIsaacs
d5a64baf13
Bugfix name to id
2017-02-05 09:44:39 +01:00
Ethan Lin
e92d78870b
Merge pull request #8 from janeczku/master
...
Fix for simplified chinese language
2017-02-05 16:22:26 +08:00
OzzieIsaacs
4e73b11735
Fix for simplified chinese language
2017-02-05 08:49:19 +01:00
Ethan Lin
29fd395433
Merge pull request #7 from janeczku/master
...
merge from janeczku
2017-02-05 09:25:47 +08:00
OzzieIsaacs
241c4cef8f
- added best rated section in normal view
...
- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
2017-02-04 14:28:18 +01:00
OzzieIsaacs
ee91fc03ef
Bugfix Id instead of names in url
2017-02-04 10:01:28 +01: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
OzzieIsaacs
861920af88
Pubdate is now showing up ( #95 )
...
Bugfix links in detailview
2017-02-03 13:44:13 +01:00
OzzieIsaacs
e46320b12f
folders now relying on ids not names (removes all encoding issues on link folders)
...
Language filter working in opds feed
removed redundant code
authos now paginating in opds feed
2017-02-03 13:20:35 +01:00
OzzieIsaacs
176c7dce70
- Fix for #100
...
- Fix migration of shelf order
- fix show random books in detail view for authors and series
2017-02-02 19:36:31 +01:00
OzzieIsaacs
f21c65ac50
- Bugfix Migration of database for config_log_level
...
- Bugfix Updater deleting temporary sourcefolder
2017-01-31 20:48:01 +01:00
OzzieIsaacs
c45968a1ed
Bugfix Updater
2017-01-31 19:29:47 +01:00
OzzieIsaacs
296d2615fe
Code cosmetics
2017-01-30 19:52:32 +01:00
OzzieIsaacs
9b09de12b5
Bugfix update (still not working correct)
2017-01-30 19:45:03 +01:00
OzzieIsaacs
af0417758c
Bugfix change permissions during update
2017-01-30 19:10:22 +01:00
OzzieIsaacs
1d3be7f4c6
Bugfix Git ident id
2017-01-30 19:03:55 +01:00
OzzieIsaacs
b1293c84bc
- Implemented autoupdater for testing
...
- failed logins are logged
- no of backups for log-file increased to 2
2017-01-30 18:58:36 +01:00
OzzieIsaacs
935b6e3143
Code cosmetics
...
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
2017-01-29 21:06:08 +01:00
OzzieIsaacs
e9d0bff559
- added statistics for Tags and series
...
- Loglevel is displayed as text instead of value
2017-01-28 20:54:31 +01:00
OzzieIsaacs
e00a6741c7
Updated language files
2017-01-28 20:39:33 +01:00
OzzieIsaacs
2c615fdf05
Finalize graphical setup for calibre-web
2017-01-28 20:16:40 +01:00
OzzieIsaacs
75c89c28e1
Bugfix for accessing config database
...
Title now displaed on every page
Title can be changed from within application
2017-01-22 21:30:36 +01:00
OzzieIsaacs
4eee58c21c
Started migration of config to app database
2017-01-22 16:44:37 +01:00
OzzieIsaacs
a2a48515d4
Fixed language and locale preset for new users
2017-01-22 14:07:54 +01: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
OzzieIsaacs
93b020b77c
Proper handling for non existing covers in calibre database
2017-01-21 17:04:36 +01:00
OzzieIsaacs
a40322468a
Update Translation file Informations
2017-01-21 11:46:28 +01:00
OzzieIsaacs
689aca276c
Update Translation file Informations
2017-01-21 11:46:16 +01:00
OzzieIsaacs
fd9740f758
Updated translation
2017-01-18 19:18:37 +01:00
OzzieIsaacs
afdfb30d80
Update email settings
2017-01-18 19:07:45 +01:00
OzzieIsaacs
0967b03a22
Merge branch 'master' into patch1
2017-01-18 19:01:16 +01:00
OzzieIsaacs
5a8dd19b4b
Bugfix Authentication for opds search calibre companion
2017-01-17 17:45:23 +01: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
OzzieIsaacs
12c80800ed
Bugfix search in opds feed ( #79 again)
...
Bugfix link generation for calibre-companion with reverse proxy (#79 again)
2017-01-16 18:30:47 +01: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
OzzieIsaacs
e5d881edf8
Bugfix empty search for opds feed
2017-01-15 12:37:58 +01:00
OzzieIsaacs
4b8fdb04e6
Improvement mimetypes for downloaded files
2017-01-15 12:23:08 +01:00
OzzieIsaacs
99430fc98e
Bugfix ( #79 ).
...
- Fixed download with anonymous user in opds feed
- Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi
2017-01-15 11:05:28 +01:00
OzzieIsaacs
2335252b1f
Merge branch 'Chinese_tanslation' ( #90 )
...
Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards
2017-01-14 15:05:49 +01:00
OzzieIsaacs
fb59647b82
Code cleanup in js and css folders
2017-01-14 13:32:25 +01:00
OzzieIsaacs
8759edd587
Calibre-companion now working ( #79 )
2017-01-14 13:18:35 +01:00
OzzieIsaacs
799d54bb24
Download with calibre-companion now working ( #79 )
2017-01-12 21:03:47 +01:00
OzzieIsaacs
0107c52b66
Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) ( #35 )
...
Search now working for calibre-companion (#79 ), download not working yet
metadata view 80% finished
2017-01-12 20:43:36 +01:00
OzzieIsaacs
beca61a596
Nonexisting books are deleted from downloaded list ( #91 )
2017-01-10 21:20:12 +01:00
OzzieIsaacs
c6d1c186f0
Metadata viewing should work with calibre-companion now ( #79 )
2017-01-09 21:18:49 +01:00
OzzieIsaacs
6cf82dc9b9
Loading further items in calibrecompanion should now work ( #79 )
2017-01-09 19:10:39 +01: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
OzzieIsaacs
9927a6cc71
Covers should now be downloadable with calibre-companion ( #79 )
2017-01-08 16:46:57 +01:00
OzzieIsaacs
c13a2a4557
OPDS Marvin (and Marvin 3) now really work ( #79 )
...
OPDS should now also work with reverse proxy configuration
Changed readme (reverse proxy configuration)
No progress for calibre companion
2017-01-08 14:46:30 +01:00
OzzieIsaacs
a16321179d
Improvements for OPDS on iOS with Bookari- and Chunky-Reader
2017-01-07 18:08:12 +01:00
OzzieIsaacs
8494cb698c
Changed order of checkbox and label for SSL in SMTP Settings
2017-01-07 07:19:31 +01:00
OzzieIsaacs
c7b35250c6
Bugfix E-Mailsettings
2017-01-06 14:45:43 +01:00
OzzieIsaacs
3590665614
Added goodreads link (fnally closes #80 )
2017-01-05 20:11:02 +01:00
OzzieIsaacs
ea2e8205e3
Added code for rearranging shelfs #73
2017-01-03 20:19:32 +01:00
OzzieIsaacs
490f8ef5f2
Shelfs of diffrent users can have the same name now
...
Removing ratings by giving a rating of zero is now possible (like in calibre)
2017-01-03 19:29:33 +01:00
OzzieIsaacs
453d04b566
Final fix for #86 (reverse proxy error)
...
renamed admin_user to admin
added configuration infos inm admin panel
2017-01-02 18:52:33 +01:00
OzzieIsaacs
0bcdbc4a82
Bugfix Search opds feed
...
Improvement OPDS feed for displaying covers
2016-12-29 19:19:40 +01:00
OzzieIsaacs
f434511db8
Fixed lout issue with redirects
...
fixed database migration problem which was introduced with the shelf order commit
2016-12-29 10:30:42 +01:00
OzzieIsaacs
cf01f7ce61
Merge pull request #85 from smartcitiescommunity/master
...
Add Spanish Translation
Thank you very much @juanfernandovillahernandez
2016-12-28 16:11:50 +01:00
OzzieIsaacs
157a2e6e4a
Renamed feed to opds for better compatibility with some readers
...
added clickable links to feed (should hopefully solve #79 )
updated readme
2016-12-28 15:51:58 +01:00
OzzieIsaacs
e744ccc20e
Bugfix for links with reverse proxy and shelfs
2016-12-28 12:02:17 +01:00
OzzieIsaacs
a8f7fde333
Bugfix PDF Reader with reverse proxy ( #86 )
...
Bugfix Txt Reader
Bugfix for loading covers with reverse proxy
2016-12-28 11:43:36 +01:00
Juan Fernando Villa Hernández
c187c8b9c4
Archivo mo del archivo messages.po
...
Archivo mo del archivo messages.po el cual esta traducido a el español
2016-12-27 15:11:01 -05:00
Juan Fernando Villa Hernández
5831a20d76
Traducción a el español
...
Archivo de traducción a el español
2016-12-27 15:05:30 -05:00
OzzieIsaacs
c33a329f08
Add search for series and languages ( #56 )
...
Add database migration for shelf ordering (#73 )
2016-12-27 16:07:25 +01:00
OzzieIsaacs
fac83a10eb
Added display and linking of IDs (Amazon, ISBN, and DIO Links are working)
2016-12-27 10:36:06 +01:00
OzzieIsaacs
e0459eb62b
Removed unused wishlist code
...
Added renaming of shelf name
Added sorting abilty to shelfs
jquery is loaded locally now
2016-12-26 11:33:32 +01:00
OzzieIsaacs
ba44a15891
changes for #77
...
Code cosmetics
#75 :
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
2016-12-23 09:53:39 +01:00
OzzieIsaacs
c582ccf79c
Fix for #78
2016-12-20 07:45:04 +01:00
OzzieIsaacs
811975f1a4
Added french translation
2016-11-13 19:28:38 +01:00
OzzieIsaacs
b878651e4e
Bugfix epub-Reader
2016-11-13 12:13:32 +01:00
OzzieIsaacs
0aa3ff4f6d
Remove trailing spaces from username during login
...
Upload of books working on windows without errors
2016-11-12 21:28:40 +01:00
OzzieIsaacs
b86864b407
Made kindlegen working on windows (including paths containing umlauts)
...
Added back buttons on edit mail, edit user, and edit book
2016-11-12 10:52:59 +01:00
OzzieIsaacs
bbf6d9b026
Translation of UI (german and english)
...
Bugfix for feeds
- removed categories related and up
- load new books now working
- category random now working
login page is free of non accessible elements
boolean custom column is vivible in UI
books with only with certain languages can be shown
book shelfs can be deleted from UI
Anonymous user view is more resticted
Added browse of series in sidebar
Dependencys in vendor folder are updated to newer versions (licencs files are now present)
Bugfix editing Authors names
Made upload on windows working
2016-11-09 19:24:33 +01:00
OzzieIsaacs
a6b6700a73
Removed non working search from epub viewer
2016-11-01 18:49:47 +01:00
OzzieIsaacs
313116dca7
Uploader is working on windows
2016-10-30 11:44:02 +01:00
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
Cervinko Cera
7fce28790d
add search_form.html
2016-05-02 23:25:21 +02:00
Cervinko Cera
431b6009a5
add advanced search
2016-05-02 22:43:50 +02:00
janeczku
1e2a6f2ffb
Fix session.rollback on admin account creation
2016-04-29 22:54:38 +02:00
janeczku
3719b7e4eb
Add ANON_BROWSE configuration option
2016-04-29 22:36:36 +02:00
Cervinko Cera
3833079973
assign admin all rights in create_admin_user()
2016-04-27 19:50:04 +02:00
Cervinko Cera
8f4c444929
add basic auth for feed sites
2016-04-27 18:29:45 +02:00
Cervinko Cera
f66d7ce29b
add permission for changing own password
2016-04-27 16:00:58 +02:00
Cervinko Cera
bc35250f28
permission fix in user_edit.html
2016-04-27 10:39:52 +02:00
Cervinko Cera
c7b7b3866e
add user-permission management
2016-04-27 10:35:23 +02:00
Cervinko Cera
b2146ba4b9
add support for is_multiple custom columns
2016-04-21 19:18:52 +02:00
Cervinko Cera
3f1a54ea59
fix typo in detail.html
2016-04-21 14:46:19 +02:00
Cervinko Cera
b7f71e563e
fix for custom column 'rating'
2016-04-21 12:59:49 +02:00
Cervinko Cera
931981a37a
fix for custom column 'rating'
2016-04-21 12:46:26 +02:00
Cervinko Cera
a21a9d6510
save rating as rating*2 in db and show rating/2 in interface
2016-04-21 09:04:08 +02:00
Cervinko Cera
f57c9c5951
remove if clauses for int and float in edit_book.html
2016-04-20 23:53:55 +02:00
Cervinko Cera
27d5a79efb
remove some commented code and debug prints
2016-04-20 19:42:24 +02:00
Cervinko Cera
704198655b
custom columns unfinished
2016-04-20 19:25:47 +02:00
Cervinko Cera
202cbc26a7
custom columns unfinished
2016-04-20 19:25:47 +02:00
Cervinko Cera
0ee46e4b5e
custom columns unfinished
2016-04-20 19:25:46 +02:00
Cervinko Cera
2207622bbf
fix for edit page after upload
2016-04-20 00:23:14 +02:00
JanB
8d2a865436
Catch file permission errors when uploading PDF
2016-04-17 17:42:22 +02:00
JanB
df480160da
Handle race in database creation when running multiple WSGI instances
2016-04-17 17:30:55 +02:00
Cervinko Cera
88b134151d
show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver
2016-04-15 23:51:26 +02:00
Cervinko Cera
826159c432
show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver
2016-04-15 23:51:26 +02:00
JanB
76c7cdf465
Add config option for upload feature
2016-04-15 19:44:13 +02:00
JanB
952d389dc5
Ship config.ini with defaults; log errors to file; fix OPDS catalog name
2016-04-15 18:54:23 +02:00
Cervinko Cera
1d295eb954
show 'read in browser' only for epubs
2016-04-13 00:09:17 +02:00
Cervinko Cera
8be85c8e5d
check if wand is available, add dummy cover.jpg otherwise
2016-04-08 22:57:58 +02:00
Cervinko Cera
51f1453917
check if wand is available, add dummy cover.jpg otherwise
2016-04-08 22:57:16 +02:00
Cervinko Cera
e4ffc9f2a0
set last_modified when pdf is uploaded
2016-04-06 12:55:20 +02:00
Cervinko Cera
4e0621479a
don't show upload button for users
2016-04-06 11:04:06 +02:00
Cervinko Cera
bda3055a19
improvements for pdf upload function
2016-04-05 20:50:28 +02:00
Cervinko Cera
3324669702
improvements for pdf upload function
2016-04-04 23:25:53 +02:00
Cervinko Cera
748dd2ad1f
Merge remote-tracking branch 'upstream/master'
2016-04-03 23:52:37 +02:00
Cervinko Cera
3ddecc007c
Adding unfinished upload function
2016-04-03 23:52:32 +02:00
Jan Broer
7342837aa3
Merge branch 'html-fixes'
2016-04-03 23:33:43 +02:00
Jan Broer
318d65bf3a
Small UI fixes
...
* Smart truncate long titles in overview pages
* Fix responsive grid in overview
* Update favicon
2016-04-03 23:33:29 +02:00
Cervinko Cera
cb2ac4d142
for for editing Author
2016-04-03 23:22:26 +02:00
Cervinko Cera
a96417f2a5
fix for password edit at the admin page
2016-04-03 15:12:48 +02:00
Cervinko Cera
a395e9f301
remove orphaned authors
2016-04-03 00:31:30 +02:00
Cervinko Cera
c6500b7eca
Merge remote-tracking branch 'upstream/master'
2016-03-29 13:56:24 +02:00
Jan Broer
e8b2ea873c
Don't send AZW formats via mail
2016-03-29 01:25:25 +02:00
Cervinko Cera
1a922d4552
Fix crash when 'view book after edit' is not checked
2016-03-29 00:30:59 +02:00
Cervinko Cera
cd0aeb2857
Add Typeahead for Author input
2016-03-29 00:09:11 +02:00
Jan Broer
13a024a77d
Add logging / Optimize CSS
2016-03-28 21:14:16 +02:00
Cervinko Cera
d979ed89c6
Fixes for editing Authors
2016-03-28 16:42:38 +02:00
Jan Broer
34cd613e29
Fixes broken send-to-kindle
2016-03-27 23:41:55 +02:00
Jan Broer
17622c1fbf
Fix download error when book title contains non-latin characters (e.g. Chinese)
2016-03-26 17:17:11 +01:00
Jan Broer
f163ef2202
make pretty filenames for downloads; remove random books section on most pages
2016-03-26 16:12:29 +01:00
Jan Broer
2b846b1e6b
Make shelf names required unique
2015-10-13 19:12:18 +02:00
Jan Broer
350285607b
Add HTTP-BASIC Auth for OPDS downloads
2015-10-13 19:06:37 +02:00
Jan Broer
6b4ddbe946
Fix: admin functions were accessible for regular users
2015-10-13 18:07:17 +02:00
Jan Broer
e21e974457
Add public account registration
2015-10-13 02:30:55 +02:00
Jan Broer
ec7aafe7f0
UI: Details overhaul (buttons, language, tags)
2015-10-13 01:21:46 +02:00
Jan Broer
288b67d862
Show book language
2015-10-13 01:21:22 +02:00
Jan Broer
91c4effcec
Rename "Read online" button
2015-10-12 17:45:45 +02:00
Jan Broer
9db94b04b1
Normal size for shelf button
2015-10-12 17:38:05 +02:00
Jan Broer
13f68935dd
Fixes star rating CSS
2015-10-12 17:31:41 +02:00
Jan Broer
4fcbdfd725
Cleanup old tree
2015-10-12 04:22:35 +02:00
Jan Broer
79e20d13ee
Changed title logo
2015-10-12 04:06:06 +02:00
Jan Broer
af4f7396cd
Fix titles and covers
2015-10-12 04:04:47 +02:00
Jan Broer
2e4117eac2
support for removing books from shelfs
2015-10-12 03:09:56 +02:00
Jan Broer
597c1ef2a8
Make cover images equal size
2015-10-12 00:54:30 +02:00
Jan Broer
43816c8826
Remove stale config variables
2015-10-12 00:41:41 +02:00
Jan Broer
6fadd175ae
Add regex patterns for english sort articles
2015-10-12 00:34:27 +02:00
Jan Broer
3c8685c986
Don't strip html tags for book description
...
Fixes #2
2015-10-11 21:34:04 +02:00
Jan Broer
c92de6e539
Fix filename of book download (was pre- and suffixed with single quotes)
2015-08-06 04:10:47 +02:00
Jan Broer
181a35c7b5
Fix description breakline
2015-08-04 04:44:51 +02:00
Jan Broer
a5fe21c9e0
Add APP_DB_ROOT config variable
2015-08-04 01:44:05 +02:00
Jan Broer
0b5b3b8424
User edit email fix
2015-08-02 21:43:33 +02:00
Jan Broer
aef608aa10
Refactor (settings database, etc...)
2015-08-02 21:23:24 +02:00
Jan Broer
64a9cbce2d
Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/
2015-08-02 20:59:11 +02:00
