Commit Graph

338 Commits

Author SHA1 Message Date
OzzieIsaacs
16cac6ac4f Merge remote-tracking branch 'polish_update/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
2017-03-12 19:12:17 +01:00
林檎
2ef4933f7a Merge branch 'feature/download-suffix-20170309' into travis
# Conflicts:
#	cps/templates/detail.html
2017-03-09 12:38:55 +08:00
林檎
045419e880 Fix #146
For WebUI only
OPDS remains previous behaviour
2017-03-09 12:32:10 +08:00
林檎
a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 2017-03-09 12:19:46 +08:00
林檎
7bae79d826 fix conflict 2017-03-08 23:56:20 +08:00
林檎
8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08: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
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
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
idalin
a6b2977286 add i18n message for getmeta feature. 2017-03-07 09:46:09 +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
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
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
Jack Darlington
d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
2017-02-26 19:49:49 +00: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
OzzieIsaacs
40c6ef3a18 More generic aproach for postion of epub coverfile (#122) 2017-02-24 20:20:41 +01:00
OzzieIsaacs
41a20fe3e1 Added version info of dependencys in about section 2017-02-23 19:58:56 +01:00
idalin
a09a2d9ed0 Merge branch 'master' into prod 2017-02-23 09:31:51 +08:00
Jack Darlington
82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-02-22 22:45:19 +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
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
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
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
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
1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
idalin
bff86f02ca settings for default role of new register user 2017-02-09 13:46:07 +08:00
OzzieIsaacs
ba8e107402 Move vendored css/js to libs folders to fix language stats 2017-02-07 20:33:08 +01:00
janeczku
13919a1d23 Move vendored css/js to libs folders to fix language stats 2017-02-07 19:21:14 +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
OzzieIsaacs
d5a64baf13 Bugfix name to id 2017-02-05 09:44:39 +01:00
OzzieIsaacs
4e73b11735 Fix for simplified chinese language 2017-02-05 08:49:19 +01: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
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
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
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
OzzieIsaacs
93b020b77c Proper handling for non existing covers in calibre database 2017-01-21 17:04:36 +01:00
OzzieIsaacs
afdfb30d80 Update email settings 2017-01-18 19:07:45 +01: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
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
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
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
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
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
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
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
b878651e4e Bugfix epub-Reader 2016-11-13 12:13:32 +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
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
Cervinko Cera
0f8c308973 Fix for deleting kindle mail adresee #54 2016-08-08 21:01:38 +02: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
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
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
janeczku
374cfd866d Disable autocomplete in user edit 2016-06-17 20:01:44 +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
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
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
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
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
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
c6500b7eca Merge remote-tracking branch 'upstream/master' 2016-03-29 13:56:24 +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
Jan Broer
34cd613e29 Fixes broken send-to-kindle 2016-03-27 23:41:55 +02: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
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
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
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
3c8685c986 Don't strip html tags for book description
Fixes #2
2015-10-11 21:34:04 +02:00
Jan Broer
181a35c7b5 Fix description breakline 2015-08-04 04:44:51 +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