Armin Köhler
e87bb1114a
HEAD r1601
2011-06-01 21:42:36 +02:00
Gerald Britton
7459255b65
Add robustness to Generic document and Songs of Fellowship importers.
...
bzr-revno: 1601
2011-06-01 17:43:29 +02:00
Gerald Britton
6856e3ef44
Ensure exception is raised if all attempts to connect with uno fail
2011-05-31 16:05:47 -04:00
Gerald Britton
6a6d0aa64d
Log failing imports
...
bzr-revno: 1600
2011-05-31 21:01:49 +02:00
Raoul Snyman
d4a75148b8
Fixed bug #790382 by using the Mako template engine to pass Python variables into the template and tweaking a few things in the JS.
...
bzr-revno: 1599
2011-05-31 20:57:59 +02:00
Raoul Snyman
6572e7a225
Removed the int typecast and removed executable permissions from the json2.js file.
2011-05-31 20:20:23 +02:00
Raoul Snyman
09d63871d8
Converted the impromptu page to a dialog for better usability and more translation flexibility.
2011-05-31 19:36:32 +02:00
Gerald Britton
367dfa4585
Merging trunk changes
2011-05-31 10:58:03 -04:00
Raoul Snyman
de56462c8f
Pull the translated plugin names through.
2011-05-31 14:30:21 +02:00
Raoul Snyman
5c943ff1eb
Fixed up another missing translation.
2011-05-31 13:58:18 +02:00
Raoul Snyman
2df9e6a55a
Fixed up some more missing translations.
2011-05-31 13:30:04 +02:00
Raoul Snyman
9f7a96c315
Fixed up some missing translations.
2011-05-31 13:25:35 +02:00
Raoul Snyman
ee151cde2a
Fixed bug #790382 by using the Mako template engine to pass Python variables into the template.
2011-05-31 12:59:05 +02:00
Andreas Preikschat
79b107138a
- fixed bug #789618 "Large gap between two parts of a verse in Service Order Print"
...
bzr-revno: 1598
Fixes: https://launchpad.net/bugs/789618
2011-05-31 12:53:35 +02:00
Gerald Britton
cde0eb5ab5
Only import uno exceptions if not running Windoes
2011-05-30 17:15:34 -04:00
Armin Köhler
77281d3142
Change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search if a second bible is choosen the lists refresh and contain only books which are in both bibles.
...
bzr-revno: 1597
2011-05-30 21:53:47 +01:00
Gerald Britton
934a70b955
Relocate import logging statement
2011-05-30 16:14:36 -04:00
Raoul Snyman
3683e99152
Fix bug #714510 by removing the unnecessary indexes and defaulting the song_book_id on the songs table to NULL instead of 0.
...
bzr-revno: 1596
2011-05-30 22:03:09 +02:00
Armin Köhler
e356c5a4a1
HEAD r1595
2011-05-30 22:00:36 +02:00
Armin Köhler
5c6b92607e
removed unnecessary code
2011-05-30 21:44:38 +02:00
Armin Köhler
ab3896ce6f
removed unnecessary code
2011-05-30 21:41:02 +02:00
Gerald Britton
27b8ec3deb
Add exception logging to import.py
2011-05-30 15:19:16 -04:00
Gerald Britton
c8a896cedd
Merge changes from trunk
2011-05-30 13:41:56 -04:00
Andreas Preikschat
6c870f7f7f
- Fixed bug #789929 (Display Tags cannot be deleted)
...
bzr-revno: 1595
Fixes: https://launchpad.net/bugs/789929
2011-05-30 18:54:45 +02:00
Andreas Preikschat
ed3a608b8d
fixed tag deletion (bug #789929
...
Fixes: https://launchpad.net/bugs/789929
2011-05-30 17:07:49 +02:00
Andreas Preikschat
166b1c5b68
r1594
2011-05-30 16:48:05 +02:00
Raoul Snyman
99ae60aba3
Fixed up loading a song from a service.
2011-05-30 13:17:23 +02:00
Jonathan Corwin
98489da6ea
MediaManagerItems need to inherit from the TabBox inside the media dock, or the media dock itself.
...
Fix parentage of several classes
bzr-revno: 1594
Fixes: https://launchpad.net/bugs/739771
2011-05-30 09:56:23 +01:00
Raoul Snyman
30ec309ff8
Fixed up various index errors on InnoDB tables.
2011-05-30 08:45:58 +02:00
Andreas Preikschat
0a2d97021c
added spaces
2011-05-30 07:03:46 +02:00
Jonathan Corwin
3da3dd9869
Head
2011-05-29 21:47:12 +01:00
Jonathan Corwin
9cd536e137
Fix the parent that whydoubt sneaked in
2011-05-29 21:46:13 +01:00
Armin Köhler
a8ea8d668a
correct indent
2011-05-29 21:32:37 +02:00
Armin Köhler
6ad8129363
change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search, if a second bible is choosen the list only contains books which are in both bibles.
2011-05-29 19:13:39 +02:00
Armin Köhler
17b97e87a8
HEAD r1593
2011-05-29 19:03:48 +02:00
Andreas Preikschat
571765c84f
- changed a few camelCase names
...
- changed object names
bzr-revno: 1593
2011-05-29 18:00:37 +02:00
Andreas Preikschat
fd4d316097
- fixed bug #789143
...
bzr-revno: 1592
Fixes: https://launchpad.net/bugs/789143
2011-05-29 17:59:47 +02:00
Jonathan Corwin
02da22c349
Head
2011-05-29 16:33:09 +01:00
Armin Köhler
f701ae71bd
Monster change to Bibles:
...
- Web Bibles import their books on registration
- Added a book_reference_id to the books table of Bibles
- Moved various sqlite and csv resources into a single sqlite database
- Added an upgrade wizard to upgrade existing Bibles
- Check on startup if a user has older Bibles
- Various other bug fixes and cleanups
bzr-revno: 1591
2011-05-29 17:18:17 +02:00
Andreas Preikschat
22ad88d3ee
fix for bug #789618
...
Fixes: https://launchpad.net/bugs/789618
2011-05-29 08:26:14 +02:00
Andreas Preikschat
68238f3c51
r1590
2011-05-29 08:25:31 +02:00
Andreas Preikschat
b56f93aad5
camelCase fixes and shortcut fixes
2011-05-29 08:23:12 +02:00
Andreas Preikschat
0e53bdfefa
head
2011-05-29 08:05:18 +02:00
Raoul Snyman
0c81f7c976
Added a simple file to point users to the online manual. This is necessary for the Debian and Ubuntu builds.
...
bzr-revno: 1590
2011-05-28 23:29:39 +02:00
Jonathan Corwin
975dd3cb00
mediaitem() -> mediaitem
2011-05-28 22:23:07 +01:00
Armin Köhler
81fca6bedb
change layout of backup page
...
change some strings
2011-05-28 23:01:27 +02:00
Jeffrey Smith
7c3f7a2358
Make 'continuous loop' button into a selection ('loop' or 'play to end')
...
bzr-revno: 1589
2011-05-28 21:49:15 +01:00
Gerald Britton
caa6639c7b
Uglification to conform to weird standards :)
2011-05-28 16:43:33 -04:00
Gerald Britton
336adb7461
Merged updates from trunk
2011-05-28 16:36:46 -04:00
Raoul Snyman
382e2f11c8
Added a simple file to point users to the online manual. This is necessary for the Debian and Ubuntu builds.
2011-05-28 22:26:55 +02:00
