Ken Roberts
ddd94ba061
Upstream merges
2014-10-28 13:48:20 -07:00
Ken Roberts
6ae179d672
Upstream merges
2014-10-28 13:45:53 -07:00
00455847a7
HEAD
2014-10-28 22:27:09 +02:00
743dc59d51
[fix 1386710] Fix traceback after settings form is saved
...
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
ae7c863333
[fix 1385979] Check if the item is valid first
2014-10-28 21:02:06 +02:00
Tomas Groth
c19613ce82
Various small bugfixes:
...
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574 . Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.
bzr-revno: 2431
Fixes: https://launchpad.net/bugs/1296574
2014-10-28 20:36:54 +02:00
Tomas Groth
11b2b4dc3b
Added test for checking extension list creation
2014-10-27 21:38:19 +00:00
Tim Bentley
afde4a25ad
Fix missing dummy values for debug
2014-10-27 20:22:57 +00:00
b34da371ba
[ fix #1385438 ] Make list widget items select tab pages via user data rather than just their position.
...
Fixes: https://launchpad.net/bugs/1385438
2014-10-25 22:26:19 +02:00
Ken Roberts
f81903bbcf
Merge upstream
2014-10-23 15:16:38 -07:00
3771cb42a8
HEAD
2014-10-22 22:47:47 +02:00
76f4b6e3ad
Forgot to add test file
2014-10-22 22:44:05 +02:00
551a10d311
Added and updated tests:
...
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests
Updated setup.py with some Python3 changes.
2014-10-22 22:43:05 +02:00
Ken Roberts
d08594ab55
Upstream changes
2014-10-21 18:27:01 -07:00
Tomas Groth
5662f4b2af
Ask the user if a backup of the data folder should be created after upgrading
...
bzr-revno: 2427
2014-10-21 22:08:26 +01:00
Samuel Mehrbrodt
674cf930ef
Update jQuery and jQuery Mobile
...
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth
5ecbfa61fd
Fix tests so they can run individually.
...
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).
bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Tim Bentley
d6dc19ae5e
Correct Version to Mainwindow communications.
...
bzr-revno: 2424
2014-10-21 22:03:31 +01:00
Phill Ridout
07c693c8c8
Changed some of the comments
2014-10-21 21:08:37 +01:00
Tim Bentley
2b3e3d777e
Add Test and fix more code
2014-10-21 21:05:08 +01:00
Tomas Groth
cbd1b7c223
Changed setting version name
2014-10-14 09:52:59 +02:00
Samuel Mehrbrodt
806bb5973e
Merge trunk
2014-10-13 19:40:12 +02:00
Tomas Groth
5091b3de37
Added a test
2014-10-13 16:08:06 +02:00
Samuel Mehrbrodt
637c0060f9
Add test
2014-10-13 13:38:13 +02:00
Ken Roberts
7545fb534f
Fix changed imports in mockups
2014-10-06 14:19:08 -07:00
Phill Ridout
3ea58aa4ca
change line endings
2014-10-06 20:41:29 +01:00
Ken Roberts
0227e0a2bd
Initial projector code
2014-10-06 12:10:03 -07:00
Phill Ridout
ddec0e00cd
Patch changes from botched branch
2014-10-06 19:09:47 +01:00
Tomas Groth
2b9d36702b
Added oxps as supported presentation filetype (by mudraw)
2014-09-29 21:11:07 +01:00
Tomas Groth
60dc075e3b
pep8 fix
2014-09-25 21:46:09 +01:00
Tomas Groth
9b8b114a59
Fixed the new test.
2014-09-25 21:31:31 +01:00
Tomas Groth
3e66b4aa98
Fix for importing custom tags from openlyricsxml + test in progress
2014-09-25 17:01:11 +02:00
Tomas Groth
977fd1d187
Fix tests so they can run individually.
2014-09-25 16:59:56 +02:00
Tomas Groth
31a868ca61
Moved thumbnail creation to httprouter.py
2014-09-23 22:45:42 +01:00
Tomas Groth
78d9da5c26
Fix comments and typos
2014-09-22 22:19:02 +01:00
Tomas Groth
4bacaab205
trunk
2014-09-21 20:23:40 +01:00
Samuel Mehrbrodt
b24ba5322b
Merge trunk
2014-09-14 15:44:32 +02:00
Samuel Mehrbrodt
e6a6015c21
Fix tests
2014-09-14 15:32:38 +02:00
efe030b020
Update the UI on Mac OS to make it look and feel more like a first-class Mac app.
...
* Removed the icons from the menus (thanks to Jonathan S. for that)
* Use Mac OS X wizards instead of our Windows-style wizards when on OS X
bzr-revno: 2419
2014-09-14 15:07:31 +02:00
Samuel Mehrbrodt
aef7bb55c4
Add test
2014-09-14 00:00:43 +02:00
Tomas Groth
489f2266b2
Fix test for windows
2014-09-10 10:54:03 +02:00
Tomas Groth
74391978e8
pep8 fix
2014-09-10 10:07:10 +02:00
Tomas Groth
2e0c3e24f7
Changed thememanager test so it doesn't make the zipfile module unuseable.
2014-09-10 10:05:45 +02:00
Tomas Groth
d767990280
Adjusted tests
2014-09-10 09:34:38 +02:00
Tomas Groth
3769a01682
Small fixes
2014-09-08 22:48:49 +01:00
Tomas Groth
dab4ad7080
trunk
2014-09-08 22:08:49 +01:00
bf488da516
Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm.
2014-09-08 00:17:20 +02:00
Tomas Groth
98d5ed7acf
Fix the OSIS bible importer
...
bzr-revno: 2418
2014-09-06 07:44:08 +01:00
Tomas Groth
df28a6799b
trunk
2014-09-02 21:17:56 +01:00
Jonathan Springer
f3207dac8e
Consolidate platform specific checks into the common module
2014-08-27 19:18:06 -04:00