Commit Graph

248 Commits

Author SHA1 Message Date
Jack Darlington b352bbfd14 Fix for gevent as optional 2017-03-16 21:02:49 +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 c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01: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
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
2017-03-05 19:23:49 +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
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
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
2017-03-03 00:03:46 +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
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
2017-02-26 19:49:49 +00:00
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 2017-02-25 09:02:59 +01:00
Jack Darlington 7b709c15c2 GitIgnore update + fixes for initial setup 2017-02-22 22:06:59 +00: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
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 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 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
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 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 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 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 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 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 c33a329f08 Add search for series and languages (#56)
Add database migration for shelf ordering (#73)
2016-12-27 16:07:25 +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 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 59136a9cc2 Linux path problem solved (finally) 2016-08-07 10:32:45 +02:00
janeczku 1e2a6f2ffb Fix session.rollback on admin account creation 2016-04-29 22:54:38 +02:00
Cervinko Cera 3833079973 assign admin all rights in create_admin_user() 2016-04-27 19:50:04 +02:00
Cervinko Cera f66d7ce29b add permission for changing own password 2016-04-27 16:00:58 +02:00
Cervinko Cera c7b7b3866e add user-permission management 2016-04-27 10:35:23 +02:00
JanB df480160da Handle race in database creation when running multiple WSGI instances 2016-04-17 17:30:55 +02:00
Jan Broer 34cd613e29 Fixes broken send-to-kindle 2016-03-27 23:41:55 +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