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

4799 Commits

Author SHA1 Message Date
Arjan Schrijver
9752716672 HEAD 2013-04-18 15:57:31 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Andreas Preikschat
06b8707434 renaming 2013-04-18 11:30:55 +02:00
Andreas Preikschat
2d518febf0 renaming 2013-04-18 11:28:21 +02:00
Andreas Preikschat
d002cb383e renaming 2013-04-18 11:27:11 +02:00
Andreas Preikschat
c13c0a0474 renaming 2013-04-18 11:22:20 +02:00
Andreas Preikschat
cf209fef6f renaming 2013-04-18 11:20:56 +02:00
Andreas Preikschat
5547035550 fixed short lines 2013-04-18 11:17:00 +02:00
Andreas Preikschat
f3b49c4dd5 removed dead code 2013-04-17 22:12:53 +02:00
Andreas Preikschat
0fb24d2233 added tests 2013-04-17 20:33:44 +02:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +01:00
Patrick Zimmermann
0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
Andreas Preikschat
8d5aaa927d removed import from gui 2013-04-15 23:31:04 +02:00
Andreas Preikschat
f0334457d0 removed sqlite2 code 2013-04-15 23:07:45 +02:00
Andreas Preikschat
e2b8dc54f3 fixed bs4 code; fixed regression 2013-04-15 21:54:27 +02:00
Tim Bentley
7f78250bb2 Make object 2013-04-15 18:55:50 +01:00
Meinert Jordan
571934e166 Fix Natural Sorting so works with Python3 
bzr-revno: 2230
 2013-04-14 19:19:33 +01:00
Tim Bentley
220681c900 Comment fixes 2013-04-14 16:59:57 +01:00
Tim Bentley
797a76f095 Head 2013-04-14 16:45:34 +01:00
Philip Ridout
38a95ffab8 Fixed importing of songs with verses numbered 1A, or 1.5 etc. in SongShowPlus importer 
bzr-revno: 2229
Fixes: https://launchpad.net/bugs/1125956
 2013-04-14 17:30:06 +02:00
Patrick Zimmermann
789439dd6b Make wizard a little wider to fit at least two review widgets. 2013-04-09 23:32:19 +02:00
Tim Bentley
31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
Andreas Preikschat
78ed2f655c remove markupMassage 2013-04-06 19:59:07 +02:00
Patrick Zimmermann
97c6899a31 Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score. 2013-04-06 13:53:00 +02:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Andreas Preikschat
ac32b6ca65 fixed missing r'' and removed argument 2013-04-05 22:20:51 +02:00
Andreas Preikschat
19f9718aec added FIXME 2013-04-05 22:06:00 +02:00
Andreas Preikschat
69009970c0 replaced BeautifulSoup3 by BeautifulSoup4 2013-04-05 21:58:13 +02:00
Tim Bentley
e36706e3ec Head 2013-04-05 20:37:56 +01:00
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
phill-ridout
c3583bd21d Added comment 2013-04-04 17:42:22 +01:00
M2j
118f295204 Precompute the whole comparision key for song sorting. 2013-03-31 12:31:54 +02:00
phill-ridout
3686da6a2e Changed regex string type to raw 2013-03-31 11:13:56 +01:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Andreas Preikschat
bbf2ad3b4b head + conflict 2013-03-30 10:53:01 +01:00
Andreas Preikschat
947c9a7346 removed old code 
bzr-revno: 2224
 2013-03-30 10:41:40 +01:00
