10019 Commits

Author SHA1 Message Date
Charles Haley
4b92c7d68b Don't put '' values into __unicode__ and to_html 2010-09-24 18:17:15 +01:00
Kovid Goyal
1d01a6a5f5 ... 2010-09-24 11:08:34 -06:00
Kovid Goyal
fb06e4c72e ... 2010-09-24 11:04:18 -06:00
Charles Haley
f782ef0cb6 Make format_field return '' instead of None when the value really is '' 2010-09-24 17:56:27 +01:00
Kovid Goyal
7d9ca9dda7 ... 2010-09-24 10:40:53 -06:00
Kovid Goyal
843e7f53ba ... 2010-09-24 10:30:17 -06:00
Charles Haley
a11ccd8598 Added 'contains' function to templates 2010-09-24 17:20:26 +01:00
Kovid Goyal
ead7f2266c Pull from trunk 2010-09-24 10:08:02 -06:00
Kovid Goyal
993983a707 Oops. Restore removed call to commit in set_path and have set_path call dirtied. Also limit the rate of metadata backups 2010-09-24 10:05:54 -06:00
Kovid Goyal
45ed048612 Fix #6930 (Updated recipe for Danas) 2010-09-24 09:59:46 -06:00
Charles Haley
ce1f323df5 Merge from trunk 2010-09-24 16:58:04 +01:00
Kovid Goyal
0acfe17e53 Allow device drivers to specify which fields should be editable 2010-09-24 09:54:42 -06:00
Kovid Goyal
db5ba4113f Add tweaks to control which custom columns the content server displays. Various bug fixes. More template language documentation 2010-09-24 09:38:38 -06:00
Charles Haley
c67a9d8487 Changes to device editable columns to give fine-grain control over what columns can be edited. 2010-09-24 16:38:11 +01:00
Kovid Goyal
41ebe2bd14 calibredb now does a backup of changed metadata 2010-09-24 09:00:46 -06:00
Kovid Goyal
60e7729906 Don't put duplicates in dirtied_queue 2010-09-24 08:33:42 -06:00
Charles Haley
02e9160f37 Fix typo 2010-09-24 15:23:35 +01:00
Charles Haley
93c8836cb6 Changes to template faq 2010-09-24 15:18:03 +01:00
Charles Haley
211bb81113 Put back the sanitize after split on slashes. 2010-09-24 14:43:07 +01:00
Charles Haley
25905a349c Test the 'test' function. Add 're' function and test it. 2010-09-24 13:20:26 +01:00
Charles Haley
5297562383 Refactor code to clean interfaces and remove overly complex loop in bulk edit 2010-09-24 12:57:49 +01:00
Charles Haley
b2a6ed3af4 1) fix bulk edit to not display a tab if library has only composite columns
2) fix a reference to get_custom_field_metadata that I somehow missed.
2010-09-24 12:43:54 +01:00
Charles Haley
ad69ef985a Add a 'test' function to templates. Analogous to lookup, but inserts plain text instead of a template. 2010-09-24 12:27:39 +01:00
Charles Haley
67c7555fd0 Fix content server gui.js bug where it put '...' on the end of a list even if the list was exactly the right size. 2010-09-24 11:36:26 +01:00
Charles Haley
8b9b64a8e6 1) add two tweaks controlling what custom fields the content server displays
2) add & cleanup some field_metadata methods
2010-09-24 11:34:52 +01:00
Charles Haley
97e2c838d0 1) Fix of json codec.
2) make dump_metadata set get_cover=False
2010-09-24 10:50:50 +01:00
Charles Haley
12768864a5 1) fix exception in set_metadata related to composite custom columns
2) make ondevice work with add_books_from_device
2010-09-24 08:54:06 +01:00
Charles Haley
992e5c3c08 Repair damage during conflict resolution 2010-09-24 08:21:10 +01:00
Charles Haley
197e16e62a Merge from trunk 2010-09-24 08:18:20 +01:00
Kovid Goyal
87d70304bd Make metadata backup a little more robust 2010-09-24 00:05:11 -06:00
Kovid Goyal
703ea3c778 propert indentation in generated OPF files 2010-09-23 23:55:56 -06:00
Kovid Goyal
f46d919c75 Add thread to GUI for distributed metadata backup 2010-09-23 23:50:22 -06:00
Kovid Goyal
1ad0eebd56 API for dealing with distributed metadata backup 2010-09-23 23:30:16 -06:00
Kovid Goyal
552c20134c Launchpad automatic translations update. 2010-09-24 04:40:30 +00:00
Kovid Goyal
c792c47a65 ... 2010-09-23 21:51:57 -06:00
Kovid Goyal
91313ff3a7 Make templating language more capable 2010-09-23 20:51:05 -06:00
Kovid Goyal
448aa8497b Fix #6909 (Trouble in converting non drm prc file to epub) 2010-09-23 20:23:11 -06:00
Kovid Goyal
52b17cc1b9 Fix #6926 (Aldiko on Samsung Moment) 2010-09-23 19:48:52 -06:00
Charles Haley
1a782eb0ff - Some cleanups on templates.
- Make save_to_disk templates sanitize all fields except composites
2010-09-23 20:36:52 +01:00
Kovid Goyal
d7d613b0aa ... 2010-09-23 11:31:22 -06:00
Charles Haley
232ce4748d Back out the models 'strip' change 2010-09-23 17:59:50 +01:00
Charles Haley
b2d5f740b5 1) Put back get_metadata code for format, and fix format.
2) Ensure that gui editing does an lcase.
2010-09-23 17:46:46 +01:00
Kovid Goyal
676fc555a7 Pull from trunk 2010-09-23 10:35:36 -06:00
Charles Haley
36ce874081 Fix db2.get_metadata to handle format correctly (it is already a list)
Fix Metadata to put composite fields back where they belong
2010-09-23 17:18:49 +01:00
Kovid Goyal
b940570504 IPC: Store results file in the calibre temp dir and also dont die if for some reason removing result file fails 2010-09-23 09:33:49 -06:00
Kovid Goyal
82f577452b Pull from trunk 2010-09-23 08:46:09 -06:00
Kovid Goyal
7a20e117ce Database: Fix regression that caused has_cover to create empty directories unneccessarily 2010-09-23 08:45:37 -06:00
Kovid Goyal
e41a54c1d7 Neal's Nuze by Tony Stegall. Fixes #6917 (Recipe for Neal's Nuze) 2010-09-23 08:31:27 -06:00
Kovid Goyal
3db15e955b Fix #6797 (Fetch News Russian Table of Contents MOBI format) 2010-09-23 08:22:50 -06:00
Kovid Goyal
30c96df505 ... 2010-09-23 08:13:51 -06:00