Samuel Mehrbrodt
ad5246fc4a
songbookentry -> songbook_entry, mock_song -> song
2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt
fe74a19783
Merge
2016-01-09 16:04:34 +01:00
Tomas Groth
e9e845035a
pep8 fixes
2016-01-09 10:09:29 +01:00
Simon Hanna
bf4225838e
Fix failing test due to name conflict
2016-01-09 01:15:23 +01:00
Simon Hanna
21c6a3ff1c
Merge with trunk
2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt
da5790f17f
Merge trunk
2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf
trunk
2016-01-08 22:51:40 +01:00
Tomas Groth
b5270b48a9
Fix for easyslide importer and added test.
2016-01-08 22:42:36 +01:00
Tomas Groth
21b8388069
Small cleanup of videopsalm
2016-01-08 20:52:24 +01:00
Tomas Groth
345f135e98
Made sundayplus importer work with python3. Added tests.
2016-01-08 20:51:03 +01:00
Tim Bentley
7fd37c1033
head
2016-01-08 17:44:47 +00:00
simon.hanna@serve-me.info
e8e553b663
Modify all forms to remove the help button from their status bar.
...
I don't think I missed a form. The Wizards remain untouched as the help button works there
bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
Simon Hanna
2c5475e8fa
Fix some pep issues in the changed files
2016-01-08 14:47:52 +01:00
Simon Hanna
d5780b9f78
update functions that were previously methods to drop the '_'
...
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna
5bc13e45e3
Move some static methods out of their classes where it makes sense
2016-01-05 23:28:48 +01:00
Simon Hanna
46301b63f4
Add docstrings to tests
2016-01-05 22:35:35 +01:00
Tim Bentley
8df7c3a9ea
add tests
2016-01-05 19:32:12 +00:00
Samuel Mehrbrodt
5f2e0ba0ee
Add test for deleting columns in a db
2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt
bfdd9e81ab
Extend test for multiple songbooks
2016-01-04 20:23:42 +01:00
Samuel Mehrbrodt
ccd8b0625f
Fix test
2016-01-04 20:20:21 +01:00
Samuel Mehrbrodt
ecd2c28cc7
Add test
2016-01-04 20:14:00 +01:00
Simon Hanna
7ed23514b4
Add test for about() function of MediaPlugin
2016-01-04 01:28:13 +01:00
Simon Hanna
8121f77e2d
Add test for about() function of SongUsagePlugin
2016-01-04 01:27:56 +01:00
Simon Hanna
c7563a5a64
Add documentation to tests
2016-01-03 00:37:22 +01:00
Tim Bentley
3a8b068af8
Year older
2015-12-31 22:46:06 +00:00
Simon Hanna
990a8a9502
Add tests for the SongFormat class
2015-12-30 22:36:37 +01:00
9f939859b7
[Songs Plugin] Add a stop button to the SongSelect importer to stop searching.
2015-12-26 16:33:29 +02:00
8bf871fe2b
[SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')
2015-12-23 20:20:22 +02:00
springermac@gmail.com
d9a02f6ada
Migrate to PyQt5
...
bzr-revno: 2576
2015-12-21 21:27:10 +01:00
Jonathan Springer
bee587fa67
merge trunk
2015-12-20 19:43:38 -05:00
Tomas Groth
89ae1ae738
Added tests for LyriX import.
2015-12-20 20:28:14 +01:00
Tomas Groth
2a4205c0a1
Migrated songselect and songbeamer tests to the SongImportTestHelper based structure.
2015-12-20 17:46:39 +01:00
Tomas Groth
6eb17b561d
trunk
2015-12-18 21:13:21 +01:00
Samuel Mehrbrodt
e6978033e9
PEP8
2015-12-17 22:43:49 +01:00
Tomas Groth
6b8178a0b4
Added support of importing VideoPsalm songbooks.
2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt
020864dd26
PEP8
2015-12-17 22:28:36 +01:00
Samuel Mehrbrodt
0ce6804171
Fix pep8
2015-12-17 21:27:08 +01:00
Jonathan Springer
0a935bdb90
merge trunk
2015-12-13 19:21:58 -05:00
Samuel Mehrbrodt
0d4541b8dc
Merge trunk
2015-12-11 09:33:24 +01:00
Tim Bentley
dcf97bf93b
head
2015-12-05 12:45:01 +00:00
Jonathan Springer
3b3c8a35b6
merge trunk
2015-11-29 17:57:37 -05:00
Tim Bentley
6a48bb5ac2
Style fixes
2015-11-28 20:13:16 +00:00
Tim Bentley
3a31f86e84
Head
2015-11-28 17:05:06 +00:00
Tim Bentley
64867b52a8
Add tests for Presentations
2015-11-28 17:04:46 +00:00
Tomas Groth
be222ca597
Fix tests that fails on py35.
2015-11-25 22:47:56 +01:00
Tim Bentley
a5a2b8b02b
fix remote call data
2015-11-15 15:13:40 +00:00
Tim Bentley
b4d7798300
fix join in tests
2015-11-08 21:23:15 +00:00
Tim Bentley
97e3eea173
and add tests
2015-11-08 21:07:48 +00:00
Jonathan Springer
285e12bc9d
PEP8
2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49
Migrate to PyQt5
2015-11-06 19:49:40 -05:00
Tomas Groth
f712b35b08
pep8 fixes
2015-10-27 22:36:52 +00:00
Tomas Groth
a8c5f8cb52
Make test windows-only, again.
2015-10-27 15:15:22 +00:00
Tomas Groth
fc5f2e1018
Improve the worshipcenter pro importer and updated test.
2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3
Added test for zionworx file import.
2015-10-27 13:16:48 +00:00
Tomas Groth
4488fedfdc
Fix SongPro import. Fixes bug 1489376.
...
Fixes: https://launchpad.net/bugs/1489376
2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt
fc3a5f27c9
Add test
2015-08-26 10:50:38 +02:00
Tomas Groth
8b1c81f00a
Ignore Libre/OpenOffice exceptions if we are closing it.
2015-08-03 19:54:00 +01:00
Tomas Groth
25ce352047
Fix traceback in OSIS import on empty verse tag.
2015-07-04 23:19:13 +01:00
Tomas Groth
5444614ced
Added songselect login except test
2015-06-24 21:26:52 +01:00
Chris Hill
c95ca007b5
updated unit test
2015-06-20 23:35:22 +01:00
Chris Hill
1e33b7c292
trunk
2015-06-14 22:00:54 +01:00
Chris Hill
ed9146ae06
fixed bug #1000729 'Support more song fields in the search' - added unit tests
...
Fixes: https://launchpad.net/bugs/1000729
2015-06-14 21:58:56 +01:00
Tomas Groth
1b332c1580
Fix PDF reader using wrong maindisplay size.
2015-06-10 17:05:29 +02:00
Tomas Groth
a5cebb73c4
trunk
2015-05-25 21:58:05 +01:00
Tomas Groth
4266d9cbdf
For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
...
Fixes: https://launchpad.net/bugs/1458056
2015-05-25 12:11:04 +01:00
d354bcf365
Test that the overridden method does the right thing
2015-05-17 23:13:05 +02:00
Tomas Groth
51b37de551
Fix a powerpoint test and make it run on all platforms.
2015-05-05 15:20:24 +02:00
Tomas Groth
a7a71237c0
Added tests of powerpoint blanking.
2015-05-01 21:54:05 +01:00
Tomas Groth
ae785815c8
Fix test on windows.
2015-04-22 22:05:46 +01:00
Tomas Groth
cbeece7375
Added test for on_delete_click in the image plugin.
2015-04-22 21:57:33 +01:00
Tomas Groth
67ecf9b901
Take focus back if Powerpoint steals it - fixes bug 1423913.
...
Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847.
Made OpenLP respect hidden slides. Improved logging in case of errors.
For Impress, go to previous effect instead of the previous slide.
bzr-revno: 2527
Fixes: https://launchpad.net/bugs/1423913 , https://launchpad.net/bugs/1194847
2015-04-03 20:36:02 +02:00
Tomas Groth
d5804567b5
Added test + some cleaning
2015-04-02 09:33:46 +01:00
02128c85f0
Fix bug #1437771 : Clear the song after every import
...
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)
Fixes: https://launchpad.net/bugs/1437771
2015-03-31 22:58:51 +02:00
Tomas Groth
3f8a7975ee
Test fix
2015-03-30 15:31:41 +02:00
Tomas Groth
f8084059ba
Added test + small fixes.
2015-03-18 22:04:30 +00:00
cecde62157
Fix bug #1411433 by moving some stuff around.
...
bzr-revno: 2522
2015-03-11 18:47:29 +00:00
Tomas Groth
8fe254e576
Added test
2015-03-10 23:46:37 +00:00
3c130cf201
Fix bug #1411433 by rearranging methods within the media plugin
...
Fixes: https://launchpad.net/bugs/1411433
2015-03-10 23:33:35 +02:00
Tomas Groth
aefe3e9cad
trunk
2015-03-09 20:42:28 +00:00
Tomas Groth
512df1451d
Use the language id when importing bibles. And fixed presentationcontroller tests.
2015-03-09 20:42:03 +00:00
88ceae517a
Fix code analysis
2015-03-02 21:21:41 +02:00
Oliver Wieland
408dd440ce
Fix bug #1424555 by setting the verse and not allowing it to change
...
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
2015-02-28 20:46:31 +02:00
e14c03166d
Minor style fixes
2015-02-28 01:02:19 +02:00
f843e5a8a0
HEAD
2015-02-28 00:30:47 +02:00
7d7fec194e
Fix bug #1423699 so that you're not logged out when you want to import more songs.
...
Fixes: https://launchpad.net/bugs/1423699
2015-02-28 00:28:24 +02:00
Oliver Wieland
6aff21c784
Changed test descrition
2015-02-27 20:33:49 +01:00
Oliver Wieland
07c997817d
added test
2015-02-23 19:30:45 +01:00
3a2cd7472b
Fix duplicate test names in songselect test
...
bzr-revno: 2507
2015-02-21 12:43:09 +00:00
e0c44c4b9f
Rename test to match file import type
2015-02-18 14:39:02 -08:00
872d5b9d26
Fix duplicate test names
2015-02-18 14:04:29 -08:00
Tim Bentley
870b69b497
Remove cache for http authentication
...
bzr-revno: 2503
2015-02-17 19:49:16 +00:00
Tomas Groth
0617ce3dc9
trunk
2015-02-16 21:02:58 +00:00
Tim Bentley
57efed63a3
fix comments
2015-02-16 20:56:39 +00:00
Tomas Groth
aef91445ca
Handle OSError exception when creating files in various places. Fixes bug 1416888.
...
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tim Bentley
58f10d3b6b
Fix cache for http authentication
2015-02-14 09:12:35 +00:00
Tomas Groth
81de433df4
Added test for csvbible import
2015-02-13 23:01:07 +00:00
Tomas Groth
2cdc1b2fe4
Remove print
2015-02-06 22:21:01 +00:00
Tomas Groth
5b717db63a
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
...
Fixes: https://launchpad.net/bugs/1417033
2015-02-02 20:40:31 +00:00
Tomas Groth
1b75cc9c6b
Fallback to manual encoding detection.
2015-01-29 21:15:39 +00:00
Tomas Groth
4c53cb5184
Added tests
2015-01-29 20:54:06 +00:00
Philip Ridout
5390ed5bac
Fixes Bug #1367141 : Presentations/Images with same name gets the same thumbnail
...
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)
Also added code to remove the old thumbnails.
bzr-revno: 2487
2015-01-24 18:24:51 +00:00
Philip Ridout
fe3d887fd7
Corrects Translation strings
...
bzr-revno: 2485
2015-01-22 19:47:16 +00:00
Philip Ridout
c43823a2b0
Fixes the copyright headers
...
bzr-revno: 2484
2015-01-22 19:46:04 +00:00
Phill Ridout
125f019486
test fixes
2015-01-22 17:52:48 +00:00
Phill Ridout
051db41e20
removed python3 string
2015-01-22 17:42:29 +00:00
Phill Ridout
75dff3d2be
HEAD
2015-01-22 17:31:00 +00:00
Phill Ridout
a64fdd8697
fix tests
2015-01-22 15:35:52 +00:00
Phill Ridout
7750f1ec11
Correct the rest of the headers
2015-01-22 13:31:25 +00:00
Philip Ridout
fa05d3110e
Image Name in Service Manager - bug1410456
...
bzr-revno: 2483
2015-01-21 21:12:30 +00:00
Tomas Groth
f53187e26a
Fix layout in player-settings. Fixes bug 1410772
...
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.
bzr-revno: 2482
2015-01-21 20:35:36 +00:00
Phill Ridout
e7793fc9fa
Pep fixes
2015-01-20 21:45:37 +00:00
Phill Ridout
7fda8043f5
Improve translation string
...
Fixes: https://launchpad.net/bugs/1412234
2015-01-20 21:38:34 +00:00
Phill Ridout
88f69ea7c4
doc strings an typos
2015-01-20 07:14:58 +00:00
Phill Ridout
f1f0ab9c3d
pep fixes
2015-01-19 22:59:49 +00:00
Phill Ridout
63f68d344f
pep fixes
2015-01-19 22:56:30 +00:00
Phill Ridout
e3f147a226
Fixes 1410456 and adds a couple tests
...
Fixes: https://launchpad.net/bugs/1410456
2015-01-19 22:49:18 +00:00
de213b0f66
Copyright cleanup time,
...
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
Tomas Groth
685b2fde32
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175
...
Fixes: https://launchpad.net/bugs/1405172 , https://launchpad.net/bugs/1405175
2015-01-18 20:38:03 +00:00
ffcea13021
Updated the copyright.
2015-01-18 15:39:21 +02:00
Tomas Groth
36e4b0c8eb
Attempt to fix WorshipCenterProImport init under wine tests
2015-01-16 16:25:25 +01:00
Tomas Groth
1efc145cdf
PEP8 fixes
2015-01-14 12:32:27 +01:00
5bfb5b5426
Add .bin file import support.
...
Sometime prior to 2015, SongSelect changed the default file name for USR files to .bin.
bzr-revno: 2474
2015-01-11 20:27:27 +00:00
4859e9866d
Add .bin support for CCLI file import
2015-01-11 10:37:50 -08:00
0b2445b9a2
Fix spacing
2015-01-09 10:53:36 -08:00
Ken Roberts
7277e3e92a
Remove unneeded Registry modification
2015-01-08 10:55:26 -08:00
Ken Roberts
3f3c4cf80b
remote next/previous call test
2015-01-08 10:07:36 -08:00
Phill Ridout
3cafbfd0ed
Typo in comments fixed
2015-01-02 11:54:42 +00:00
Phill Ridout
9fef267fd3
Changed the year
2015-01-02 11:42:17 +00:00
Phill Ridout
b9f09142ed
HEAD
2015-01-02 11:40:51 +00:00
Tim Bentley
f3c09af379
Years go by
2014-12-31 10:58:13 +00:00
Phill Ridout
52c7d89706
removal of util function
2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b
Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized
2014-12-30 11:21:06 +00:00
Phill Ridout
3cf2a21ca2
fix tests
2014-12-30 09:03:35 +00:00
Phill Ridout
36417083ce
head
2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt
c5d716f565
Test
2014-12-24 14:21:17 +01:00
Phill Ridout
c9e1dcceff
head
2014-12-23 18:57:04 +00:00
Tim Bentley
98a3cd127f
Update code to 2.2 from 2.1 so translators can get working!
...
bzr-revno: 2460
2014-12-22 21:55:44 +00:00
Tim Bentley
93d0314b7e
General fixes
2014-12-22 17:34:43 +00:00
Phill Ridout
4a9a7f2829
adds tests for bible media item
2014-12-19 22:02:45 +00:00
Phill Ridout
cb0e4dc7ba
added copyright header to test
2014-12-19 22:01:15 +00:00
Tim Bentley
927e610977
Fix tests
2014-12-18 21:15:14 +00:00
Tim Bentley
5686e85384
Fix custom duplication bug
2014-12-16 07:47:46 +00:00
Tomas Groth
80a8434458
Added one more test for song db upgrade
2014-11-25 15:11:18 +01:00
Tomas Groth
4ca013e211
Added test for song db upgrade
2014-11-25 12:25:41 +01:00
93706f8d99
Fix for overwriting files on song export + test. Fixes bug 1216232.
...
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.
bzr-revno: 2447
2014-11-19 20:59:27 +00:00
Tomas Groth
c85f49a16c
Added test for openlyrics export of songs with same title and author
2014-11-16 22:44:44 +00:00
Tomas Groth
9b517cd569
Improved support for verseorder in WA import
2014-11-11 11:38:24 +01:00
e9ec5d202c
[bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
...
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
Tomas Groth
ff4ddefa77
pep8 fix
2014-11-06 10:42:54 +01:00
Tomas Groth
02a159bf65
Added one more test file for WoW import
2014-11-05 14:04:43 +01:00
Tomas Groth
77c7da2d20
Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
...
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth
51f4539822
Added test for Word of Worship import
2014-11-03 15:36:27 +01:00
Tim Bentley
b20b114a7b
test fix
2014-11-01 11:06:17 +00:00
Tim Bentley
6323f8bba7
Add tests
2014-11-01 10:59:45 +00:00
Tim Bentley
afde4a25ad
Fix missing dummy values for debug
2014-10-27 20:22:57 +00:00
3771cb42a8
HEAD
2014-10-22 22:47:47 +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
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
Phill Ridout
07c693c8c8
Changed some of the comments
2014-10-21 21:08:37 +01:00
Samuel Mehrbrodt
806bb5973e
Merge trunk
2014-10-13 19:40:12 +02:00
Samuel Mehrbrodt
637c0060f9
Add test
2014-10-13 13:38:13 +02:00
Phill Ridout
3ea58aa4ca
change line endings
2014-10-06 20:41:29 +01: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
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
Tomas Groth
3769a01682
Small fixes
2014-09-08 22:48:49 +01:00
Tomas Groth
7fecaa1d70
Added language detection when importing
...
Fixes: https://launchpad.net/bugs/1214875
2014-08-27 15:10:33 +02:00
Tomas Groth
c50619212d
trunk
2014-08-25 21:34:54 +01:00
Tomas Groth
359a209341
Fixed copy/paste error.
2014-08-25 21:31:35 +01:00
Tomas Groth
a48589752f
Moved thumbnail setting into the main settingstab.
2014-08-25 21:04:33 +01:00
Tomas Groth
71a1b26e1c
Changed test desciption.
2014-08-24 16:14:29 +01:00
Tomas Groth
3101d72b48
Rewrote OSIS import, added tests.
2014-08-24 15:40:45 +01:00
Tomas Groth
43d3823bfb
trunk
2014-08-24 15:38:17 +01:00
Tomas Groth
254acf4601
trunk
2014-08-24 15:37:51 +01:00
Samuel Mehrbrodt
c1d82bdf54
Merge trunk
2014-08-24 13:34:14 +02:00
Tomas Groth
3a1fda85d5
Fixed windows test failure by removing special char from filenames
2014-08-21 14:51:34 +02:00
Samuel Mehrbrodt
0bf256070a
Add test
2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt
16399e2ea5
This prevents updates from running (which should only run on outdated databases that existed before)
...
bzr-revno: 2408
2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt
fa5787e5d8
Add test
2014-07-17 23:16:00 +02:00
Tomas Groth
00693b8cce
trunk
2014-07-15 15:41:34 +02:00
Tomas Groth
b6cd13fc91
pep8 fixes
2014-07-15 12:02:56 +02:00
Tomas Groth
e1c00f9689
Fix tests for pptview - again
2014-07-15 11:50:52 +02:00
Tomas Groth
0a018a59fb
Fix tests for pptview
2014-07-15 11:45:23 +02:00
Tomas Groth
597e06153c
Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes
2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt
d5a3651c95
Merge trunk
2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt
b2afbd688d
Add an importer for PowerPraise
...
bzr-revno: 2404
2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt
6c40962afb
Allow editing of author types and fix bug in servicemanager
...
bzr-revno: 2403
2014-07-14 17:25:59 +01:00
Tomas Groth
88fc41a5eb
Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py
2014-07-14 16:15:08 +02:00
Tomas Groth
022ac9bfac
trunk
2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt
79c5d61d94
Negative test
2014-07-12 22:00:58 +02:00
Tomas Groth
3edabb268e
removed websockets
2014-07-11 22:35:23 +02:00
Tomas Groth
98a58d45bf
pep8 fixes
2014-07-11 15:35:44 +02:00
Tomas Groth
52f298fdc1
change to unix style lineending
2014-07-11 14:54:00 +02:00
Tomas Groth
4920f86351
removed leftover file from merge
2014-07-11 14:21:49 +02:00
