d106ada9ed
Changed version
...
Update translation
6 years ago
ed91048a63
Fix for magic link with python 3
6 years ago
e6ff2f1d90
Fix file not found loading-icon.gif
6 years ago
c0d136ccd8
Fix slow loading
6 years ago
a42ebdc096
Fix for #897
6 years ago
c2bfb29726
Add reading direction settings to readcbr page
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
4552208c02
Fix #848
6 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
6 years ago
439ce19b5d
Updated epub.js to v0.3.66
6 years ago
8e8486497f
Restirct a user to a set of tags
6 years ago
a0a15b4598
Fix max authors shown
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
361a1243d7
Improvements #828
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
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
17b7333992
Merge remote-tracking branch 'caliblur/master'
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
6fc4b318e8
cover folders beautified
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
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
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
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
6 years ago
7e9d6a3cf9
Add Dark-Reader
6 years ago
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
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
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
6 years ago
883633a045
Remove beta from caliBlur selection
6 years ago
36030b559c
Choosing Theme is now a global setting
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
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
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
f821580b50
#Fix 745
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
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
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
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
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
c1818e8f36
Fix for #672
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
13883db5a0
Add anchor tags to titles
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
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
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
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
016c7b4b1c
Add ability to store and edit publishers
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
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
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
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
f477d48c7c
More robust handling while checking for new updates
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
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
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
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
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
7917347508
Revert accidently commited change in admin.html ( #580 )
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
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
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
c38f331b6f
Fix for #575
...
Fix no pydrive dependency installed
Fix sending email on python3
6 years ago
5ef70890d9
Search for custom columns implemented #494
...
Search for ratings related to #559
Search description #572
code cosmetics
6 years ago
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
3db682cd15
Merge remote-tracking branch 'del_books/delete-book-formats'
...
# Conflicts:
# cps/helper.py
Implemented delete on gdrive
6 years ago
b0cbd0a37a
Added feature to send emails in a background-task
6 years ago
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
6 years ago
3a9a59b751
Fix #497
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
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
6 years ago
404b29b979
Refactored WSGIServer handling
...
Restart of gevent server now working
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
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
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
7a20c14dea
Integrated caliblur css
7 years ago
671bf5cf8d
Integrated #454 (css is loaded remote)
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
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
0afa7cbafd
duplicate code removed
7 years ago
43eb3b6f9c
button names fixed
7 years ago
ff9ee82451
adding multiple files upload feature
7 years ago
21c2ee4d63
Fix for #443
7 years ago
7371803184
Fix for #444
7 years ago
4346e947e3
Fix for #447
7 years ago
e99e93db1f
#424 , #437 Added "apple-touch-icon" for apple devices
7 years ago
fb41aa8b57
removed debug statement from production
7 years ago
28dac34119
auto select format if only one
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
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
cbb236ba7b
Added visiblilty of shelfs to opds catalog ( #267 )
7 years ago
aee5ca0e06
#396 implemented
7 years ago
f890fc1553
New progress bar
7 years ago
d76f812310
Fixed empty return on getcomic
...
Python 3 compability (the easy way)
7 years ago
5756785073
Error handling rarfiles
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
ba54b9a357
Fix #365
7 years ago
fd39cbaa6f
Fix #363
7 years ago
9182d89128
# Fix 361
7 years ago
5e4c8c6c65
fixed is_authenticated check
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
1ada1704b0
excluded read/unread when exposing the catalog to an anonymous user
7 years ago
d336f9faa6
fixed OPDS templates
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
378a0ca662
Merge remote-tracking branch 'adv/bookmarks'
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
f87800d11c
Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'
7 years ago
abadaa3f1d
Merge remote-tracking branch 'l/master'
7 years ago
af0cefa4ac
Update translations
7 years ago
9086f4e0e7
Added option to upload a new format to a given book
7 years ago
c9f36a4d1a
Merge remote-tracking branch 'adv/bookmarks'
7 years ago
94f8cc247c
Reflect title in the logo
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
c959a1ccc6
Merge remote-tracking branch 'iss/typo'
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
12c98157d5
fix typo:: diffrent -> different
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
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
cf5e2f7cd1
search button is displayed in moon reader ( #283 ), search result is not displayed
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
8171943b8e
Update to ES5 standards
...
Also fix ESLint issues
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
fe52de6b4b
Merge remote-tracking branch 'adv/lighthouse-audit'
7 years ago
cd2e27d7ad
Merge remote-tracking branch 'adv/previous-pagination'
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
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
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
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
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
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
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
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
5985342b79
Bugfix for typeahead in search function and on edit books page
7 years ago
66231c8737
Associate label with correct input ( #228 )
7 years ago
92f634b6a6
Bugfix link admin section
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
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
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
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
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
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.
7 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
7 years ago
7853cb2602
Add TinyMCE to provide rich-text editing for descriptions
7 years ago
7ab8a5877b
read PDF/TXT without temporary files ( #197 )
8 years ago
1366b36c32
Added integer-field to supported custom colums
8 years ago
26f314d371
support int custom fields
8 years ago
2b50dea304
Updated pdf.js to 1.7.225 (Fix #193 )
8 years ago
45eeb6588a
Change Download Style.
8 years ago
ede8ae6742
Fix #182 , #176
8 years ago
cd0d450829
Allow deleting books ( fixes #119 )
8 years ago
7c6d527a55
Code cosmetics
8 years ago
986f40b80a
Code cosmetics
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
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
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
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
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
8 years ago
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
7bae79d826
fix conflict
8 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
8 years ago
edadf84710
Added editing star rating graphically
...
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
8 years ago
a6b2977286
add i18n message for getmeta feature.
8 years ago
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
8 years ago
b6da3c3153
Fix for read/unread for anonymous users
8 years ago
Ozzieisaacs