fffa2d5a1b
Support passing the Auth token as a url param.
...
This is required to support ebook downloads which the Kobo device emits
without any auth headers.
* Also some other small bug fixes discovered during device testing.
5 years ago
0926ae530c
Remove custom_column usages from an earlier commit.
5 years ago
0b709f7dfb
Merge branch 'master' into kobo
5 years ago
b5da2c4199
Clean-up: Fix import order in kobo.py, and other minor formatting
...
changes.
5 years ago
9ede01f130
* Add a UserKeyToken to the User table for Kobo authorization.
...
* Add proper authorization checks on the new Kobo endpoints.
Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
5 years ago
c61463447f
Merge metadata of uploaded book versions.
5 years ago
55b54de6a0
Add simple get_download_url implementation to replace the backblaze-backed implementation
5 years ago
5357867103
Add initial support for Kobo device Sync endpoint.
...
- Supports /v1/library/sync call to get list of books
- Supports /v1/library/metadata call to get metadata for a given book
+ Assumes books are stored on Backblaze for metadata call
- Changes to helper.py so that we can return no cover instead of a blank
image.
5 years ago
222797e631
support douban book search using apikey
5 years ago
92841b46d7
update Simplified Chinese translations.
5 years ago
4c2323fcc9
fix typo in config_edit.html
5 years ago
fda0ab1e86
FIx for ( #1092 listening to mp3 not working)
5 years ago
54079b36ae
Fix #1095 (epub viewer not working if only viewer rule wa sapplied)
5 years ago
f8a99c60d8
Fix for #1096 (exception on digest request)
5 years ago
8af178c19c
Fix for gdrive not working #1081
5 years ago
78f9ee86b1
Fix pdf cover
...
Fix massadding books
Add feature inform of duplicate books
5 years ago
ab5873984e
Merge remote-tracking branch 'translation/patch-3'
5 years ago
62ea8b8913
Logging to stdout, proposal form #1078
5 years ago
a4416c202d
Merge remote-tracking branch 'rename/develop'
5 years ago
1f5edffccf
Fix typo and update translation
5 years ago
651260022c
Merge remote-tracking branch 'search_title/hotfix-searchform-title'
5 years ago
2e4344f7ea
Merge remote-tracking branch 'swedish/master'
5 years ago
3cb7e77b60
Update messages.po
5 years ago
f782dc1857
fix for search title
5 years ago
88f31ddad1
Fix for #1034
5 years ago
a7ab7fcf06
Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page
5 years ago
6f61e80c97
Fix #1074 , #1071
5 years ago
d1afdb4aac
Fix #1074 , #1071
5 years ago
5167ee520e
Solve cropped image pdf import ( #1068 )
5 years ago
f758a1cc64
Solve inverted image pdf import ( #1068 )
5 years ago
2145be6db2
Improvement for #1062
5 years ago
c740fe9124
Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order'
5 years ago
a371e40c66
Merge remote-tracking branch 'github_3/hotfix/epub-import'
...
Improved cover extraction from epub files
5 years ago
ccc6184342
Merge remote-tracking branch 'github_1/patch-1'
5 years ago
c8c2d6659c
Merge remote-tracking branch 'public_reconnect/master'
5 years ago
c7d7a7597c
remove language from array metadata
5 years ago
fbb7663a2f
epub metadata import fix
5 years ago
c93dd32179
Fixed typo and column size for LG screens
5 years ago
7165826011
Adds Authors, Series and Book Cover to the shelf order view
5 years ago
ada727a570
Adds Authors, Series and Book Cover to the shelf order view
5 years ago
01b0f9534c
fix issue #1064
...
Allow for finer steps in serie-index
5 years ago
3764c33a3a
Add the posibility to change the username
5 years ago
9fc02f67c2
Debug output for lcase
5 years ago
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
5 years ago
e31df16309
Revert bug in updater.py preventing new files from being created
5 years ago
d7ea5bb9d7
Fix for #1037
...
Update German translation
5 years ago
6cda5fee0d
Fix language selection on python3
5 years ago
ca5e285c5a
Merge branch 'Develop'
5 years ago
fb0eebfc52
Merge remote-tracking branch 'spanish/master'
5 years ago
dd90fb003e
Merge remote-tracking branch 'french/master'
5 years ago
61cd044255
Merge remote-tracking branch 'polish/master'
5 years ago
879d02081a
Fix #1021
5 years ago
051bc53aa2
Fix for #1009
5 years ago
5515772903
updated spanish translations
5 years ago
ff900fd9c0
updated spanish translations
5 years ago
eec4be7a29
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
1385ecb383
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
74418f3139
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
72def4b97b
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
564c3b4778
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
c9eff4a70c
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
879f63d1c1
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
3fb458dd19
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
d9a73b4fa3
French translation
...
Add and modify some little things
5 years ago
23b3bfd967
Additional fix #1016
5 years ago
f543d7f486
Fix #1016
5 years ago
6a058d2c52
Update polish translation
5 years ago
38a255e069
Add automatic epub to kepub conversion using kepubify
5 years ago
ff41775dbb
Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop
5 years ago
d04a78afe6
Merge remote-tracking branch 'public_shelf/Develop' into Develop
5 years ago
f566237be0
Merge remote-tracking branch 'bootstrap/Develop' into Develop
5 years ago
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
5 years ago
4cbdccd39e
Fix for https://github.com/janeczku/calibre-web/issues/1002
5 years ago
9356148e2d
Added more information about dependencies
5 years ago
4be55285d8
Fix #1001
5 years ago
3eae2e9c2c
Changed text for not found imports
5 years ago
e9fb5d9f25
Bugfix for comicapi
5 years ago
6261981656
Fix for #991
...
Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion
5 years ago
82ca3f31f9
Merge remote-tracking branch 'pwr/master'
5 years ago
97f3aa8325
Update dutch language
5 years ago
7c503b4a31
provide a default logging configuration ( fixes #987 )
5 years ago
9f8cab99e3
Moved language names from iso639.pickle to a python file
5 years ago
5f25b81004
Final fix for #983
5 years ago
73bbffccaa
Fix for login issue on MacOS
5 years ago
f59d9d5aa8
Merge remote-tracking branch 'polish/master'
5 years ago
746b7b1262
Update polish translation
5 years ago
5f228fbb40
Update german translation
5 years ago
12576393cf
Merge remote-tracking branch 'spanish/patch-1'
...
Merge remote-tracking branch 'german/master'
5 years ago
7f43a2e104
Update messages.po
...
update and revision of the Spanish translation file.
5 years ago
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
5 years ago
fc4dc36c65
Fix #969 (duplicate code "init" in epub reader)
...
Fix for #890
5 years ago
97a0dccdec
Fix for display of format, series, category, ratings,
...
Fix for display of language (sorting not working yet)
5 years ago
9f64a96502
Fix for #890
5 years ago
b9c3a3fcea
Fix #652
5 years ago
6d43e0422a
Fix for non found flask_login version ( #968 )
5 years ago
0d7e58ce79
Fix for #968 (database conversion fails for default strings under python2.7)
5 years ago
3e008ef29b
Fix update dates shown in local time format again
...
Fix "to update" history is shown again
5 years ago
5c6be5d6d0
Fix for python 3 and existing unrar entry in db
...
deleted unnecessary lines in config html template
5 years ago
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
5 years ago
c6542fdec6
New Oauth code
5 years ago
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
5 years ago
d168e3bfdb
Add licence to oauth
...
fix comicapi dependency
5 years ago
99c6247baf
use the standard socket library to validate the ip address argument
5 years ago
a334ef28e7
about page: build the versions dictionary only once
5 years ago
63634961d4
cleaner worker api
...
the worker thread now stops on its own
5 years ago
d82289e303
Deactivate ldap
...
Fix setup for pypi
5 years ago
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
5 years ago
8bfcdffeb6
Fix feature support
5 years ago
e411c0fded
Fix logging in debug mode
5 years ago
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
5 years ago
792367e35e
Version update
5 years ago
be64961de5
Code cosmetics comic reader
5 years ago
405a3909b0
Fix for opds with LDAP authentication
5 years ago
b1cb7123a3
Fix for #959
5 years ago
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
5 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
5 years ago
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
5 years ago
ad44e58c7a
Sorting for comics
...
Audiobook support
5 years ago
572b5427c7
Fix Encoding issues for python2
5 years ago
32af660f86
Improvements for logfile viewer
...
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
5 years ago
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
5 years ago
5c7aeb2f2c
Change GDrive
5 years ago
e254565901
support binding the http server to a unix socket file instead of TCP socket
5 years ago
d9f69ca264
Updated Dutch translation
5 years ago
cd546eb6d4
Update comic reader js
5 years ago
f40fc5aa75
Update LDAP
5 years ago
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
5 years ago
d45b1b8ea5
Fix #937
...
logviewerintegrated
Code cosmetics
5 years ago
e67d707867
Fix for #588
...
Merge remote-tracking branch 'linuxserver/master'
5 years ago
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
5 years ago
304db0d20e
Solve typo
5 years ago
3f5c6c1fa5
Fix #937
5 years ago
26949970d8
Revert logging functions
...
Fix access logger for tornado
5 years ago
f5e3ed26b9
Fix for #935
5 years ago
8e4539cf8e
Prevent delete of last admin user
5 years ago
c81d4edb7d
Fix for #923
5 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
6 years ago
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
6 years ago
9a5ab97d78
Merge branch 'master' into master
6 years ago
79286c9384
encode password
6 years ago
c4e3f3670f
Added public /reconnect endpoint
6 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
97d12b94f6
Correct settings update
6 years ago
e4d801bbaf
initial flask_simpleldap implementation
6 years ago
f736a15c12
Fix for restart of newer versions of tornado during update
...
Fix for updater with Beta Versions
6 years ago
a02f949d23
Fix for updater with beta releases
6 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
6 years ago
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
6 years ago
6662a58cb0
Update translationfiles
6 years ago
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
6 years ago
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
6 years ago
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
6 years ago
ecedf92783
Update version
...
Make custom columns visible (#904 )
6 years ago
d106ada9ed
Changed version
...
Update translation
6 years ago
ed91048a63
Fix for magic link with python 3
6 years ago
f70c839014
Added additional permission viewer
6 years ago
e6ff2f1d90
Fix file not found loading-icon.gif
6 years ago
867aa2f0bd
Beautify bitjs
6 years ago
7982ed877c
Downgrade bitjs to es5 branch
6 years ago
0c80f5c63a
Update Teststatus
6 years ago
1030e195a5
Fix #916
6 years ago
c0d136ccd8
Fix slow loading
6 years ago
479b4b7d82
Update translations, integrated update of Italian translation
6 years ago
a42ebdc096
Fix for #897
6 years ago
49ba221e85
Merge remote-tracking branch 'direction'
6 years ago
3b03aa30a6
Fix for advanced search
6 years ago
cb0403a924
Merge remote-tracking branch 'adv_search/master'
6 years ago
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
6 years ago
55bb8d4590
Fix #900
6 years ago
b80bfa5260
Improvement for #897
6 years ago
f941908f73
Workaround for #889
6 years ago
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
6 years ago
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
6 years ago
c2bfb29726
Add reading direction settings to readcbr page
6 years ago
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
6 years ago
8b6d165d64
Fix Japanese translation
6 years ago
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
6 years ago
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
6 years ago
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
f1a65a2aeb
Clarified licences for isolanguages.py and reverseproxy.py
6 years ago
cc5c2c0f65
Update Version info
6 years ago
c748716ad2
Fix for opds feed of unread/read books
6 years ago
544405f5aa
Update search for cyrillic letters #877
6 years ago
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
6 years ago
89516fc2d6
Make PIL optional #885
6 years ago
e1e79a73e8
Fix #884
6 years ago
0b8624b542
Deleted load metadata from douban, as API seems to be shut down ( #858 )
6 years ago
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
6 years ago
05da2ae3c7
Update search for cyrillic letters
6 years ago
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
6 years ago
55bdd13fb1
Fix #877
6 years ago
4552208c02
Fix #848
6 years ago
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
6 years ago
a669eacde9
Merge remote-tracking branch 'proxy/patch-1'
6 years ago
2253708da7
Merge remote-tracking branch 'proxy/patch-1' into Develop
6 years ago
51e591bd25
Added updated translation
6 years ago
5188c62bea
Merge remote-tracking branch 'translation/loc-hu'
6 years ago
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
6 years ago
e754ce313c
Merge remote-tracking branch 'pycountry/pycountry'
6 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
6 years ago
afc79416b2
HU Translation updates
...
Translation of the new untranslated strings
6 years ago
cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
...
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
6 years ago
cbdc9876b2
comicapi dependency now pippable
6 years ago
05d0f12608
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
6 years ago
858c80bb20
'except' style fix
6 years ago
f7e640fd98
support pycountry if iso-639 is not available
6 years ago
439ce19b5d
Updated epub.js to v0.3.66
6 years ago
1c9ff6421d
Fix uploader
6 years ago
4b301a7961
Additional fix for #845 (in case of error)
6 years ago
dc93222579
Update 2 column author list view
6 years ago
6c493df2f5
support issue: #843
6 years ago
772f978b45
Improved code quality
6 years ago
0f1db18eae
Simplified typeahead
6 years ago
6940bb9b88
Code improvement
6 years ago
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
6 years ago
39a3f70084
Fix for slow updater
6 years ago
8923e71220
Remove debug logging
6 years ago
843a93fe28
Updater fix for slow servers
6 years ago
fa36072699
Fix uk translation-file
6 years ago
8ab9365688
Prevent error 500 for cover of not exisiting book
6 years ago
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
6 years ago
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
6 years ago
8e8486497f
Restirct a user to a set of tags
6 years ago
e5593d9a7f
Integrated author in sorting functions
6 years ago
3f2a9c8bae
Code improvement
6 years ago
7c69589c5b
Code cosmetics unrar.js
6 years ago
149e9b4bd4
Code cosmetis unrar
6 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
6 years ago
765b817384
Refactored shelf.py and editbooks.py
6 years ago
baf83b2f5a
Refactored generating download links
6 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
6 years ago
a66873a9e2
Added file formats view
6 years ago
a0a15b4598
Fix max authors shown
6 years ago
4a33278596
Update ratings
6 years ago
6d2270d931
Fixes for Oauth
6 years ago
1db1c2e7df
Enabling LDAP working again
...
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
6 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
6 years ago
76d40411dd
Translation updated
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
6 years ago
6f80a63ca6
Fix for #827
6 years ago
3dfc2f2580
fixing issue #833
6 years ago
5b0a0e2139
Fix #835
6 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
6f0b3bbda0
Fix for #812
6 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
1561a4abdf
Comic improvments
6 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
466af21548
Code Cosmetics
6 years ago
0224d45961
Code cosmetics
6 years ago
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
6269a83c3d
Fix mismerge user logon with python3 in opds feed
6 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
fda977b155
Fix for users with umlauts
6 years ago
68a36597ab
Fix opds login on python3
6 years ago
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
361a1243d7
Improvements #828
6 years ago
246d7673a9
Corrected file header with copyright information
6 years ago
bd7b0175a1
Fix remaining shown by codacy
6 years ago
f5cf62f209
Fix issues shown by codacy
6 years ago
15aa49e163
shorten authors in author / discover / index / search and shelf
6 years ago
3272b4ca1e
configuration field for max_authors
6 years ago
d3ed0317bb
styling and javascript for hiding authors
6 years ago
e5bc1ae020
Add new database field for storing max_authors
6 years ago
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
6 years ago
fad62a0909
translation update
6 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
1de3929988
Unicode
6 years ago
cc3088c52f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
6 years ago
0facb8fffa
Fix #766
6 years ago
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 years ago
38307ececb
Force namespace resolution of imports
...
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
6 years ago
17b7333992
Merge remote-tracking branch 'caliblur/master'
6 years ago
ae279c5123
fixed description read-more button
6 years ago
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
ae7c4908f9
Fix #767
6 years ago
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
9a0e8fefb7
re-add loader code
6 years ago
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
6 years ago
5a863541de
Fix object object
6 years ago
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
7fb9bf8889
Truncate single quote in upload file name
6 years ago
3d5d95904a
Oauth working somehow (?)
6 years ago
a0be02e687
Ldap working
6 years ago
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
6 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 years ago
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
6 years ago
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
c1ef1bcd19
User and admin pages are working again
6 years ago
1fc4bc5204
Fix routes
...
Fix error page
6 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
d58d792f56
Catch Imagemagick policy error
6 years ago
d6ee8f75e9
More refactoring
6 years ago
a00d93a2d9
Working again (basically)
6 years ago
561d40f8ff
Merge branch 'master' into Develop
6 years ago
6fc4b318e8
cover folders beautified
6 years ago
36229076f7
Refactor subprocess calls
6 years ago
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
6 years ago
ea98323c06
Fixes Google Drive
...
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
6 years ago
b75b91606c
Fix config oauth-UI
6 years ago
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
6 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 years ago
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
6 years ago
9128615f48
Fix #424
...
Fix #425
6 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
6 years ago
97064db2a4
Restart python3 fix, stop and restart python2 working again
6 years ago
341dd77b9d
Bugfix Restart and Stop server on python3
6 years ago
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
62574939b2
Fix #770
6 years ago
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49bae55dd6c27
6 years ago
3ba9e4d96e
reader theme
6 years ago
ae55dd6c27
Update caliBlur.min.css
6 years ago
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
6 years ago
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
6 years ago
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
6 years ago
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
6 years ago
6a2ebba85b
Not ready for commit
6 years ago
7e9d6a3cf9
Add Dark-Reader
6 years ago
a69e43922a
Create dark-reader.css
6 years ago
df8806e182
Update caliBlur.min.css
6 years ago
83a905bfe1
Don't remove the dropdown toggle
6 years ago
e01872fc79
Revert "Update caliBlur.min.css"
...
This reverts commit 2b7b55846b
6 years ago
2b7b55846b
Update caliBlur.min.css
6 years ago
c0792b7225
Add .sendtokindle-drop to click-off
6 years ago
8825352af6
Revert "Add sendtokindle-drop to click-off array"
...
This reverts commit d83ba315f0
6 years ago
d83ba315f0
Add sendtokindle-drop to click-off array
6 years ago
16e23cb1fe
Fix upload tooltip not appearing
6 years ago
df2b1ba09d
fix for send button dropdown
6 years ago
9a12e60b1c
Toggle for dropdown
6 years ago
c620453ebf
UL positioning
6 years ago
4988e3b631
add tooltip and move UL higher in DOM
6 years ago
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
6 years ago
9e5fa45df7
Removed unnecessary wait message
6 years ago
d5ff3b6a0b
smtp setup page ( #774 )
...
fix for https://github.com/janeczku/calibre-web/issues/773
6 years ago
cc618ecee7
Fix Limiting domains (related to #773 )
6 years ago
f4977c3767
Merge remote-tracking branch 'theme/master'
6 years ago
a9277da85a
Update ID of button from sendbtn2 to sendbtn
...
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
6 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
d48cdcc789
Correct authentication in case LDAP not activated
6 years ago
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
6 years ago
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
6 years ago
aafb267787
Merge branch 'master' into master
6 years ago
2e37c14d94
Clean some comment
6 years ago
91f0908059
insert into db
...
connect via LDAP config
6 years ago
8d284b151d
Edit html config
6 years ago
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
6 years ago
4ace3a5e27
test
6 years ago
db83fb3bd7
minified
6 years ago
883633a045
Remove beta from caliBlur selection
6 years ago
84fdf9143b
Revert "Update web.py"
...
This reverts commit a388f03b99
6 years ago
7a069ad72e
Revert "Update web.py"
...
This reverts commit 1bcc0698d5
6 years ago
f897491070
Update caliBlur.min.css
6 years ago
f053508013
Fix #764
6 years ago
2ab10bb070
Update caliBlur.js
6 years ago
1bcc0698d5
Update web.py
6 years ago
a388f03b99
Update web.py
6 years ago
9c75eb7016
Update caliBlur.js
6 years ago
6c37aafae9
Update caliBlur.js
6 years ago
550262e651
Further fix
6 years ago
edb4cedc65
Update about page to target new body class
6 years ago
40e45c7272
Add files via upload
6 years ago
7032f311d5
Update caliBlur.js
6 years ago
66fcd71685
Merge remote-tracking branch 'origin/master'
6 years ago
36030b559c
Choosing Theme is now a global setting
6 years ago
30954cc27f
Initial LDAP support
6 years ago
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
6 years ago
d5a913e195
Merge remote-tracking branch 'origin/master'
6 years ago
dba5680121
1.0 for the merge ( #758 )
...
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
6 years ago
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
6 years ago
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
6 years ago
418e98d1f8
update .published-date to .publishing-date ( #756 )
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
fa3426aa08
Merge remote-tracking branch 'origin/master'
6 years ago
eb1c87fbae
Patch 4 ( #752 )
...
* Target new class
Target new class for caliblur language support
* Move publishing date into div
Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.
* Target newly created div
6 years ago
c77825371d
Add classes to shelves for easier css selection ( #751 )
...
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
6 years ago
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
6 years ago
8db2b62b39
Merge remote-tracking branch 'origin/master'
6 years ago
98134616b6
Fix #661 (authors are shown according to the authors sort order)
6 years ago
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
6 years ago
29c9d55498
Remove leading space in span ( #749 )
...
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
6 years ago
ece11de942
Fix publisher not formatting correct ( #747 )
6 years ago
f821580b50
#Fix 745
6 years ago
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
6 years ago
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
6 years ago
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
6 years ago
9cfe1dce20
Fix #739
6 years ago
cb0f3cd074
Fix #696
6 years ago
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
462cf20a34
Process all custom columns on editing
6 years ago
00ba231fbf
fix adding an existing language to a book
6 years ago
677264950d
Merge remote-tracking branch 'ru-translation/master'
6 years ago
e6b1c8cf36
Updated Russian translation
6 years ago
9057a3a0d7
Merge remote-tracking branch 'dutchtranslation/master'
6 years ago
45d97d277a
Update Dutch translation
...
Some lines where still untranslated, fixed it.
6 years ago
81e3afbcc4
Fix #714 (advanced search for ratings)
6 years ago
7526b0dcb4
Fix #623 , #715
6 years ago
64b1b830d6
Fix #712
6 years ago
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
b78130e3b1
Merge remote-tracking branch '681/681-fix'
6 years ago
47424e5c1a
Merge remote-tracking branch 'swedish/master'
...
Improved server stop command
6 years ago
bc0d19f33d
Fix typo
6 years ago
cbc9169973
Update messages.po
6 years ago
e1b6fa25e9
A better solution to #681
6 years ago
dfa17956c9
Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
...
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
a2b612c9ab
Merge remote-tracking branch 'ssl/verify-ssl-paths'
6 years ago
2422f782de
Fix #701
6 years ago
c574b779fb
Added swedish translation
6 years ago
07d7be176c
Merge remote-tracking branch 'lang/master'
6 years ago
c6a5ac7f25
Fix wrong variable usage
6 years ago
af216e3697
Verify if certfile and keyfile are paths to actual files
...
This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.
6 years ago
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
6 years ago
399dffba5a
log file name in case of filename not found ( #691 )
6 years ago
8d6d28eb57
Merge remote-tracking branch 'titlelink/titles-links'
...
Fix for #694
6 years ago
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
38c180a9ea
Update translation files
6 years ago
c05687b896
Fix #668
6 years ago
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
0df35dcfea
Update Updater
6 years ago
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
c1818e8f36
Fix for #672
6 years ago
ee85492c7d
Fix #662
6 years ago
5fc742c9c4
Fix #690
6 years ago
3f83be00fd
Fix #687
6 years ago
6ec9bc9e5c
Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
...
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
e080c74032
Merge remote-tracking branch 'ru-translation/patch-2'
6 years ago
58df19972f
Merge remote-tracking branch 'hungarian/loc-hu'
...
Update spanish language
6 years ago
4b76b8400d
Add OAuth link&unlink in user profile
6 years ago
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
9b4ca22254
Update shelf.html
6 years ago
c6d3613e57
Add UI link button to shelves
6 years ago
1201d4086f
Few termchanges
6 years ago
e0229c917c
Download only shelf
...
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
6 years ago
13883db5a0
Add anchor tags to titles
6 years ago
922e21438c
Minor fix
6 years ago
32366ab1ba
HU translation fixes
6 years ago
62d172f1e0
Delete dummy
6 years ago
67ecc2c088
HU translation
6 years ago
81a3b85c07
Create dummy
6 years ago
c09b7f39a5
spanish translation finished
6 years ago
b32ee84d4f
update Spanish translation (WIP
6 years ago
ee686b5379
Fix for #617
...
Task table: Status column and task messages have been localized
Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
6 years ago
7253f583cf
Fix #650
...
Improved testablility
Added feedback for book_edit -> stay on edit page
6 years ago
54f8680058
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
6 years ago
d8107fb50f
Addressed Codacy trailing space items ... again
6 years ago
46b2c9919a
Fix for #295
...
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
6 years ago
1144d97bc1
Fixed updating new book format to be all caps in database
...
This keeps us inline with calibre's behavior.
6 years ago
5d34fd7fec
Send to Kindle button precheck added
...
Based on existing book formats and which converter (if any) determine if button can be seen.
6 years ago
a798dc94a9
Satisfy "Codacy/PR Quality Review"
6 years ago
60e9d01d27
Beautify http errors
6 years ago
1ac9b3d837
Update OPDS-part to display publishers
6 years ago
6a007ec881
fix indentations
6 years ago
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
1b363ac720
Merged master into 617 - fixed import copy conflict
6 years ago
016c7b4b1c
Add ability to store and edit publishers
6 years ago
5a2ed58d06
Improved message for non configured ebook converter
...
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
6 years ago
ffe3dd3de3
Show version of Werkzeug and Jinja2 in stats page
6 years ago
a7386ecb8b
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
9b1954f2f0
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
c36b1ed58a
Added additional ids and classes for easier testing
6 years ago
cd0fc917d7
Bugfix template rights at creating user
...
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
29efcf8358
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
d2e74a27cd
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
ba7c734657
Fixes from testing:
...
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
6 years ago
cab98a9165
Update translation files
6 years ago
aa5127cd16
Merge remote-tracking branch 'lxml/master'
6 years ago
b841baf714
Comment for adding publishers
6 years ago
522e897fee
Updated Dutch translation to current codebase
...
As requested,
A Dutch update
6 years ago
76e3be58e6
Delete book fixed
...
There was an incorrect parameter.
6 years ago
b4122e9858
Partial fix to #617 . Local status messages now work.
6 years ago
3fa41d0e4a
added formats for upload and conversion
...
added formats for upload and conversion (html, rtf, odt)
6 years ago
be0ddf25e4
Fix for #621 - Login page always in english
6 years ago
80e1a6910d
Fix Updater
6 years ago
b5ef63d327
Removed fixed update Informations
6 years ago
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
6 years ago
36d26f2089
Merge remote-tracking branch '625/625'
...
Update russian translation
6 years ago
03dc179bc3
Fixed Codacy Issues
6 years ago
89c0904ac9
Fix to #625 - Check to see if target book format already exists before executing conversion.
6 years ago
21582f097e
update translation
6 years ago
968cddf2b0
Fix for #620
6 years ago
e08eccba5a
Satisfy "Codacy/PR Quality Review"
6 years ago
50ded1afc1
typo fix
6 years ago
b2b092c190
Bugfix for not displaying information when there is no update available + simplification
6 years ago
f7872aded0
Own function for getting the current commit hash and datetime
6 years ago
cb5adb3a31
Display "what's new" information for newer versions than the current one
6 years ago
01fb8ee681
Fix #609
...
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
6 years ago
9616562a76
Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block)
6 years ago
cfae6e893a
Move update relevant parts to own section
6 years ago
1047859424
Place general information (db location, amount of books...) on top
6 years ago
354eac1512
fix html errors and formating
6 years ago
6e2dbb7cd6
move current commit hash to its own file
6 years ago
f477d48c7c
More robust handling while checking for new updates
6 years ago
bb7d2c6273
Update Language translation table (now including the locale language)
...
Fix #602
Fix for #593
6 years ago
79ee07ea54
Fix for python3 and pickle
6 years ago
ce6cde545b
Update french language
6 years ago
919de60e8d
Final fix #615
6 years ago
a5d15a19de
Update Translation "->'
6 years ago
2de41a5c86
improvement for #615
6 years ago
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
6 years ago
2f1fe60cd6
Merge remote-tracking branch 'chinese_translation/master'
6 years ago
0091006aad
Fix #611
...
Fix for #615
6 years ago
b48de7dc77
Fix for #609
6 years ago
b103ecdb5c
update simplified Chinese
6 years ago
0bcb20f674
Fix #604
...
Added missing translation for "select option"
6 years ago
db9561db89
Show add to shelf button only when there is a result
6 years ago
0e1711631c
Fix for #600
...
publisher-info is shown on edit page (#599 )
6 years ago
3f2d0ea7bb
Fix #601
...
Removed trailing comma on edit page
6 years ago
66824ff4e4
Fix #576
6 years ago
06ffa5e66d
Fix displaying random books with no author entry
...
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
6 years ago
a4190f39de
Fix #577
6 years ago
4dd6c55c38
Fix for #587 (Better handling of errors in sending email)
6 years ago
c3b0492834
Refactored make_mobi and convert_ebook functions
6 years ago
4a95404e17
Merge remote-tracking branch 'Convert_all/ebookconvert-any'
...
# Conflicts:
# cps/web.py
6 years ago
3f35200a0b
Merge remote-tracking branch 'Comic/comic_server'
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive.js
# cps/static/js/io.js
# cps/static/js/kthoom.js
# cps/static/js/unrar.js
# cps/static/js/untar.js
# cps/static/js/unzip.js
# cps/templates/config_edit.html
# cps/templates/detail.html
# cps/templates/readcbr.html
# cps/templates/stats.html
# cps/ub.py
# cps/web.py
# optional-requirements.txt
6 years ago
9c889d1681
Fix #597
...
Updated language files
6 years ago
22ecdfd2bc
Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button
6 years ago
4b006fba99
Re-commit: #584 & #587 Convert any book format to another format
6 years ago
fc78d1ee07
Added exception catching for file format check
6 years ago
4f386c8a00
Updated GUI buttons for ebook-convert feature
6 years ago
3ec000ad85
Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any
6 years ago
a7a91ae54c
Added posibility to upload cover from local drive ( #439 )
...
Updated language files
6 years ago
3a37183e25
Included khmer language
...
Further unified naming
6 years ago
2453786174
Limit registering domains
6 years ago
e160efbdac
Add GUI functions for ebookconvert any format feature
6 years ago
cedc183987
Fix #590 , #589 .
...
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
6 years ago
f6ab724020
Fix generating links on tasks pafge
6 years ago
72fff2a297
Update for running calibre-convert in docker
6 years ago
7917347508
Revert accidently commited change in admin.html ( #580 )
6 years ago
5889535355
Bugfix gdrive download Books
...
Bugfix pagination
Fix Error messages massadd of books to shelf
6 years ago
d414bf3263
Massadd of books to shelfs ( #203 , #404 ) from advanced search
...
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
34abf95fb2
Fix for empty filename during edit
6 years ago
7dac87fa5d
Code cosmetics unrar
6 years ago
d2ea10e90e
Improved OPDS compability ( #579 )
...
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
6 years ago
9ace4d3372
Updated german translation
...
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
6 years ago
273b1c3fa8
Fix calibre-converter/kindlegen handling on windows and python3
6 years ago
cdb1b52652
Bugfix Get gdrive instances ( #554 , #525 )
...
Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442 )
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562 )
Accordion panels in config are now usable on touch devices like iPad (#545 )
Gdrive authenticate button only visible after logged in (#525 )
Fixed misstyping in german translation
6 years ago
f8132f4d02
Fix for #574
6 years ago
bb5d7d7bc0
Fix for #574
6 years ago
c38f331b6f
Fix for #575
...
Fix no pydrive dependency installed
Fix sending email on python3
6 years ago
fac0921acf
Fix in exception of emailing
6 years ago
5ef70890d9
Search for custom columns implemented #494
...
Search for ratings related to #559
Search description #572
code cosmetics
6 years ago
791f4a8078
Fix #455
6 years ago
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
11b798a01c
Fix #571
6 years ago
1e5cb29fc9
#571 (temporary fix)
6 years ago
5ec9051f2e
Add charset to opds feed for read books
6 years ago
fdabb804cf
Call print as a function
6 years ago
3db682cd15
Merge remote-tracking branch 'del_books/delete-book-formats'
...
# Conflicts:
# cps/helper.py
Implemented delete on gdrive
6 years ago
f81fbaf542
Fix #568 (encoding problem in fb2 upload)
6 years ago
82fe282e9b
Converting books from gdrive implemented
6 years ago
ff1b479188
Added name of book emailed to task list
...
Implemented emailing of books from gdrive (converting not implemented yet)
6 years ago
dbf55d6f41
Fix #565
6 years ago
7a38c05f12
Stop e-mail-thread on quit or restart
6 years ago
b0cbd0a37a
Added feature to send emails in a background-task
6 years ago
4d6299f0d5
Improved gdrive error messages ( #554 )
6 years ago
6a76dce870
Fix change user (in case of reboot required)
...
Fix no existing database
Update required version for sqlalchemy
6 years ago
9d161129d9
Fix for #554
6 years ago
f8c9777668
Merge remote-tracking branch 'show_url/url-links'
6 years ago
ab63d08d71
Fix for linux subprocess calibre-convert
6 years ago
b271b5f686
Changed the args to subprocess.Popen to pass args to the command
...
Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command. So when ' --version' was added it was breaking. I changed the format to pass the command and args as a list and it seems to work correctly.
6 years ago
83db0f9ad5
Render 'url:' ID type as a link
...
Calibre allows 'url:' as a kind of book identifier
and shows it in the UI as a link; this change
makes calibre-web do the same.
6 years ago
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
6 years ago
ae0c5d7ec2
Fix for #549
6 years ago
3a9a59b751
Fix #497
6 years ago
a53b7908f3
Fix #417
6 years ago
aaa706069c
Implemented #417
6 years ago
8896b3c5d2
Requests from #454
6 years ago
6f36eef51d
Fix #544 (missed some config options)
...
Added lxml to stats sceen
6 years ago
f0459d577b
Bugfix #409
6 years ago
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
6 years ago
694620790c
#543
...
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
6 years ago
8d406117ce
Fix #432 added more checks for deleting books
6 years ago
eb65647774
Fix #539
...
Update Translations
6 years ago
31b703db62
Delete on gdrive working
...
Moving author on gdrive working
bugfix delete on normal folders
6 years ago
a8040ad3fa
#538 :
...
-Refactoring gdrive and file handling
-Improved error handling for gdrive
-bugfix "gdrive stopping after a while"
- Renaming book title working
- Still Bugs in upload file to gdrive and renaming author
6 years ago
413b10c58e
Bugfix gdrive
...
Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled
6 years ago
404b29b979
Refactored WSGIServer handling
...
Restart of gevent server now working
6 years ago
a298470479
Fix #526 . Books are now initially stored according to their id.
6 years ago
4f1754c1e4
Improved errorhandling during editing of books
6 years ago
fbe2f5384b
Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive
6 years ago
76d8cbdf57
Logging of details for gdrive integration only on debug level
...
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502 , #520 )
6 years ago
420f685fd9
Added logging information for errors
6 years ago
30d9991daf
Merge remote-tracking branch 'Goodread_fix/patch-test'
6 years ago
9ca454730c
Bugfix finding settings.yaml and dgrive_credentials file
6 years ago
7d3fadb685
Improved compability for gevent (version 1.3.x & Windows)
...
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
6 years ago
c66bb54478
Fix #534
6 years ago
a06748e348
Update settings.yaml file
7 years ago
30799996c9
Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test
7 years ago
274d2d9d21
Improve rename logic for directory name collisions.
7 years ago
7d5302b47f
Fix accidentially deleted gevent ds
7 years ago
bf44774f22
Tags in detail view are sorted now
7 years ago
204cd504a9
- Completly new setup of GDrive (every data is taken from client_secret.json file)
...
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
7 years ago
7142836622
Adding exception handling to GoodreadsClient if site is down
7 years ago
43a391d1bd
Redownloaded glyphicon font files #515
7 years ago
513355e2e5
fix #513 OPDS updated date format invalid per Atom specification
...
replace space separating date from time with 'T'
7 years ago
9867959916
Changed calibre to calibre-web
7 years ago
1f9527f0e1
Fix #496
7 years ago
b2ba8bceb2
tags in detail view are sorted
7 years ago
66c1966b44
Update french translation
7 years ago
c27805b4e7
Bugfix Updater python3
...
Bugfix Updater in case of error
7 years ago
7a20c14dea
Integrated caliblur css
7 years ago
671bf5cf8d
Integrated #454 (css is loaded remote)
7 years ago
e24f837007
missing file from last commit
7 years ago
62f7674761
fixed #410 advanced search for publishing date
...
fixed misstyping in italian language
removed next to "me" after login
7 years ago
6a2449ffaf
Fix for SSL/NonSSL and gevent
7 years ago
691a4a88e6
Added support for svg in comics (not working in IE11)
7 years ago
8bfd3c7e4f
Fix #476
7 years ago
97adb36f1b
Bugfix Upload Message
...
Improved errorhandling at import imagemagick
7 years ago
af5a897d1d
Added SSL Options ( #416 )
7 years ago
d01d7b91a8
Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449
7 years ago
f6ece5fe72
Fix for #448
7 years ago
ea6a957c05
Changed mulitple books upload to single button
7 years ago
ee5677f376
Merge remote-tracking branch 'multiload/master'
7 years ago
c6f568534f
fix(template): download book with capital ext by kindle's browser
7 years ago
f019d58b4d
Fix for unicode search ( #426 )
7 years ago
0afa7cbafd
duplicate code removed
7 years ago
78caf3379d
remove unused code
7 years ago
43eb3b6f9c
button names fixed
7 years ago
ff9ee82451
adding multiple files upload feature
7 years ago
ff2d53b998
Integrated japapanese translation.
...
Updated german translation
7 years ago
0b92a718ba
Merge remote-tracking branch 'Translation/master'
7 years ago
51fbb07124
Add japanese translation
7 years ago
21c2ee4d63
Fix for #443
7 years ago
7371803184
Fix for #444
7 years ago
4346e947e3
Fix for #447
7 years ago
199b1c4820
Changed gdrive base uri handling ( #431 )
7 years ago
6b4d7674b5
use isinstance instead of type
7 years ago
e99e93db1f
#424 , #437 Added "apple-touch-icon" for apple devices
7 years ago
8716054dcf
Fix #436
7 years ago
fb41aa8b57
removed debug statement from production
7 years ago
28dac34119
auto select format if only one
7 years ago
2850a84bbc
Fix for deleting books if book path contains no path ( #432 )
7 years ago
07d6ba094b
Fix for deleting books in shelfs ( #419 )
7 years ago
0329306031
Favicon replaced ( #424 ) with hiher resolution
7 years ago
e66068d699
should fix testing error
7 years ago
6b6a457a9d
comic reader updated extentions
7 years ago
9249390043
comic book read file order fixed
7 years ago
03e2a1e73b
Restored click on progressbar
7 years ago
2fe03961bb
-Added a more subtle progress bar which only shows the page number on hover
...
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
7 years ago
4c05b3db67
Present dates for updater in local date format
7 years ago
319077aea9
Import covers from comic files during upload
7 years ago
5809acfa9e
anonymous user now have always the right to read books (as any other user, too)
...
(Fix #287 )
7 years ago
b74a075aa6
Added posibility to change settings db via command line for multiple instances ( #247 )
7 years ago
152f7857c9
Fix #397
7 years ago
4e11272023
Working on IE11
7 years ago
cbb236ba7b
Added visiblilty of shelfs to opds catalog ( #267 )
7 years ago
aee5ca0e06
#396 implemented
7 years ago
f1fac28203
Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)
7 years ago
f890fc1553
New progress bar
7 years ago
b4aede78bc
Fix for the piping problem ( #395 )
7 years ago
03ab03f06e
Code cosmetics
7 years ago
0943d50876
Code cosmetics
...
Bugfix click on progressbar
7 years ago
aae9e285a8
Code cosmetics
7 years ago
d76f812310
Fixed empty return on getcomic
...
Python 3 compability (the easy way)
7 years ago
e7b6963afd
Small improvements for comic reader calls
7 years ago
6ab4ff9a3b
Merge branch 'comic_server' into comic_server
7 years ago
5756785073
Error handling rarfiles
7 years ago
ec12181803
added python3 compatibility for comic reader
7 years ago
9f8cbe8c1f
Merge enhanced UI from ytilis repro
7 years ago
8c573ff6d8
Unrar/tar and unzip on server side
7 years ago
6e714f3f16
Fix #391
7 years ago
211c3b16dd
Fix fror #388
7 years ago
f045c16c4e
Fix #386
7 years ago
01d0083fe6
Fix for #376
7 years ago
b8d45b664a
Typeahead working again
...
Fix for replacing characters in filenames
7 years ago
ad16194798
Error on deleting non existing book fixed ( #382 )
7 years ago
09f86ee8d4
Fix #385
7 years ago
8388df202f
Merge remote-tracking branch 'dutch/dutchupdate'
7 years ago
798cbc7505
Merge remote-tracking branch 'opds/master'
7 years ago
78744b19d8
Fix #377
7 years ago
ba54b9a357
Fix #365
7 years ago
fd39cbaa6f
Fix #363
7 years ago
5b13171060
Updated Dutch translation
7 years ago
af8d908bba
Fix #371 , #372
7 years ago
ae1e7c57d5
Update french translation
7 years ago
f5e1b38e63
French translation correction
7 years ago
b4bd7507b6
Merge branch 'master' of git://github.com/janeczku/calibre-web
7 years ago
674baad49e
lowercasing the input
7 years ago
4a04ec898e
case-insensitive search for non-ASCII - improved
7 years ago
d2ea3a6c19
case-insensitive search for non-ASCII
7 years ago
9182d89128
# Fix 361
7 years ago
5e4c8c6c65
fixed is_authenticated check
7 years ago
8fd67fb1fc
UserBase methods should be properties not classmethods
7 years ago
cc758517e7
updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin
7 years ago
7ade2ecd35
make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing
7 years ago
366bf9739b
Fix for #360 and guest accounts
7 years ago
1eb10be253
Code cosmetics comic reader
7 years ago
90729de87f
Fix #354
...
Fix #355
Fix #353
Fix #352
Fix #351
7 years ago
6855deceef
added corresponding content-type for a downloaded book, otherwise default text/html is used
7 years ago
0f0c6dde09
changed application/xml to application/atom+xml
7 years ago
1ada1704b0
excluded read/unread when exposing the catalog to an anonymous user
7 years ago
3c9f8b151d
added check for anonymous session in read_books, otherwise current_user.id is not defined
7 years ago
d336f9faa6
fixed OPDS templates
7 years ago
7ddfa1881b
added FB2 mime type
7 years ago
70d093b193
unicode gave an NameError with python3
7 years ago
56c71dd4bf
Disable bookmarking when anonymous users are reading
7 years ago
0512e5a940
Fix #342
7 years ago
c56a02bab6
Fix #339
7 years ago
031a175474
Fix Comic reader
7 years ago
442fb23b18
python3 compatibility
7 years ago
2302db4e06
Merge remote-tracking branch 'adv/fix-douban-rating'
7 years ago
299cf82921
Merge remote-tracking branch 'translation/master'
...
# Conflicts:
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
7 years ago
85ec9cba1f
New correction of translation
7 years ago
a6dfcedfdb
Code cosmetics
7 years ago
0405cec4ac
Code cosmetics
...
Bugfix "Error load settings"
7 years ago
378a0ca662
Merge remote-tracking branch 'adv/bookmarks'
7 years ago
2a78a02e0b
Code cosmetics
7 years ago
34e9ef35f5
Code cosmetics
7 years ago
a159bb0b97
Code Csmetics kthoom integration
7 years ago
5b9b36f997
Code cosmetics
7 years ago
85068d75bf
Update comic reader
7 years ago
fe4d11fea8
Basi comic reader implementation for cbr, cbz, cbt files based on kthoom ( #63 , #126 )
7 years ago
4582aebec1
Bugfix gdriveutils
7 years ago
b6b73d39c2
Fix #329
...
Code cosmetics
7 years ago
b6f06658a2
Merge remote-tracking branch 'ipv6/ipv4only'
7 years ago
dfd3b40865
Fix #325
7 years ago
bde92113d4
Bugfix Datepicker
7 years ago
f87800d11c
Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'
7 years ago
7acf4d40a4
Merge remote-tracking branch 'adv/escape-filename'
7 years ago
2ef6dc30bd
Added italian translation
7 years ago
abadaa3f1d
Merge remote-tracking branch 'l/master'
7 years ago
b30a73c505
Merge remote-tracking branch 'adv/def-variables'
7 years ago
af0cefa4ac
Update translations
7 years ago
e26c8a1e46
Merge remote-tracking branch 'd/patch-1'
7 years ago
5e370fb4b3
Merge remote-tracking branch 'y/master'
7 years ago
f147c072c6
French translation
...
Add and correct
7 years ago
c048a96e07
Updated Dutch translations
...
I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)
7 years ago
993c56d021
Fix syntax error
7 years ago
1ce6893fa8
Exception isn't thrown until we call serve_forever, so that must be in the try block
7 years ago
b8b88183c3
Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work
7 years ago
a75c393922
Merge remote-tracking branch 'upstream/master'
7 years ago
29f21b148b
Translate 10-based rating to 5-based
7 years ago
e806494b54
Ensure variables exist before they're used
7 years ago
8937599ba7
Fixed codacy code control
7 years ago
cbf2bb450d
Fixed issue calculating filesize of the uploaded book
7 years ago
be15f3781f
Fixed issue reported by Jkrehm to prevent filesize to fail
7 years ago
3366aae6c7
Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book
...
# Conflicts:
# cps/static/css/style.css
7 years ago
e5b4bed01c
Fixed codacy requirements
7 years ago
9086f4e0e7
Added option to upload a new format to a given book
7 years ago
a4f81dd812
Do not include empty strings in list of bookmarks
7 years ago
c9f36a4d1a
Merge remote-tracking branch 'adv/bookmarks'
7 years ago
94f8cc247c
Reflect title in the logo
7 years ago
b6b5313f2d
Fix for #315
7 years ago
4527693fe3
Move "Show mature content" Checkbox
...
In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges.
7 years ago
b3217496d1
Add progress bar to upload form
7 years ago
81219663fe
Update translation
7 years ago
c959a1ccc6
Merge remote-tracking branch 'iss/typo'
7 years ago
f860694487
Merge remote-tracking branch 'adv/goodreads-more-by'
7 years ago
429f4a11a9
Merge remote-tracking branch 'adv/es5-syntax'
7 years ago
5ee1950828
Merge remote-tracking branch 'adv/sqlalchemy-bool'
7 years ago
58abc1d024
Fuzzy match book titles to eliminate duplicates
...
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
7 years ago
53c687251e
Show "More by" on author page
...
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.
Requires the Goodreads dependency and API information.
7 years ago
6b8de017ab
Use SQLAlchemy boolean
...
Seems to make a difference sometimes.
Ref #300
7 years ago
282837c7c5
Use ES5 syntax
7 years ago
8e1cfa1cbf
Re-apply `db_filter`
...
Accidentally removed when the language and content filters were moved to `common_filters`.
7 years ago
12c98157d5
fix typo:: diffrent -> different
7 years ago
a8b53ab38a
Merge remote-tracking branch 'adv/common-filters'
7 years ago
62f6bb4e64
Remove In author marker on authors page
7 years ago
d5e1dba0fe
Merge remote-tracking branch 'adv/goodreads-more-by'
7 years ago
3213bf50b3
Move common filters into function
...
Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.
7 years ago
374b5f4c6e
Save ePub bookmarks to database
...
Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.
7 years ago
a682c95ec1
Show "More by" on author page
...
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.
Requires the Goodreads dependency and API information.
7 years ago
193605df4a
Fix for #286
7 years ago
cf5e2f7cd1
search button is displayed in moon reader ( #283 ), search result is not displayed
7 years ago
f6425a6569
Merge remote-tracking branch 'adv/cache-buster'
7 years ago
cda733f4a4
Escape special characters in file names
...
Follows Calibre's convention of using underscores as replacements
7 years ago
8cbd6a8431
Do not append query string if file_hash is not found
7 years ago
13c2a53c0f
Fix issues with Windows path separators
7 years ago
6b1f3aa531
Merge remote-tracking branch 'adv/cache-buster'
7 years ago
97f573c41a
Set ipv4 address explicitly for docker usage
7 years ago
bd02c92162
Merge remote-tracking branch 'adv/get-meta-data'
7 years ago
e3d416db4c
Merge remote-tracking branch 'adv/cover-upload'
7 years ago
866f7944eb
Meta data improvements
...
* Add buttons to show/hide results from Douban & Google
* Trigger search with "Enter" key
* Use Underscore.js template instead of build HTML strings in JavaScript
* Keep click event handler in JavaScript instead of using HTML's `onclick`
* Normalize Douban & Google results
* Update cover image & add cover URL to the form input
7 years ago
a1538e12e8
Bugfix typeahead on advanced serach page
7 years ago
de112b0b05
Merge remote-tracking branch 'adv/eslint'
7 years ago
a27848b351
Add static asset cache busting
...
Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee.
Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.
7 years ago
08d0404e9c
Add mature_content property to Anonymous class
7 years ago
8171943b8e
Update to ES5 standards
...
Also fix ESLint issues
7 years ago
91cdb5f60f
Merge remote-tracking branch 'Upper_case/master'
7 years ago
2f7177742d
Update chinese translation
7 years ago
dd6c928e2c
Merge remote-tracking branch 'translation/master'
7 years ago
fb8ce693f3
Bugfix mature content
...
Update german translation
7 years ago
b596734c36
Merge remote-tracking branch 'adv/mature-content'
7 years ago
274d0f6577
update Chinese translations
7 years ago
2b27d6570f
Merge branch 'janeczku-master'
7 years ago
b5cca553b3
update Chinese translations
7 years ago
Michael Shavit