Andreas Preikschat
fd3cad1c7c r2223 2013-03-30 09:40:49 +01:00
Tim Bentley
25d74260ce Add tests for the server 2013-03-30 06:56:28 +00:00
Tim Bentley
efa7d8c8c0 minor fixes and move certificate location 2013-03-29 20:58:06 +00:00
Arjan Schrijver
1beb9b06d3 HEAD 2013-03-29 13:02:35 +01:00
Tim Bentley
eb51590bec Code cleanup ready for reviews 2013-03-29 09:39:41 +00:00
Tim Bentley
6cd384e028 Fix up tests 2013-03-29 09:32:46 +00:00
Tim Bentley
ced77e4ec3 Add some proper tests 2013-03-29 09:06:43 +00:00
Tim Bentley
347636d078 Move userid and password change out of restart scope 2013-03-29 08:33:10 +00:00
Tim Bentley
31847abf2a Head and confilicts 2013-03-29 08:25:33 +00:00
Tim Bentley
8cf886971c Refactor http server 2013-03-29 07:48:55 +00:00
Andreas Preikschat
b139b6a4eb fixed regression :/ 2013-03-28 22:49:11 +01:00
Andreas Preikschat
643fa9436c fixed song editor regression 2013-03-28 22:36:18 +01:00
Andreas Preikschat
696f359cb0 changed order back 2013-03-28 21:25:35 +01:00
Andreas Preikschat
77bd7325a6 reverted code 2013-03-28 21:24:38 +01:00
Andreas Preikschat
4ffd25e1ae r2219 2013-03-28 21:16:16 +01:00
Andreas Preikschat
3b88c1341b removed broken code 2013-03-28 21:15:59 +01:00
Andreas Preikschat
85856cc717 head + conflict 2013-03-28 21:08:07 +01:00
Andreas Preikschat
30a7034ac9 fixed regression + added test for it 2013-03-28 21:03:58 +01:00
phill-ridout
a73a305e38 HEAD 2013-03-28 19:50:52 +00:00
Tim Bentley
ab011a22c1 last version before big refactor 2013-03-28 14:45:47 +00:00
Patrick Zimmermann
4831fb29fa Translate verse tags. 2013-03-26 22:31:46 +01:00
Tim Bentley
451189b222 Fix up login page to handle redirection correctly 2013-03-26 11:39:32 +00:00
Andreas Preikschat
e708140d13 head 2013-03-26 12:35:29 +01:00
Arjan Schrijver
6b032d52e5 - Fixed adding single images 2013-03-26 11:32:22 +01:00
Arjan Schrijver
daf21af699 HEAD 2013-03-26 10:49:13 +01:00
Arjan Schrijver
44547769c6 - Fixed traceback on adding multiple image groups to the service in one go 
- Cleaned up obsolete line in imagetab
 2013-03-26 10:47:05 +01:00
Tim Bentley
4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley
509917480c Fix missing string converstion 2013-03-26 07:17:29 +00:00
Arjan Schrijver
df1faa2a8d - Fixed traceback on canceling the 'choose group' dialog 
- Clear the 'new group' lineedit in the 'choose group' dialog
 2013-03-25 21:17:46 +01:00
Andreas Preikschat
fa43759d8d more regression fixes 2013-03-25 08:27:54 +01:00
Andreas Preikschat
4283742081 fixed settingsTab rename 2013-03-25 08:13:40 +01:00
Andreas Preikschat
52cecd44a2 fixed remotetab regression 2013-03-25 07:40:47 +01:00
Andreas Preikschat
76a58001b7 fixed bible manager regression 2013-03-25 07:22:11 +01:00
phill-ridout
401da98d7c increased line lengths to 120 
renamed SongShowPlusImport vairables and methods to standards
 2013-03-24 14:56:22 +00:00
phill-ridout
86fb343759 Added test for SongShowPlus 2013-03-24 11:32:03 +00:00
Tim Bentley
decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
phill-ridout
53889be2e5 HEAD 2013-03-21 19:05:40 +00:00
Tim Bentley
729c93b70b More changes 2013-03-20 20:17:00 +00:00
Tim Bentley
79524dfbf4 Head + conflict 2013-03-20 19:38:20 +00:00
Tim Bentley
38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Arjan Schrijver
7237ad0c62 - Fixed small bug that removed the path from newly added media and presentations 
- Fixed keyboard shortcuts in images treeview
 2013-03-20 10:24:34 +01:00
Tim Bentley
90ac714c0d Mediamanageritem converted 2013-03-19 22:00:50 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver
ce528140ae This branch implements the 'images groups' feature. It has the following features: 
- convert old 'images files' setting to SQLite database
- existing images are loaded as top-level items to minimize the change for users
- groups can be nested
- images can be moved between groups by drag&drop
- new images can be added directly to a group by drag&drop, or by clicking the 'Add images' button
- image groups can be used as service items with multiple images

bzr-revno: 2214
 2013-03-19 09:38:01 +02:00
Arjan Schrijver
57651493ff - Removed wrong len() use 
- Replaced wrong 'is' use with '=='
- Added tests for ImageMediaItem.save_new_images_list()
 2013-03-18 23:04:09 +01:00
Arjan Schrijver
ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Arjan Schrijver
185754f9b5 Add more docstrings 2013-03-18 14:43:45 +01:00
Arjan Schrijver
50da75cfdb - Removed __checkObject method to clean up the code 
- Fixed busy cursor on 'choose group' dialog
 2013-03-18 14:31:47 +01:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
0809c8e192 minor fixes 2013-03-17 10:23:15 +00:00
Tim Bentley
af76c3f6b9 config_update removed 2013-03-17 09:21:18 +00:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00
Tim Bentley
04bc47cb52 All Tabs converted 2013-03-16 19:57:15 +00:00
Tim Bentley
19c05a7fc0 Half plugin tabs done 2013-03-16 16:59:10 +00:00