Commit Graph

11720 Commits

Author SHA1 Message Date
Jonathan Springer
b6543b8e44 Merge trunk 2014-04-12 14:07:51 -04:00
Jonathan Springer
991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer
4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat
d16d8066ad - updated vlc.py
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer
307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt
31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt
11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt
bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer
25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt
47767b02c1 Fix debug messages
Fixes: https://launchpad.net/bugs/1170231
2014-04-08 22:41:33 +02:00
Jonathan Springer
d3526c6204 Simplify code per Andreas Preikschat's comment. 2014-04-07 13:22:12 -04:00
Jonathan Springer
e19ab7a2c3 Merge trunk 2014-04-06 22:48:24 -04:00
Jonathan Springer
c751a208f9 Change back to using a white list. 2014-04-06 22:47:41 -04:00
Jonathan Springer
1945b4c380 Remove changes to platform specific code. 2014-04-06 22:07:19 -04:00
Jonathan Springer
e5d5af38c2 Move opening of files passed in via command line to function. 2014-04-06 22:03:05 -04:00
Tim Bentley
5e9d9a3cd0 Fix bug in http server restart
clean up error handling display.

clean up pep8 errors in tests.

We are now 100% clean

bzr-revno: 2348
2014-04-04 21:28:40 +01:00
Tim Bentley
8813490bad fix tests 2014-04-04 21:24:11 +01:00
Tim Bentley
edb38d1255 head 2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f Fixed wrong dll load path.
bzr-revno: 2347
2014-04-04 21:22:12 +01:00
Tim Bentley
576ab6e1f9 head 2014-04-04 21:20:00 +01:00
Tomas Groth
7ef62293f3 Added test 2014-04-03 22:22:10 +02:00
Jonathan Springer
bc55bcd7fa Fix argurment to pass correct type. 2014-04-03 08:38:39 -04:00
Tim Bentley
151f1017c5 finished 2014-04-02 20:35:09 +01:00
Tim Bentley
806ce25296 head 2014-04-02 19:51:36 +01:00
Tim Bentley
c38c576f94 test fixes 2014-04-02 19:51:21 +01:00
Andreas Preikschat
2a9c85c2a2 fixed a spelling mistake
bzr-revno: 2346
2014-04-02 19:51:06 +01:00
Jonathan Springer
d26b34aee0 Modify loading file from the command line to only load files ending with osz, oszl, or otz. 2014-04-01 14:58:22 -04:00
Tim Bentley
3e7370c656 head 2014-04-01 18:33:13 +01:00
Tim Bentley
edd1ed849a minor fixes 2014-04-01 18:32:19 +01:00
Jonathan Springer
6ca37531a0 Remove unnecessary platform specific code, remove orphaned and unused registry execute, and fix two functions to register to the registry instead of executing. 2014-04-01 13:07:25 -04:00
Andreas Preikschat
5bc5678078 - added a script to trigger jenkins
bzr-revno: 2345
2014-03-31 22:05:42 +02:00
Andreas Preikschat
9d9a8145f6 fixed dectection 2014-03-31 20:10:14 +02:00
Andreas Preikschat
ab4cbfd85e fix: spelling mistake 2014-03-31 19:57:15 +02:00
Andreas Preikschat
6235fa19a9 long line 2014-03-31 19:52:49 +02:00
Andreas Preikschat
3db984a846 clean up: simplify code 2014-03-31 19:32:49 +02:00
Andreas Preikschat
20e7517b03 doc: shortened path 2014-03-31 19:30:14 +02:00
Andreas Preikschat
5227924846 fix: removed stray print 2014-03-31 19:29:14 +02:00
Andreas Preikschat
c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat
6204454bfb updated doc 2014-03-31 18:40:36 +02:00
Andreas Preikschat
716a79bcc5 cleaned doc 2014-03-31 18:37:43 +02:00
Andreas Preikschat
4bed39869a updated check_dependencies.py sciprt 2014-03-31 18:30:07 +02:00
Andreas Preikschat
5f0b40fe30 Moved script 2014-03-31 18:27:26 +02:00
Andreas Preikschat
13c053bc5c added jenkins script 2014-03-31 18:08:42 +02:00
Andreas Preikschat
08835e80f8 merged from lp:~googol/openlp/vlc 2014-03-31 18:05:37 +02:00
Samuel Mehrbrodt
51d55aa546 Add Neue evangelistische Übersetzung to bibles database
bzr-revno: 2344
2014-03-31 16:48:14 +01:00
Andreas Preikschat
5a02ab9471 test: splash screen test 2014-03-31 16:07:05 +02:00
Andreas Preikschat
b69f480dc0 head 2014-03-31 14:19:33 +02:00
Andreas Preikschat
93ff301840 cleanup: remove local variable 2014-03-31 14:13:50 +02:00
Samuel Mehrbrodt
80284f6f8d Added 'Neue evangelistische Übersetzung' to the list of Online bible translations 2014-03-31 10:08:07 +02:00
6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
2014-03-30 13:02:25 +02:00