OzzieIsaacs
82165a67a1
Merge remote-tracking branch 'mail/master'
2017-07-30 06:44:10 +02:00
OzzieIsaacs
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
2017-07-30 06:37:18 +02:00
Mikhail Akushsky
4313910ba0
Fix hmac creation in send_test_email function
2017-07-29 18:06:16 +03:00
Jonathan Rehm
ec118c2254
Move scripts to bottom of body to prevent execution from delaying DOM rendering
2017-07-28 20:07:10 -07:00
Jonathan Rehm
dde4f6afe2
Add missing label
2017-07-28 20:03:43 -07:00
Jonathan Rehm
0b47958fad
Add lang attribute to html tag
2017-07-28 20:03:23 -07:00
Jonathan Rehm
c86fa268c2
Fix/remove duplicate id's
2017-07-28 20:02:53 -07:00
Jonathan Rehm
5162e2eed7
Add img alt attributes
2017-07-28 20:01:31 -07:00
Jonathan Rehm
5465b8e8b7
Add "Previous" pagination button
...
I imagine these buttons are still in use when JavaScript is disabled or not loading.
2017-07-28 07:38:35 -07:00
Jonathan Rehm
0afc8f94da
Use TinyMCE's API to update the description's content
2017-07-25 13:16:12 -07:00
Jonathan Rehm
dd124ab356
Make change requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
59afc7eb9f
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
3258f4fb79
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
61e0405f75
Move TinyMCE into edit_books.js
2017-07-23 13:36:21 -07:00
Jonathan Rehm
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)
2017-07-23 13:36:21 -07:00
Jonathan Rehm
36c2b35588
Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cc916a4eb4
Add timestamp to default publishing date
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a07798b0db
Standardize indentation
2017-07-23 13:35:35 -07:00
Jonathan Rehm
04b04e200f
Add ability to edit publish date
...
If a date is not set, default to “0101-01-01”
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cf7196ae5e
Refactor to remove nested if-statements
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a95e6aab6b
Do not attempt to create the YAML file when Google Drive is disabled ( #246 )
2017-07-23 22:26:43 +02:00
OzzieIsaacs
cb5f196f4b
Merge remote-tracking branch 'adv/modal-details'
...
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
2017-07-23 14:03:02 +02:00
OzzieIsaacs
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
2017-07-23 13:36:50 +02:00
OzzieIsaacs
df1b503c2d
Update Translation
2017-07-23 13:25:54 +02:00
OzzieIsaacs
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
2017-07-23 13:18:24 +02:00
OzzieIsaacs
97d577ef2e
Merge remote-tracking branch 'adv/add-to-shelf-ajax'
2017-07-23 13:16:20 +02:00
OzzieIsaacs
4311091d7d
Merge remote-tracking branch 'adv/python3-fix'
2017-07-23 13:11:37 +02:00
Jonathan Rehm
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.
2017-07-22 11:24:47 -07:00
Jonathan Rehm
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.
2017-07-22 11:11:14 -07:00
Jonathan Rehm
e1a88aa0ab
Make change requested by Codacy
2017-07-22 07:34:38 -07:00
Jonathan Rehm
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
2017-07-21 21:15:03 -07:00
Ozzie Isaacs
2e8a268dfa
Fix #241 No1
2017-07-18 20:39:35 +02:00
OzzieIsaacs
6a9d8efc93
Fixes for #233 (detection of permission errors)
2017-07-16 22:04:40 +02:00
Jonathan Rehm
85ce06850c
Fix for Python 3
2017-07-13 21:28:00 -07:00
Jonathan Rehm
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.
2017-07-13 21:22:34 -07:00
Jonathan Rehm
51bd2f89df
Use dot notation
2017-07-13 18:09:33 -07:00
Jonathan Rehm
c9c6529567
Use SECRET_KEY from environment variable ( #232 )
2017-07-11 18:35:55 +02:00
OzzieIsaacs
5985342b79
Bugfix for typeahead in search function and on edit books page
2017-07-11 18:08:12 +02:00
OzzieIsaacs
a8aa1e7623
Merge remote-tracking branch 'button_padding/limit-typeahead-requests'
2017-07-11 17:48:33 +02:00
OzzieIsaacs
cfa69ff4f2
Merge remote-tracking branch 'button_padding/smtp-from'
2017-07-11 17:38:52 +02:00
Jonathan Rehm
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.
2017-07-11 07:16:19 -07:00
Ozzie Isaacs
f79fb420ba
Removed whitespaces
2017-07-11 16:13:33 +02:00
Jonathan Rehm
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.
2017-07-10 13:03:58 -07:00
Jonathan Rehm
66231c8737
Associate label with correct input ( #228 )
2017-07-10 19:26:57 +02:00
Ozzie Isaacs
92f634b6a6
Bugfix link admin section
2017-07-10 12:04:15 +02:00
OzzieIsaacs
74e93e1cdf
Code cosmetics
2017-07-09 20:15:15 +02:00
OzzieIsaacs
1fdb7dc497
Epub Viewer Bugfix Retenia Ipad devices
2017-07-09 16:28:22 +02:00
OzzieIsaacs
16ce7799a2
Improvement of margins in epub reader ( fix #210 )
2017-07-09 15:49:47 +02:00
OzzieIsaacs
470aea6106
Fix #214
...
Update epub.js lib
2017-07-09 13:27:56 +02:00
OzzieIsaacs
979bcdffd4
Bugfix non working download links
...
Bugfix missing divider in detail page
2017-07-09 12:41:09 +02:00
Jonathan Rehm
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
2017-07-08 16:07:45 -07:00
OzzieIsaacs
31e0025099
Update Translation
2017-07-08 19:50:44 +02:00
OzzieIsaacs
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
2017-07-08 19:26:08 +02:00
Jonathan Rehm
d799b859ea
Make changes suggested by codacy
2017-07-08 09:15:40 -07:00
Jonathan Rehm
649579eccd
Move jquery.form to layout.html
...
This prevents it from getting loaded each time the details are viewed in a modal dialog.
2017-07-08 09:15:40 -07:00
Jonathan Rehm
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.
2017-07-08 09:15:40 -07:00
OzzieIsaacs
93dfb96174
Added Translation of title for read/unread books
2017-07-08 16:47:07 +02:00
OzzieIsaacs
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
2017-07-08 14:57:39 +02:00
OzzieIsaacs
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
2017-07-08 13:50:21 +02:00
OzzieIsaacs
aed626b91b
Merge remote-tracking branch 'button_padding/read-unread-counts'
2017-07-08 11:26:07 +02:00
OzzieIsaacs
254e1f5262
Merge remote-tracking branch 'button_padding/simplify-read-code'
...
# Conflicts:
# cps/static/css/style.css
2017-07-08 11:25:20 +02:00
OzzieIsaacs
15531324ea
Add translation of rich text editor
2017-07-08 11:19:36 +02:00
OzzieIsaacs
77c4da0f07
Merge remote-tracking branch 'button_padding/tinymce'
2017-07-08 11:03:21 +02:00
OzzieIsaacs
4f08608d75
Move download button to top of detail page ( #174 )
2017-07-08 11:01:40 +02:00
OzzieIsaacs
b876a03f26
- Changed link color on download button to white
...
- removed file icons on download button
- removed shadow style on download button
2017-07-08 10:57:40 +02:00
OzzieIsaacs
6b71e77436
Merge remote-tracking branch 'Download/feature/download-icon-20170410'
2017-07-08 09:35:09 +02:00
Jonathan Rehm
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.
2017-07-07 18:29:16 -07:00
Jonathan Rehm
b138c9edd5
Show read/unread counts
2017-07-06 22:33:57 -07:00
Jonathan Rehm
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.
2017-07-06 21:14:45 -07:00
OzzieIsaacs
5276bda153
Merge remote-tracking branch 'button_padding/pad-buttons'
2017-07-06 20:31:25 +02:00
Jonathan Rehm
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
2017-07-06 10:33:47 -07:00
Jonathan Rehm
d25300a7fb
Add padding to bottom of buttons on shelf page
...
This adds some space between the buttons when viewing them on a mobile device.
2017-07-06 07:44:28 -07:00
OzzieIsaacs
752b813119
Added copyright for language names translations
2017-06-24 13:08:57 +02:00
OzzieIsaacs
0e8d5f158c
Dutch translation included ( #207 )
2017-06-24 13:04:09 +02:00
Jonathan Rehm
7853cb2602
Add TinyMCE to provide rich-text editing for descriptions
2017-06-22 08:59:28 -07:00
OzzieIsaacs
4ea9df753e
For failed logins the source ip-adress is logged now ( #201 )
2017-06-07 18:08:15 +02:00
OzzieIsaacs
e6c6c26fd1
No error 500 if kindlegen is not excecutable
2017-05-25 09:30:20 +02:00
OzzieIsaacs
0a08a07193
Fixed Deleting user
2017-05-25 09:09:35 +02:00
OzzieIsaacs
7ab8a5877b
read PDF/TXT without temporary files ( #197 )
2017-05-25 08:46:33 +02:00
OzzieIsaacs
1366b36c32
Added integer-field to supported custom colums
2017-05-25 08:20:19 +02:00
nanu-c
3acf80c42b
remove debuggingtool
2017-05-22 23:06:55 +02:00
nanu-c
26f314d371
support int custom fields
2017-05-22 22:54:53 +02:00
OzzieIsaacs
5f4d839895
Better output messages for failed kindlegen conversions ( fix #191 )
2017-05-19 21:30:39 +02:00
OzzieIsaacs
38fa9ce206
At deleting a book, the book is also deleted from all Shelfs, Download list and read list ( #192 )
2017-05-19 20:36:58 +02:00
OzzieIsaacs
2b50dea304
Updated pdf.js to 1.7.225 (Fix #193 )
2017-05-13 14:01:52 +02:00
OzzieIsaacs
a73372d71a
Make kindlegen work again
2017-05-05 21:05:52 +02:00
OzzieIsaacs
6d597f96e5
Integrate Iso639 language name translations to russian translation
2017-05-01 16:24:20 +02:00
Pavel Korovin
a305b65299
Added Russian translation
2017-04-30 22:54:16 +03:00
Murat L
b6fccbd486
Added Google Books and Kobo links ( #189 )
...
* Added Google Books and Kobo links
* International link to google
2017-04-27 14:32:30 +01:00
Ozzie Isaacs
4259aa69df
Get rid of shel=true again
2017-04-26 19:39:45 +01:00
Ozzie Isaacs
2d918bfb72
Fix for invalid db path
2017-04-26 19:21:40 +01:00
林檎
95f22aa4b5
add drop shadow to distinct the fixed area
2017-04-26 17:14:18 +08:00
林檎
f6076bc337
media tweak for better download placement
2017-04-26 17:14:18 +08:00
林檎
720c07b9ee
remove empty style
2017-04-26 17:14:18 +08:00
林檎
45eeb6588a
Change Download Style.
2017-04-26 17:14:18 +08:00
Ozzie Isaacs
b8fa748c49
Fix #187 on linux
2017-04-25 22:04:08 +01:00
Ozzie Isaacs
651961ac5e
Fix #187
2017-04-25 20:07:54 +01:00
Matt Hazinski
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
2017-04-23 07:22:10 +01:00
Ozzie Isaacs
ede8ae6742
Fix #182 , #176
2017-04-21 20:44:17 +02:00
OzzieIsaacs
c80e517c28
Delete books prepared for deleting on doogle drive
2017-04-15 18:24:48 +02:00
OzzieIsaacs
195e581aef
Missing file for deletion of books
2017-04-15 18:18:33 +02:00
OzzieIsaacs
7667da6e12
Books now really deleted from hard disk ( #119 )
2017-04-15 18:18:08 +02:00
OzzieIsaacs
2b8c29c535
Further fix delete books ( #119 )
2017-04-15 18:07:53 +02:00
OzzieIsaacs
9c679c8908
Delete books should now work ( #119 )
2017-04-15 11:35:05 +02:00
OzzieIsaacs
cd0d450829
Allow deleting books ( fixes #119 )
2017-04-14 20:29:11 +02:00
OzzieIsaacs
daaee5b67e
remove unused variables
2017-04-14 19:16:39 +02:00
林檎
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
2017-04-14 21:57:27 +08:00
OzzieIsaacs
7a07edaff4
Update polish translation
2017-04-14 09:42:15 +02:00
Radosław Kierznowski
3c3720aa0f
Update polish translation (POT: 2017-04-11 22:51)
2017-04-12 14:27:57 +02:00
Radosław Kierznowski
ccf563023b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
2017-04-12 14:00:30 +02:00
林檎
622b1435f1
Fix #172
2017-04-06 22:50:05 +08:00
OzzieIsaacs
fb43110f1c
Merge remote-tracking branch 'spanish_translation/master'
2017-04-04 19:07:20 +02:00
OzzieIsaacs
699bd036e8
Code cosmetics
2017-04-04 19:05:09 +02:00
Gonzalo Cao Cabeza de Vaca
286196fa1d
Updated spanish translations
2017-04-04 15:10:54 +02:00
OzzieIsaacs
dc45b53b24
code cosmetics
2017-04-03 21:05:28 +02:00
OzzieIsaacs
8c7a8a954a
Code cosmetics
2017-04-03 20:05:55 +02:00
OzzieIsaacs
d59be5faf4
Code cosmetics
...
Bugfix upload
2017-04-03 19:57:45 +02:00
OzzieIsaacs
ab534b21c1
Code cosmetics
2017-04-02 10:42:33 +02:00
OzzieIsaacs
7dd70db837
Code cosmetics
2017-04-02 10:27:37 +02:00
OzzieIsaacs
7c6d527a55
Code cosmetics
2017-04-02 10:05:07 +02:00
OzzieIsaacs
66181daf6d
Merge remote-tracking branch 'custom-dbpath'
2017-04-02 08:45:47 +02:00
OzzieIsaacs
79d5bab4ba
Code cosmetics
2017-03-31 18:41:05 +02:00
OzzieIsaacs
5044b78b08
Code cosmetics
2017-03-31 18:31:16 +02:00
OzzieIsaacs
00462237fe
Merge remote-tracking branch 'chinese_translation/master'
2017-03-31 16:52:25 +02:00
OzzieIsaacs
986f40b80a
Code cosmetics
2017-03-30 21:17:18 +02:00
OzzieIsaacs
78067b87bc
Code cosmetics
2017-03-29 21:43:55 +02:00
OzzieIsaacs
395c6679b7
Fix #163
2017-03-29 20:59:37 +02:00
林檎
ebb3acecca
Fix Download Bug.
2017-03-29 12:59:20 +08:00
Ivan Smirnov
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)
2017-03-25 13:05:44 -07:00
idalin
4d8b43bd54
update Simplified Chinese translation
2017-03-21 10:16:40 +08:00
Radosław Kierznowski
55ee323ca1
Merge remote-tracking branch 'refs/remotes/janeczku/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-03-20 22:01:25 +01:00
OzzieIsaacs
cbc807f3ff
Fix #138
2017-03-19 20:29:35 +01:00
OzzieIsaacs
60f3fefaec
Added Read/Unread to feed
...
Prevent books from getting multiple times added to shelf
Updated German Translation
2017-03-19 19:22:45 +01:00
OzzieIsaacs
33427d7610
Bugfix opds feed for lists
2017-03-19 17:32:49 +01:00
OzzieIsaacs
0e0e72fb71
Fixes for gevent/gdrive
2017-03-19 17:14:16 +01:00
Radosław Kierznowski
9c5fe444e6
POT: 2017-03-12 19:10
2017-03-19 16:35:37 +01:00
Jack Darlington
3916205a95
Gdrive optional
2017-03-16 23:36:37 +00:00
Jack Darlington
b352bbfd14
Fix for gevent as optional
2017-03-16 21:02:49 +00:00
Jack Darlington
06a4af44cc
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
2017-03-16 21:02:11 +00:00
OzzieIsaacs
a87fab8774
- Smaller cover picturees on small devices
...
- filename for download with underscore
2017-03-14 19:48:17 +01:00
Jack Darlington
ff89d9c20d
Merge branch 'master' into develop
2017-03-13 14:56:51 +00:00
Kennyl
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
2017-03-13 15:52:08 +08:00
Jack Darlington
29462e2278
Fix for updater
2017-03-13 00:44:20 +00:00
Jack Darlington
7d31abf920
added jquery.form.js to project locally
2017-03-12 21:20:09 +00:00
Jack Darlington
537977e497
Changed “have read” to checkbox
2017-03-12 21:13:14 +00:00
Jack Darlington
8f2088a3ea
Updated use google drive checkbox
2017-03-12 21:03:01 +00:00
Jack Darlington
5a2e77baaf
fix for form input ID
2017-03-12 20:52:56 +00:00
OzzieIsaacs
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
2017-03-12 21:13:25 +01:00
OzzieIsaacs
b081bc8672
Fix #157
2017-03-12 20:01:20 +01:00
OzzieIsaacs
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
2017-03-12 19:12:17 +01:00
Jack Darlington
2ffa847803
Merge branch 'master' into develop
2017-03-12 12:37:38 +00:00
Jack Darlington
dad251d02c
Fix for revoking already expired channel (drive)
2017-03-12 00:24:53 +00:00
Radosław Kierznowski
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
2017-03-11 15:35:38 +01:00
OzzieIsaacs
dbf07cb593
Updated translations
2017-03-11 09:11:19 +01:00
林檎
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
2017-03-09 12:38:55 +08:00
林檎
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
2017-03-09 12:32:10 +08:00
林檎
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
2017-03-09 12:19:46 +08:00
林檎
d7d29827f4
fix behind
2017-03-08 23:59:56 +08:00
林檎
7bae79d826
fix conflict
2017-03-08 23:56:20 +08:00
林檎
a7d361a0ff
merge conflict
2017-03-08 23:52:41 +08:00
林檎
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
2017-03-08 23:50:14 +08:00
林檎
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08:00
林檎
d7afbdc349
use quote instead of urllib.quote
2017-03-08 13:26:52 +08:00
林檎
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
2017-03-08 11:48:12 +08:00
Jack Darlington
e3a2bd348c
Merge branch 'develop' into personal
2017-03-08 00:30:00 +00:00
Jack Darlington
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
2017-03-08 00:26:15 +00:00
Jack Darlington
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
2017-03-07 22:05:56 +00:00
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
a752e62963
Fix Import problem on python2
2017-03-07 21:08:28 +01:00
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
2017-03-07 20:36:43 +01:00
OzzieIsaacs
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
2017-03-07 20:30:55 +01:00
OzzieIsaacs
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
2017-03-07 20:22:28 +01:00
OzzieIsaacs
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
2017-03-07 19:46:23 +01:00
OzzieIsaacs
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
2017-03-07 19:15:40 +01:00
OzzieIsaacs
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)
2017-03-07 19:10:17 +01:00
林檎
53cc84ec18
#fix 148
2017-03-07 16:32:55 +08:00
Kennyl
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
2017-03-07 14:06:29 +08:00
林檎
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
2017-03-07 13:33:27 +08:00
idalin
bdf28e1475
fix bug for metadata searching result.
2017-03-07 09:49:59 +08:00
idalin
a6b2977286
add i18n message for getmeta feature.
2017-03-07 09:46:09 +08:00
idalin
f8e4bed8bf
Merge branch 'janeczku-master'
2017-03-07 09:01:56 +08:00
Jack Darlington
a1cb349fda
Merge branch 'develop' into personal
2017-03-06 23:18:29 +00:00
Jack Darlington
e4a27be1a9
Made stream download for normal download as well as odds
2017-03-06 23:17:57 +00:00
Jack Darlington
e3e26d418d
Finished code to chunk successfully.
2017-03-06 22:50:24 +00:00
Jack Darlington
10b129cb07
add timestamps
2017-03-06 21:05:21 +00:00
Jack Darlington
76e8117b0c
initial version
2017-03-06 20:58:15 +00:00
Jack Darlington
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
2017-03-06 19:24:24 +00:00
Jack Darlington
475daaec75
Merge branch 'develop' into personal
2017-03-06 19:23:36 +00:00
Jack Darlington
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
2017-03-06 19:17:00 +00:00
OzzieIsaacs
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
2017-03-06 19:25:49 +01:00
OzzieIsaacs
e0c35b7420
Merge remote-tracking branch 'polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-03-06 19:21:17 +01:00
OzzieIsaacs
26438f97ab
Bugfix Filename without unidecode dependency
2017-03-06 19:19:14 +01:00
林檎
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
2017-03-06 20:06:00 +08:00
林檎
297a08cd5f
xrange fix
...
range to xrange
2017-03-06 19:47:58 +08:00
林檎
dc985e76df
python3 fix
2017-03-06 18:23:33 +08:00
林檎
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-06 18:22:02 +08:00
林檎
0c9eacb024
fix opds
2017-03-06 16:35:00 +08:00
林檎
376eb8752e
wrong conflict merge
2017-03-06 14:46:44 +08:00
林檎
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
2017-03-06 14:27:18 +08:00
林檎
4dfa157161
use condition rather than try/catch
2017-03-06 13:42:00 +08:00
