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
9a17a09cc7
Fixed codacy requirements
7 years ago
68e3867af3
fix books with uppercase extension
7 years ago
aa4a5dc3ef
Added option to upload a new format to a given book
7 years ago
6f797ba478
Check if JPEG via response content-type header instead of URL extension
...
That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.
7 years ago
aee8aad976
Add option to hide mature content from some users
...
Uses a configurable list of tags to denote what is mature and hides those books from the user
7 years ago
8f5bc2a484
Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
7 years ago
e948844ea4
Added a 5px separation for all input labels in advanced search to improve readability
7 years ago
1500e0f54f
Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
7 years ago
b6f097f673
Added a 5px separation for all input labels in advanced search to improve readability
7 years ago
5f78ec4e83
Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
7 years ago
6048bf3c79
Added a 5px separation for all input labels in advanced search to improve readability
7 years ago
80c021939e
Merge pull request #6 from Kyosfonica/master
...
Update dev with latests changes from master
7 years ago
51bc0e82a4
Added series and series_index metadata handler
7 years ago
4bba3558b7
Added tags metadata handler for epubs
7 years ago
fe52de6b4b
Merge remote-tracking branch 'adv/lighthouse-audit'
7 years ago
cd2e27d7ad
Merge remote-tracking branch 'adv/previous-pagination'
7 years ago
82165a67a1
Merge remote-tracking branch 'mail/master'
7 years ago
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
7 years ago
4313910ba0
Fix hmac creation in send_test_email function
7 years ago
ec118c2254
Move scripts to bottom of body to prevent execution from delaying DOM rendering
7 years ago
dde4f6afe2
Add missing label
7 years ago
0b47958fad
Add lang attribute to html tag
7 years ago
c86fa268c2
Fix/remove duplicate id's
7 years ago
5162e2eed7
Add img alt attributes
7 years ago
5465b8e8b7
Add "Previous" pagination button
...
I imagine these buttons are still in use when JavaScript is disabled or not loading.
7 years ago
0afc8f94da
Use TinyMCE's API to update the description's content
7 years ago
dd124ab356
Make change requested by Codacy
7 years ago
59afc7eb9f
Make changes requested by Codacy
7 years ago
3258f4fb79
Make changes requested by Codacy
7 years ago
61e0405f75
Move TinyMCE into edit_books.js
7 years ago
5715d27c97
Show localized date over top of date input
...
Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s)
7 years ago
36c2b35588
Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in
7 years ago
cc916a4eb4
Add timestamp to default publishing date
7 years ago
a07798b0db
Standardize indentation
7 years ago
04b04e200f
Add ability to edit publish date
...
If a date is not set, default to “0101-01-01”
7 years ago
cf7196ae5e
Refactor to remove nested if-statements
7 years ago
a95e6aab6b
Do not attempt to create the YAML file when Google Drive is disabled ( #246 )
7 years ago
cb5f196f4b
Merge remote-tracking branch 'adv/modal-details'
...
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
7 years ago
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
7 years ago
df1b503c2d
Update Translation
7 years ago
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
7 years ago
97d577ef2e
Merge remote-tracking branch 'adv/add-to-shelf-ajax'
7 years ago
4311091d7d
Merge remote-tracking branch 'adv/python3-fix'
7 years ago
693c26c2b3
Attach events to button toolbar
...
Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself.
7 years ago
d85e0b96dc
Prevent jQuery from cache busting static assets
...
If the HTML that's returned from the `$.get` request contains a `<script src="..."/>` tag it loads the JavaScript file via ajax, and by default it attaches a timestamp to it to bust cache. That means the file loads every time the modal is opened, and the browser treats it as a new file each time. The result is that code fires multiple times and events listeners are added multiple times.
7 years ago
e1a88aa0ab
Make change requested by Codacy
7 years ago
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
7 years ago
2e8a268dfa
Fix #241 No1
7 years ago
6a9d8efc93
Fixes for #233 (detection of permission errors)
7 years ago
85ce06850c
Fix for Python 3
7 years ago
91ba0f0362
Resolve issues with unicode characters in author's name
...
I've been unable to reproduce the issue on macOS with Python 2.7/3.6 and Fedora with Python 2.7, but if it happens for others, then it's worth the change.
7 years ago
51bd2f89df
Use dot notation
7 years ago
c9c6529567
Use SECRET_KEY from environment variable ( #232 )
7 years ago
5985342b79
Bugfix for typeahead in search function and on edit books page
7 years ago
a8aa1e7623
Merge remote-tracking branch 'button_padding/limit-typeahead-requests'
7 years ago
cfa69ff4f2
Merge remote-tracking branch 'button_padding/smtp-from'
7 years ago
9683d50f36
Send mail from the FROM address instead of the login
...
When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.
7 years ago
f79fb420ba
Removed whitespaces
7 years ago
802eb628c8
Split event listener and selector string
...
Event and selectors appear to have been accidentally combined. The result is that typing in any input triggers a call to the `/get_matching_tags` route. We can probably limit the selector farther to only fire when `#tags` is typed into.
7 years ago
66231c8737
Associate label with correct input ( #228 )
7 years ago
92f634b6a6
Bugfix link admin section
7 years ago
74e93e1cdf
Code cosmetics
7 years ago
1fdb7dc497
Epub Viewer Bugfix Retenia Ipad devices
7 years ago
16ce7799a2
Improvement of margins in epub reader ( fix #210 )
7 years ago
470aea6106
Fix #214
...
Update epub.js lib
7 years ago
979bcdffd4
Bugfix non working download links
...
Bugfix missing divider in detail page
7 years ago
fe68c8a7f8
Add support for displaying author information from Goodreads
...
Requires the "goodread" module (added to optional-requirements.txt) and an API key
Retrieves Goodreads author information and displays their photo and "about" text
7 years ago
31e0025099
Update Translation
7 years ago
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
7 years ago
d799b859ea
Make changes suggested by codacy
7 years ago
649579eccd
Move jquery.form to layout.html
...
This prevents it from getting loaded each time the details are viewed in a modal dialog.
7 years ago
675e8dd5cd
Show book details in modal dialog
...
With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.
7 years ago
93dfb96174
Added Translation of title for read/unread books
7 years ago
f446e29276
Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid
7 years ago
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
7 years ago
aed626b91b
Merge remote-tracking branch 'button_padding/read-unread-counts'
7 years ago
254e1f5262
Merge remote-tracking branch 'button_padding/simplify-read-code'
...
# Conflicts:
# cps/static/css/style.css
7 years ago
15531324ea
Add translation of rich text editor
7 years ago
77c4da0f07
Merge remote-tracking branch 'button_padding/tinymce'
7 years ago
4f08608d75
Move download button to top of detail page ( #174 )
7 years ago
b876a03f26
- Changed link color on download button to white
...
- removed file icons on download button
- removed shadow style on download button
7 years ago
6b71e77436
Merge remote-tracking branch 'Download/feature/download-icon-20170410'
7 years ago
623f5c8ef0
Add "magic link" functionality
...
When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device.
Configuration was added and is disabled by default.
7 years ago
b138c9edd5
Show read/unread counts
8 years ago
7631eea32e
Add sort options when viewing books
...
Default view still shows the most recently added books, but adds ability to sort by newest/oldest books and books sorted alphabetically (ascending & descending).
I did not include translations for the next text, but they are split up for easy translating and are otherwise ready for translating.
8 years ago
5276bda153
Merge remote-tracking branch 'button_padding/pad-buttons'
8 years ago
4fe1536b7e
Simplify the read functionality's code
...
* Use block label to toggle the checkbox
* Submit form when checkbox's value changes (regardless of whether mouse is used or not)
* Remove unused code
8 years ago
d25300a7fb
Add padding to bottom of buttons on shelf page
...
This adds some space between the buttons when viewing them on a mobile device.
8 years ago
752b813119
Added copyright for language names translations
8 years ago
0e8d5f158c
Dutch translation included ( #207 )
8 years ago
7853cb2602
Add TinyMCE to provide rich-text editing for descriptions
8 years ago
4ea9df753e
For failed logins the source ip-adress is logged now ( #201 )
8 years ago
e6c6c26fd1
No error 500 if kindlegen is not excecutable
8 years ago
0a08a07193
Fixed Deleting user
8 years ago
7ab8a5877b
read PDF/TXT without temporary files ( #197 )
8 years ago
1366b36c32
Added integer-field to supported custom colums
8 years ago
3acf80c42b
remove debuggingtool
8 years ago
26f314d371
support int custom fields
8 years ago
5f4d839895
Better output messages for failed kindlegen conversions ( fix #191 )
8 years ago
38fa9ce206
At deleting a book, the book is also deleted from all Shelfs, Download list and read list ( #192 )
8 years ago
2b50dea304
Updated pdf.js to 1.7.225 (Fix #193 )
8 years ago
a73372d71a
Make kindlegen work again
8 years ago
6d597f96e5
Integrate Iso639 language name translations to russian translation
8 years ago
a305b65299
Added Russian translation
8 years ago
b6fccbd486
Added Google Books and Kobo links ( #189 )
...
* Added Google Books and Kobo links
* International link to google
8 years ago
4259aa69df
Get rid of shel=true again
8 years ago
2d918bfb72
Fix for invalid db path
8 years ago
95f22aa4b5
add drop shadow to distinct the fixed area
8 years ago
f6076bc337
media tweak for better download placement
8 years ago
720c07b9ee
remove empty style
8 years ago
45eeb6588a
Change Download Style.
8 years ago
b8fa748c49
Fix #187 on linux
8 years ago
651961ac5e
Fix #187
8 years ago
6f7a240ce2
Ensure file paths in uploads are non-empty, fix #183 ( #184 )
...
* Ensure file paths in uploads are non-empty, fix #183
* Fix AttributeError in process(), handle strings of spaces
8 years ago
ede8ae6742
Fix #182 , #176
8 years ago
c80e517c28
Delete books prepared for deleting on doogle drive
8 years ago
195e581aef
Missing file for deletion of books
8 years ago
7667da6e12
Books now really deleted from hard disk ( #119 )
8 years ago
2b8c29c535
Further fix delete books ( #119 )
8 years ago
9c679c8908
Delete books should now work ( #119 )
8 years ago
cd0d450829
Allow deleting books ( fixes #119 )
8 years ago
daaee5b67e
remove unused variables
8 years ago
b51afe3ead
Code Fix
...
Fix pagination logic.
_ is gettext , use __ as dummy variable instead of _
Need more test.
Test on following
http://localhost:8083/opds/new
http://localhost:8083/opds/new?offset=60
http://localhost:8083/opds/new?offset=120
8 years ago
7a07edaff4
Update polish translation
8 years ago
3c3720aa0f
Update polish translation (POT: 2017-04-11 22:51)
8 years ago
ccf563023b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
8 years ago
622b1435f1
Fix #172
8 years ago
fb43110f1c
Merge remote-tracking branch 'spanish_translation/master'
8 years ago
699bd036e8
Code cosmetics
8 years ago
286196fa1d
Updated spanish translations
8 years ago
dc45b53b24
code cosmetics
8 years ago
8c7a8a954a
Code cosmetics
8 years ago
d59be5faf4
Code cosmetics
...
Bugfix upload
8 years ago
ab534b21c1
Code cosmetics
8 years ago
7dd70db837
Code cosmetics
8 years ago
7c6d527a55
Code cosmetics
8 years ago
66181daf6d
Merge remote-tracking branch 'custom-dbpath'
8 years ago
79d5bab4ba
Code cosmetics
8 years ago
5044b78b08
Code cosmetics
8 years ago
00462237fe
Merge remote-tracking branch 'chinese_translation/master'
8 years ago
986f40b80a
Code cosmetics
8 years ago
78067b87bc
Code cosmetics
8 years ago
395c6679b7
Fix #163
8 years ago
ebb3acecca
Fix Download Bug.
8 years ago
2c173f9848
Read dbpath from $CALIBRE_DBPATH if present
...
This is an exploration in potentially enabling multiple libraries to run using the same engine.
Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues.
Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)
8 years ago
4d8b43bd54
update Simplified Chinese translation
8 years ago
55ee323ca1
Merge remote-tracking branch 'refs/remotes/janeczku/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
8 years ago
cbc807f3ff
Fix #138
8 years ago
60f3fefaec
Added Read/Unread to feed
...
Prevent books from getting multiple times added to shelf
Updated German Translation
8 years ago
33427d7610
Bugfix opds feed for lists
8 years ago
0e0e72fb71
Fixes for gevent/gdrive
8 years ago
9c5fe444e6
POT: 2017-03-12 19:10
8 years ago
3916205a95
Gdrive optional
8 years ago
b352bbfd14
Fix for gevent as optional
8 years ago
06a4af44cc
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
8 years ago
a87fab8774
- Smaller cover picturees on small devices
...
- filename for download with underscore
8 years ago
ff89d9c20d
Merge branch 'master' into develop
8 years ago
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
8 years ago
29462e2278
Fix for updater
8 years ago
7d31abf920
added jquery.form.js to project locally
8 years ago
537977e497
Changed “have read” to checkbox
8 years ago
8f2088a3ea
Updated use google drive checkbox
8 years ago
5a2e77baaf
fix for form input ID
8 years ago
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
8 years ago
b081bc8672
Fix #157
8 years ago
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
8 years ago
2ffa847803
Merge branch 'master' into develop
8 years ago
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
8 years ago
dbf07cb593
Updated translations
8 years ago
Ozzieisaacs