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
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
0091006aad
Fix #611
...
Fix for #615
6 years ago
0bcb20f674
Fix #604
...
Added missing translation for "select option"
6 years ago
0e1711631c
Fix for #600
...
publisher-info is shown on edit page (#599 )
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
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
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
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
791f4a8078
Fix #455
6 years ago
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
5ec9051f2e
Add charset to opds feed for read books
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
ff1b479188
Added name of book emailed to task list
...
Implemented emailing of books from gdrive (converting not implemented yet)
6 years ago
b0cbd0a37a
Added feature to send emails in a background-task
7 years ago
4d6299f0d5
Improved gdrive error messages ( #554 )
7 years ago
6a76dce870
Fix change user (in case of reboot required)
...
Fix no existing database
Update required version for sqlalchemy
7 years ago
9d161129d9
Fix for #554
7 years ago
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
7 years ago
3a9a59b751
Fix #497
7 years ago
a53b7908f3
Fix #417
7 years ago
aaa706069c
Implemented #417
7 years ago
8896b3c5d2
Requests from #454
7 years ago
6f36eef51d
Fix #544 (missed some config options)
...
Added lxml to stats sceen
7 years ago
f0459d577b
Bugfix #409
7 years ago
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
7 years ago
694620790c
#543
...
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
7 years ago
31b703db62
Delete on gdrive working
...
Moving author on gdrive working
bugfix delete on normal folders
7 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
7 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
7 years ago
404b29b979
Refactored WSGIServer handling
...
Restart of gevent server now working
7 years ago
a298470479
Fix #526 . Books are now initially stored according to their id.
7 years ago
4f1754c1e4
Improved errorhandling during editing of books
7 years ago
fbe2f5384b
Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive
7 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 )
7 years ago
420f685fd9
Added logging information for errors
7 years ago
30d9991daf
Merge remote-tracking branch 'Goodread_fix/patch-test'
7 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
7 years ago
c66bb54478
Fix #534
7 years ago
a06748e348
Update settings.yaml file
7 years ago
7d5302b47f
Fix accidentially deleted gevent ds
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
b2ba8bceb2
tags in detail view are sorted
7 years ago
671bf5cf8d
Integrated #454 (css is loaded remote)
7 years ago
e24f837007
missing file from last commit
7 years ago
6a2449ffaf
Fix for SSL/NonSSL and gevent
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
ee5677f376
Merge remote-tracking branch 'multiload/master'
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
ff9ee82451
adding multiple files upload feature
7 years ago
199b1c4820
Changed gdrive base uri handling ( #431 )
7 years ago
6b4d7674b5
use isinstance instead of type
7 years ago
28dac34119
auto select format if only one
7 years ago
07d6ba094b
Fix for deleting books in shelfs ( #419 )
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
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
b74a075aa6
Added posibility to change settings db via command line for multiple instances ( #247 )
7 years ago
152f7857c9
Fix #397
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
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
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
ad16194798
Error on deleting non existing book fixed ( #382 )
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
af8d908bba
Fix #371 , #372
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
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
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
3c9f8b151d
added check for anonymous session in read_books, otherwise current_user.id is not defined
7 years ago
7ddfa1881b
added FB2 mime type
7 years ago
56c71dd4bf
Disable bookmarking when anonymous users are reading
7 years ago
c56a02bab6
Fix #339
7 years ago
34e9ef35f5
Code cosmetics
7 years ago
fe4d11fea8
Basi comic reader implementation for cbr, cbz, cbt files based on kthoom ( #63 , #126 )
7 years ago
b6b73d39c2
Fix #329
...
Code cosmetics
7 years ago
b6f06658a2
Merge remote-tracking branch 'ipv6/ipv4only'
7 years ago
f87800d11c
Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'
7 years ago
b30a73c505
Merge remote-tracking branch 'adv/def-variables'
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
e806494b54
Ensure variables exist before they're used
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
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
b6b5313f2d
Fix for #315
7 years ago
f860694487
Merge remote-tracking branch 'adv/goodreads-more-by'
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
8e1cfa1cbf
Re-apply `db_filter`
...
Accidentally removed when the language and content filters were moved to `common_filters`.
7 years ago
a8b53ab38a
Merge remote-tracking branch 'adv/common-filters'
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
6b1f3aa531
Merge remote-tracking branch 'adv/cache-buster'
7 years ago
97f573c41a
Set ipv4 address explicitly for docker usage
7 years ago
e3d416db4c
Merge remote-tracking branch 'adv/cover-upload'
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
91cdb5f60f
Merge remote-tracking branch 'Upper_case/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
68e3867af3
fix books with uppercase extension
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
51bc0e82a4
Added series and series_index metadata handler
8 years ago
4bba3558b7
Added tags metadata handler for epubs
8 years ago
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
8 years ago
04b04e200f
Add ability to edit publish date
...
If a date is not set, default to “0101-01-01”
8 years ago
cf7196ae5e
Refactor to remove nested if-statements
8 years ago
a95e6aab6b
Do not attempt to create the YAML file when Google Drive is disabled ( #246 )
8 years ago
cb5f196f4b
Merge remote-tracking branch 'adv/modal-details'
...
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
8 years ago
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
8 years ago
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
8 years ago
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
8 years ago
c9c6529567
Use SECRET_KEY from environment variable ( #232 )
8 years ago
74e93e1cdf
Code cosmetics
8 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
8 years ago
31e0025099
Update Translation
8 years ago
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
8 years ago
d799b859ea
Make changes suggested by codacy
8 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.
8 years ago
93dfb96174
Added Translation of title for read/unread books
8 years ago
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
8 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.
8 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
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
26f314d371
support int custom fields
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
c80e517c28
Delete books prepared for deleting on doogle drive
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
699bd036e8
Code cosmetics
8 years ago
dc45b53b24
code cosmetics
8 years ago
d59be5faf4
Code cosmetics
...
Bugfix upload
8 years ago
7dd70db837
Code cosmetics
8 years ago
7c6d527a55
Code cosmetics
8 years ago
5044b78b08
Code cosmetics
8 years ago
00462237fe
Merge remote-tracking branch 'chinese_translation/master'
8 years ago
78067b87bc
Code cosmetics
8 years ago
395c6679b7
Fix #163
8 years ago
ebb3acecca
Fix Download Bug.
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
0e0e72fb71
Fixes for gevent/gdrive
8 years ago
3916205a95
Gdrive 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
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
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
d7d29827f4
fix behind
8 years ago
a7d361a0ff
merge conflict
8 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
8 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
d7afbdc349
use quote instead of urllib.quote
8 years ago
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
8 years ago
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
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
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
8 years ago
acac0570e5
Merge remote-tracking branch 'use_pip/use-pip'
...
# Conflicts:
# cps.py
# readme.md
# vendor/wand/api.py
# vendor/wand/drawing.py
# vendor/wand/exceptions.py
# vendor/wand/image.py
# vendor/wand/version.py
8 years ago
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
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
53cc84ec18
#fix 148
8 years ago
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
8 years ago
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
8 years ago
e4a27be1a9
Made stream download for normal download as well as odds
8 years ago
e3e26d418d
Finished code to chunk successfully.
8 years ago
10b129cb07
add timestamps
8 years ago
76e8117b0c
initial version
8 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
8 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
8 years ago
OzzieIsaacs