raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
9,206 Commits 5 Branches 0 Tags 296 MiB
8ad5fdad4a
Commit Graph

9206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Ridout
79299f15cd Fix JS error in OpenLP.js 
A fix for issues: http://support.openlp.org/issues/703
http://support.openlp.org/issues/677

bzr-revno: 1995
 2012-06-17 09:13:47 +01:00
Tim Bentley
8ef8984d16 head1994 2012-06-17 07:38:05 +01:00
Andreas Preikschat
631535acfd another variable fix 2012-06-16 18:12:54 +02:00
Andreas Preikschat
49e1713226 variable fix 2012-06-16 18:02:22 +02:00
Andreas Preikschat
b797b5e341 removed not needed variable 2012-06-16 17:58:38 +02:00
Andreas Preikschat
999af73d14 variable naming conventions, converted dict to list 2012-06-16 17:51:04 +02:00
Andreas Preikschat
84332702a5 r1994 + conflict 2012-06-16 17:22:18 +02:00
Andreas Preikschat
32bd1da98e - fixed docstring 
bzr-revno: 1994
 2012-06-16 11:04:40 +02:00
Andreas Preikschat
225caae1d0 removed line which has accidentally been added 2012-06-16 10:26:25 +02:00
Andreas Preikschat
337e4eaa22 r1993 2012-06-16 10:25:07 +02:00
Andreas Preikschat
de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00
Andreas Preikschat
a8b41e95d2 - fixed ticket 695 (http://support.openlp.org/issues/695) 
bzr-revno: 1992
 2012-06-16 10:21:00 +02:00
Andreas Preikschat
fbe982f862 - fixed missing plugin in kwargs 
bzr-revno: 1991
 2012-06-16 10:20:08 +02:00
Philip Ridout
8f8e5558a2 A fix for issues: 
http://support.openlp.org/issues/703
http://support.openlp.org/issues/677

The bug was being caused because we were passing file paths for images and presentations. In windows a back slash is used. This needed escaping
 2012-06-16 01:12:08 +01:00
Andreas Preikschat
8eacb2c50b - fixed ticket 695 2012-06-15 18:19:46 +02:00
Andreas Preikschat
cc85d1682d fixed bug 2012-06-15 18:03:46 +02:00
Andreas Preikschat
8907e8d800 r1990 2012-06-15 17:41:59 +02:00
Andreas Preikschat
9496c68fa7 r1990 2012-06-15 17:34:57 +02:00
Andreas Preikschat
266e8eb29b - fixed ticket 729 (http://support.openlp.org/issues/729) 
bzr-revno: 1990
 2012-06-15 17:32:45 +02:00
Andreas Preikschat
08adb54679 updated vlc.py 2012-06-15 17:31:24 +02:00
Andreas Preikschat
661424d202 r1989 2012-06-15 17:28:16 +02:00
Raoul Snyman
0ad713407b Fixed bug #1013215: Catch a previously uncaught NotImplementedError and do nothing so that OpenLP realises that VLC is not available. 
Fixes: https://launchpad.net/bugs/1013215
 2012-06-14 23:20:55 +02:00
Andreas Preikschat
6a23b75b8c reverted changes 2012-06-14 17:46:47 +02:00
Raoul Snyman
0d3f425c5b Changed parsing of Bible Gateway HTML. 
bzr-revno: 1989
 2012-06-13 20:56:25 +01:00
Andreas Preikschat
21fc0f9533 fixed docstring 2012-06-13 17:53:54 +02:00
Andreas Preikschat
1f5ac7f483 fixed ticket 729 and fixed variables to camelCase 2012-06-13 17:44:33 +02:00
Raoul Snyman
4e0b9c30d3 Fixed bug #991150: BibleGateway has new HTML, so we need to change our parsing. This now parses the new HTML correctly. 
Fixes: https://launchpad.net/bugs/991150
 2012-06-12 23:25:31 +02:00
Dave Warnock
e0c5fabc5a Amend DB Error OperationError 
bzr-revno: 1988
 2012-06-11 18:33:57 +01:00
Stevan Pettit
40daccfdb4 Added code to allow OpenLP to run as a portable app. 
bzr-revno: 1987
 2012-06-11 18:30:54 +01:00
Dave Warnock
b9b0d83a00 renamed tryCount local variable to try_count 2012-06-11 15:11:53 +01:00
Dave Warnock
913b0433f6 This update is a tidy up of the code that fixed bug #927473 
Changes are made due to the following issues:

- the code assumed that exception OperationalError would only be thrown by  mySQL temporarily disappearing. However, other dbms can throw this exception and usually for errors that mean a retry will also fail.

- the code repeated the actual code of the method within the exception handler. This means code duplication and also that any new exceptions  are not handled by the same exception handler so for example their transaction will not get rolled back.

- not all potential dbms exceptions were caught and so in some cases the database transaction was not rolled back

The solution is to retry transactions where an OperationalError is thrown. Currently these are retried up to 3 times before the error is logged and the method returns false. By retrying the transaction we ensure that the same transaction code with the same exception handlers is used each time.

An additional catchall exception has been added where there is a transaction to ensure that it is rolled back. As with the OperationError this throws the exception back up the stack.
 2012-06-10 22:45:02 +01:00
Stevan Pettit
c306573309 Minor changes to logging, variable name 2012-06-10 15:53:46 -04:00
Stevan Pettit
8365d6f589 Fixed some cosmedics 2012-06-10 10:29:50 -04:00
Andreas Preikschat
7281f44603 removed argument 2012-06-10 15:39:45 +02:00
Stevan Pettit
245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Samuel Findlay
f1afae1813 Added ZionWorx importer. Added descriptionLabel to song import wizard. 
bzr-revno: 1986
 2012-06-09 19:58:56 +01:00
Stevan Pettit
24bcc54d68 Provides the ability to change the data path storing the config files and databases. 
bzr-revno: 1985
 2012-06-09 19:50:56 +01:00
Andreas Preikschat
6c981afedc - clean ups 
bzr-revno: 1984
 2012-06-09 20:28:07 +02:00
Andreas Preikschat
dc1ca0b96a - updated vlc.py 
bzr-revno: 1983
 2012-06-09 20:18:08 +02:00
Andreas Preikschat
fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat
328f918c9f r1982 2012-06-09 16:04:59 +02:00
Andreas Preikschat
e8eb2e317d updated vlc.py 2012-06-09 15:46:34 +02:00
Stevan Pettit
67093ed65f Added code to call superclass cancel 2012-06-09 08:03:47 -04:00
Andreas Preikschat
5c5a1ab68f Reworked some renderer code. 
This improves the performance a bit. And improves code readability/clearness (at least that what I think). :-D

bzr-revno: 1982
 2012-06-09 10:33:16 +01:00
Stevan Pettit
c4d3ba5559 Fixed indenting 2012-06-09 00:32:28 -04:00
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit
d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Samuel Findlay
413cfc3782 Change description label. dump->convert. Added link to manual 2012-06-09 07:03:18 +10:00
Samuel Findlay
598ef7fff3 Merge refactor-song-import 2012-06-09 06:31:15 +10:00
Samuel Findlay
6bf5f6d56f Change attributes from enumeration to strings. Double underscore class attributes 2012-06-09 05:30:33 +10:00