33277 Commits

Author SHA1 Message Date
Kovid Goyal
f0f73830b7 Detect a generic CI server rather than just Travis 2016-07-18 15:59:06 +05:30
Kovid Goyal
bdb2a763d2 Old MOBI Output: Pass through percentage widths on <hr> tags 2016-07-18 11:42:54 +05:30
Kovid Goyal
895ca1c2aa Update IPython code to work with IPython 5 2016-07-18 10:53:12 +05:30
Kovid Goyal
8ab74402a8 ... 2016-07-18 07:53:58 +05:30
Kovid Goyal
c6d62bcd3b ... 2016-07-18 07:53:11 +05:30
Jim Miller
507864f849 Clear search_restriction combobox when 'close VL' button pressed. 2016-07-18 07:26:44 +05:30
Kovid Goyal
7e31bce688 Merge branch 'patch-2' of https://github.com/sornars/calibre 2016-07-18 07:13:49 +05:30
Shivan Sornarajah
f102a946a3 Update financial_times_uk.recipe 2016-07-17 20:16:03 +01:00
Kovid Goyal
03b74d3442 Merge branch 'patch-1' of https://github.com/sornars/calibre 2016-07-17 21:05:13 +05:30
Shivan Sornarajah
b68030f1d7 Update financial_times_us.recipe 2016-07-17 16:30:50 +01:00
Kovid Goyal
9379904f70 Merge branch 'patch-1' of https://github.com/sornars/calibre 2016-07-17 20:09:51 +05:30
Shivan Sornarajah
d606f0f2d4 Update financial_times_uk.recipe
Fixed recipe by removing space.
2016-07-17 15:09:14 +01:00
Kovid Goyal
03332d261f Test importing of QtWin on windows 2016-07-17 15:00:49 +05:30
Kovid Goyal
3ea989387b Dont pass unicode paths to ctypes WinDLL 2016-07-17 10:35:54 +05:30
Kovid Goyal
e867344cf1 Implementing loading of test directories from zip files 2016-07-17 10:34:18 +05:30
Kovid Goyal
cf04fd266d DRYer 2016-07-17 09:55:39 +05:30
Kovid Goyal
15aa19247e Another timeout increase for travis 2016-07-17 09:30:38 +05:30
Kovid Goyal
464979673a E-book viewer: Fix the show metadata button not reading EPUB 3 metadata 2016-07-17 09:26:13 +05:30
Kovid Goyal
428b7a1135 Break out the functionality to read metadata from a lxml tree 2016-07-17 09:17:27 +05:30
Kovid Goyal
010d54aef4 Increase it some more 2016-07-16 01:05:31 +05:30
Kovid Goyal
c4905e4d99 Increase shutdown_timeout for the websocket test server which hopefully fixes the conn reset errors on travis 2016-07-16 00:55:35 +05:30
Kovid Goyal
a9879c63fd News download: Allow controlling which periodicals are automatically sent to a specific email by tag in Preferences->Sharing by email
Code contributed by bubak
2016-07-16 00:26:28 +05:30
Kovid Goyal
440055ad42 Remove unused import 2016-07-16 00:16:16 +05:30
Kovid Goyal
5194086157 ... 2016-07-16 00:09:21 +05:30
Kovid Goyal
c47a8392ae ... 2016-07-16 00:01:00 +05:30
Kovid Goyal
ee5e4580a6 MOBI Output: Fix <hr> not being rendered as full-width in old MOBI files 2016-07-15 19:52:38 +05:30
Kovid Goyal
28c548bccb Another timeout adjustment for travis 2016-07-14 15:35:52 +05:30
Kovid Goyal
1f45bb2502 Merge branch 'master' of https://github.com/cbhaley/calibre 2016-07-14 15:19:12 +05:30
Charles Haley
91bc1d3f37 Same change for custom is_names columns as for the standard authors column: separate by & 2016-07-14 11:41:00 +02:00
Kovid Goyal
4a0d5703c9 CSV Catalog Output: Separate multiple authors with & instead of comma. Fixes problems when the author name contains commas. 2016-07-14 14:46:32 +05:30
Kovid Goyal
e61b0829eb CSV Catalog output: Fix incorrect formatting of is_multiple custom columns. Fixes #1602908 [output catalog of the books problem](https://bugs.launchpad.net/calibre/+bug/1602908)
Merge branch 'master' of https://github.com/cbhaley/calibre
2016-07-14 14:39:14 +05:30
Charles Haley
4b3cc1ed54 Bug #1602908: csv catalog not formatting is_multiple custom columns correctly 2016-07-14 11:01:37 +02:00
Kovid Goyal
4c2fa5e621 Silence incorrect compiler warning 2016-07-14 12:42:25 +05:30
Kovid Goyal
c7f626083d ... 2016-07-14 12:32:55 +05:30
Kovid Goyal
94b0d82029 ... 2016-07-14 09:16:03 +05:30
Kovid Goyal
f623878892 Update Foreign Affairs 2016-07-14 01:40:07 +05:30
Kovid Goyal
4371f8582e Another place that needed fixing for the scroll event phase change in Qt 5.7 2016-07-13 08:48:41 +05:30
Kovid Goyal
57c3a2d6af EPUB 3 metadata: Fix updating metadata in EPUB 3 files not overwriting existing authors. Fixes #1602227 [Polish Epub3 - proliferation of dc:creator, dc:contributor](https://bugs.launchpad.net/calibre/+bug/1602227) 2016-07-12 22:29:02 +05:30
Kovid Goyal
6cd282bced Ignore conn closed/reset errors for all invalid data web socket tests 2016-07-10 20:38:07 +05:30
Kovid Goyal
c78e78a435 Add an entry for the Cybook Muse to to the welcome wizard 2016-07-10 15:21:27 +05:30
Kovid Goyal
f0d003ce30 Fix duplicate detection when adding books not working when the book title has leading or trailing whitespace 2016-07-10 15:14:09 +05:30
Kovid Goyal
bac981756c Update Berlin Policy Journal
Merge branch 'master' of https://github.com/aimylios/calibre
2016-07-10 13:06:10 +05:30
aimylios
0adf19efaa Update Berlin Policy Journal 2016-07-10 09:21:13 +02:00
Kovid Goyal
0fe2fc8db5 Remove unused code 2016-07-10 12:28:15 +05:30
Kovid Goyal
ae1f4dc3bd Fix Russian string incorrectly marked for translation 2016-07-10 09:29:45 +05:30
Kovid Goyal
038747719f Merge branch 'master' of https://github.com/davidfor/calibre 2016-07-09 10:13:28 +05:30
Kovid Goyal
cd917be191 Update Gazet van Antwerpen 2016-07-09 09:59:13 +05:30
Kovid Goyal
85502aa97b Update Hurriyet 2016-07-09 09:57:45 +05:30
David
7dc261d41f Fix some merge problems 2016-07-08 20:14:57 +10:00
David
f508fa69f3 Remove the last sqlite3 reference and fix some cover issues
Had left an easy out to go back to sqlite3, but everything is working.

For the covers, shouldn't be sending one version with current firmware,
and fixed a check that was happening.
2016-07-08 20:01:07 +10:00