raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
10,356 Commits 5 Branches 0 Tags 296 MiB
68d034e877
Commit Graph

10356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjan Schrijver
68d034e877 Revert code shortening from lp:~googol/openlp/image_groups 2013-03-07 10:03:02 +01:00
Arjan Schrijver
94e231cf93 Fixed internal_dnd error 2013-03-04 15:29:31 +01:00
Arjan Schrijver
91ad9ae9cc Merge HEAD 2013-03-04 14:48:42 +01:00
Arjan Schrijver
2561f995ac Fixed manual import of configuration file with a list of images 2013-03-04 14:37:19 +01:00
Tim Bentley
07a1dc9485 - Implementation of a two phase bootstrap. 
- Some minor code cleanups as well.
- Removed unneeded tests

bzr-revno: 2197
 2013-03-04 11:32:05 +01:00
Andreas Preikschat
f52f4fac26 - fixed bug #902964 (Libreoffice deprecated commandline args) 
bzr-revno: 2196
Fixes: https://launchpad.net/bugs/902964
 2013-03-04 11:23:43 +01:00
Arjan Schrijver
a5e6cc358b Moved initial images list conversion to app_startup 2013-03-03 20:35:11 +01:00
Arjan Schrijver
97184a9ea1 Moved conversion code. Doesn't work yet. 2013-03-03 18:24:32 +01:00
Arjan Schrijver
c02098faa8 Merge HEAD 2013-03-03 17:53:33 +01:00
Tim Bentley
73fb71b4ce Head + conflicts 2013-03-01 17:45:17 +00:00
Andreas Preikschat
7d0b2e9785 fixed bug #1116528 (Song Import Wizzard does not work in trunk) 
fixed exception form not being displayed
Always log exceptions
fixed/extended tes

bzr-revno: 2195
 2013-03-01 17:27:03 +00:00
Andreas Preikschat
f18f62ee7d Fix rename errors 
bzr-revno: 2194
 2013-03-01 17:23:39 +00:00
Andreas Preikschat
3bc3434fa9 update check-dependencies 
bzr-revno: 2193
 2013-03-01 17:22:41 +00:00
Andreas Preikschat
fe251f96a0 fixed test 2013-03-01 17:30:13 +01:00
Andreas Preikschat
550dfe12fa fixed/extended test 2013-03-01 17:18:50 +01:00
Andreas Preikschat
2c02420bee fixed AttributErrors (regressio) 2013-03-01 09:38:25 +01:00
Andreas Preikschat
ecc2413e7e head 2013-03-01 09:34:45 +01:00
Andreas Preikschat
6ab1cc3c4b added mock to check_dependencies 2013-02-28 22:36:55 +01:00
Tim Bentley
5da93e1f15 Fix tests to work 2013-02-28 21:19:01 +00:00
Andreas Preikschat
43874d0090 fixed bug #902964 (Libreoffice deprecated commandline args) 
Fixes: https://launchpad.net/bugs/902964
 2013-02-28 20:55:33 +01:00
Andreas Preikschat
7feab25c3f always log the exception 2013-02-28 15:43:14 +01:00
Andreas Preikschat
dfa2eb1afe fixed exception form not shown 2013-02-28 15:15:17 +01:00
Andreas Preikschat
66a6502cdf fixed bug #1116528 (Song Import Wizzard does not work in trunk) 
Fixes: https://launchpad.net/bugs/1116528
 2013-02-28 12:25:05 +01:00
Andreas Preikschat
469d8b05c4 - renamed a few variables 
- fixed same short lines
- merged get_files method from SettingsManager into AppLocation
- added get_files test
- fixed actionList test

bzr-revno: 2192
 2013-02-28 12:15:35 +01:00
Tim Bentley
8ddfd194c3 Remove unneeded tests 2013-02-28 05:45:34 +00:00
Tim Bentley
73aafdb62c failing tests 2013-02-27 21:42:21 +00:00
Andreas Preikschat
e61d76ecff fixed grammar 2013-02-27 22:40:55 +01:00
Tim Bentley
c564b05f36 Fix merge comments 2013-02-27 21:27:32 +00:00
Tim Bentley
e5c371feb5 Fix merge comments 2013-02-27 21:23:46 +00:00
Tim Bentley
b96304253e Fix merge comments 2013-02-27 21:11:43 +00:00
Andreas Preikschat
5cad5d5435 Merged lp:~googol/openlp/image_groups 2013-02-27 17:12:00 +01:00
Andreas Preikschat
c3e01dd719 fixed docs 2013-02-27 14:01:42 +01:00
Andreas Preikschat
20e26e7ea1 attempt to fix test; naming errors 2013-02-27 13:41:04 +01:00
Andreas Preikschat
51eb93fe75 added test 2013-02-27 13:03:17 +01:00
Andreas Preikschat
25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +01:00
Andreas Preikschat
5b6f6ddee1 removed not needed lines 2013-02-27 12:31:06 +01:00
Andreas Preikschat
0f8836ac54 removed not needed imports 2013-02-27 12:29:24 +01:00
Andreas Preikschat
4d1d912aaa merged settingsmanager with applocation; moved applocation 2013-02-27 12:24:50 +01:00
Andreas Preikschat
00451ebfe0 moved SettingsManager 2013-02-27 12:04:05 +01:00
Tim Bentley
26ba57456f Head + conflicts 2013-02-26 17:27:30 +00:00
Andreas Preikschat
7b0b14f962 Central Settings clean-up and tidy up 
bzr-revno: 2191
 2013-02-26 17:20:32 +00:00
Andreas Preikschat
5a5845ccd1 added commented line 2013-02-26 16:41:36 +01:00
Andreas Preikschat
78d7dacd4b clean up 2013-02-26 16:39:39 +01:00
Andreas Preikschat
25373944b2 started work on converting old image settings 2013-02-26 12:23:57 +01:00
Andreas Preikschat
31f28a7570 fixed same short lines 2013-02-24 19:13:50 +01:00
Andreas Preikschat
44ebc1fe27 Update vendor vlc.py 
bzr-revno: 2190
 2013-02-22 17:22:47 +00:00
Tim Bentley
8c29f8d4e5 minor changes 2013-02-22 07:15:07 +00:00
Andreas Preikschat
db2b4ccd61 head + conflicts 2013-02-21 22:26:24 +01:00
Tim Bentley
fb466d25a2 Head 2013-02-21 21:21:33 +00:00
Tim Bentley
3b9fe00e0a Add tests for Settings, Clean up Alerts and SongUsage plugins, More Event conversions (UI's). 
bzr-revno: 2189
 2013-02-21 21:19:59 +00:00