Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,578 Commits 4 Branches 386 Tags
Commit Graph

9578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Haley
d4173f1349 Merge from trunk 2010-09-12 22:05:06 +01:00
Charles Haley
8b554ee0cd Fixes for thumbnails. 2010-09-12 22:04:10 +01:00
Kovid Goyal
7dcead6169 ... 2010-09-12 14:58:51 -06:00
Charles Haley
6ca5263d00 Fix typo, add merge is_multiple 2010-09-12 21:36:23 +01:00
Charles Haley
afd1d75e15 Merge from trunk 2010-09-12 21:16:45 +01:00
Charles Haley
db4b8d8216 Fix some inadvertent changes 2010-09-12 21:15:31 +01:00
Charles Haley
0a2f80fdbf Merge from trunk 2010-09-12 21:13:35 +01:00
Kovid Goyal
afe8ab7c9e Fix regression causing content server to prefix tags with their count in /mobile and /opds views 2010-09-12 14:00:14 -06:00
Kovid Goyal
240c9428f5 Revert change to how Metadata.thumbnail is interpreted in library.models 2010-09-12 13:57:42 -06:00
Charles Haley
9defefd7b2 Merge from trunk 2010-09-12 20:55:09 +01:00
Charles Haley
ea3719c773 Content server fixes 2010-09-12 20:52:26 +01:00
Charles Haley
c525112a9d Merge from trunk 2010-09-12 20:37:15 +01:00
Kovid Goyal
b01b603358 json_codec: Handle dictionaries with bytsestring keys/vals as well 2010-09-12 13:28:22 -06:00
Kovid Goyal
db54abd2b6 Various tweaks to the way smart_update works 2010-09-12 12:08:18 -06:00
Charles Haley
7b03e3397d Merge from trunk 2010-09-12 17:11:16 +01:00
Kovid Goyal
1db3f30ec9 Pull from trunk 2010-09-12 09:41:17 -06:00
Kovid Goyal
5ce924d10a Merge warnings indicate ISBN wont be merged 2010-09-12 09:39:57 -06:00
Kovid Goyal
78874a9117 Use the new sorting code in the content server as well. 2010-09-12 09:32:16 -06:00
Starson17
6cc332089a Change Merge and Safe Merge warnings re ISBN 2010-09-12 11:28:24 -04:00
Kovid Goyal
5208e1a713 Further sorting speedup and have GUI use new multisort when resorting. 2010-09-12 08:44:52 -06:00
Charles Haley
5626418d1a Correct regression in device handing -- sorting after sending a book. 2010-09-12 14:51:21 +01:00
Charles Haley
8b09f4c293 Restore the second 'tags' to the tests 2010-09-12 13:42:37 +01:00
Charles Haley
bcd0430791 Starting from Kovid's multisort: 
1) change _map_filtered to an ordered dict to make 'in' operations much faster
2) add a method to field_metadata to return a dict of database fields.
3) fix a couple of places where field_metadata needed to be used.
4) make changes so gui2.library.models.resort uses multisort
 2010-09-12 13:37:28 +01:00
Charles Haley
b99f36a615 Merge from trunk 2010-09-12 10:06:43 +01:00
Kovid Goyal
7382552d18 Much faster sorting code 2010-09-11 19:11:30 -06:00
Charles Haley
ff8b9dfa50 Merge from trunk 2010-09-12 00:48:57 +01:00
Kovid Goyal
a4fe814d52 Pull from trunk 2010-09-11 16:17:22 -06:00
Kovid Goyal
e531b51767 Code organization 2010-09-11 16:16:57 -06:00
Charles Haley
721e61ef2a Clean up tweaks.py formatting (add blank lines) 2010-09-11 21:05:05 +01:00
Charles Haley
6eaa75527b resort maximum_resort_levels tweak implemented 2010-09-11 21:01:26 +01:00
Charles Haley
64f881f3a6 Merge from trunk 2010-09-11 19:19:47 +01:00
Kovid Goyal
1e77e6538f TXT Output: When using preserve spaces, output tab characters as a sequence of four non-breaking spaces as some readers dont handle the \x09 char code. Fix #6770 (Problem converting pmlz to epub). PDF Input: More unicode character matching. 2010-09-11 11:58:32 -06:00
Kovid Goyal
3766f34aab Fix regression in filename shortening that caused loss of filename extension 2010-09-11 11:54:54 -06:00
Kovid Goyal
fc8bcdc6f0 Fix various regressions that could be triggered when using serach restrictions and/or multi-sorts and connecting a device 2010-09-11 11:50:45 -06:00
Charles Haley
a58aa5f0e5 Fix bug reported in forum: http://www.mobileread.com/forums/showthread.php?t=98242 
cache.refresh still used a parameter when calling search that was removed some releases ago.
 2010-09-11 15:37:11 +01:00
John Schember
ef8408869c TXT Output: preserve spaces, handle tab character correct. 	 is reduced to a single space by many renderers. 2010-09-11 09:13:23 -04:00
John Schember
c2b3c445e1 PML Input: Remove emtpy lines. 2010-09-11 09:09:08 -04:00
John Schember
dc7bc5dd5d PML Input: Fix bug #6770, put toc link after header so toc link goes to correct page. 2010-09-11 09:01:34 -04:00
John Schember
96478da323 PLM Input: Fix cleanup code. 2010-09-11 08:48:47 -04:00
Charles Haley
c4071a245d Fix library sorting problem introduced by calling model.refresh() in the device connection sequence. 2010-09-11 13:40:27 +01:00
John Schember
86e68579f3 PDF Input: Fix bug #6734, add additional matching for unicode characters. 2010-09-11 08:39:40 -04:00
John Schember
8b80241676 Sync to trunk. 2010-09-11 07:41:59 -04:00
Kovid Goyal
a3fc9b0a4f Fix #6771 (Search renaming exception) 2010-09-11 04:27:22 -06:00
Kovid Goyal
0364d0d4e2 ... 2010-09-11 04:25:57 -06:00
Charles Haley
ddd67dbd49 Merge from trunk 2010-09-11 09:52:28 +01:00
Charles Haley
f1be85806e Fix #6771 - Search renaming exception. 2010-09-11 09:51:42 +01:00
Charles Haley
e39b514425 Merge from trunk 2010-09-11 09:24:40 +01:00
Charles Haley
afe5546a15 Avoid spurious exceptions when adding None custom metadata 2010-09-11 09:23:03 +01:00
Charles Haley
4f01b09ded Check in the metadata class that custom field names begin with '#' 2010-09-11 09:21:29 +01:00
Kovid Goyal
82c30ec888 Pull from trunk 2010-09-10 20:13:29 -06:00