raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
14,688 Commits 5 Branches 0 Tags 296 MiB
9204dc23a0
Commit Graph

14688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Ridout
9b41814511 Merge from yet-more-refactors 2016-08-27 14:33:21 +01:00
Philip Ridout
71dcd2079c HEAD 2016-08-27 14:27:12 +01:00
Olli Suutari
46a7c92a90 - Merged trunk 2016-08-25 22:27:55 +03:00
Olli Suutari
7fba73843b - Added the missing </strong> tag to expection form. (bug 1616441) 2016-08-25 22:24:59 +03:00
Philip Ridout
28d94b7d10 moved some static methods to module level 2016-08-21 21:36:59 +01:00
raoul@snyman.info
690d5e770a Fix bug #1547964 by ignoring the exception (it's harmless) 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots (revision 2697)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1657/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1595/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-...

bzr-revno: 2695
 2016-08-21 20:33:46 +02:00
Philip Ridout
dcd8d6f6b5 Remove upgrade code not needed since 2.2 2016-08-21 12:04:18 +01:00
Philip Ridout
3c29427866 Added some doc strings which I missed 2016-08-21 08:39:40 +01:00
Philip Ridout
aefcd48cc3 reverted changes to bibles http.py 2016-08-20 21:32:25 +01:00
Philip Ridout
894b4fbf10 revert changes to http.py due to circular references 2016-08-20 21:00:50 +01:00
Olli Suutari
4733aa2169 - Removed modifications to test_mainwindow. 2016-08-20 22:17:00 +03:00
Olli Suutari
8224e39a2c - Added test 2016-08-20 22:14:15 +03:00
Olli Suutari
685c01ec25 - Renamed test title from x_test to test_x 2016-08-20 21:59:31 +03:00
Philip Ridout
7c77d7e8bd Refactor of OpenSong Bible importer + 100% test coverage 2016-08-20 19:12:42 +01:00
Olli Suutari
cf65d6921e - Pep8 2016-08-20 02:46:20 +03:00
Olli Suutari
890b617fc7 - Fixed the same issue for the lock button. 2016-08-20 02:42:48 +03:00
Olli Suutari
b5c4cb1f85 - pep8 fix (2x blank line) 2016-08-20 01:53:20 +03:00
Olli Suutari
345978286b - Added a test. 2016-08-20 01:49:51 +03:00
Philip Ridout
46b6d041cd Opensong refactors and tests 2016-08-18 07:31:36 +01:00
Philip Ridout
6ab2686b09 Modify CSV Importer and test to give 100% coverage! 2016-08-16 21:36:21 +01:00
Philip Ridout
9d5829e3a5 head 2016-08-16 19:49:47 +01:00
Olli Suutari
4f900dbffb - Removed for_display=True which was causing traceback since it's apparently no longer used. 
- Added manual row split for the duplicated key error message. 
  (Looks bad to have 12 words in one row and then one word in the row after that)
 2016-08-15 19:37:53 +03:00
Olli Suutari
33aaf53c42 - Pep8 (Over ident fixed) 2016-08-15 00:14:35 +03:00
Olli Suutari
3ac99b3e28 - Merged trunk on 14/8/16 2016-08-15 00:04:22 +03:00
Olli Suutari
35758b306a - Restored the default Help shortcut. 2016-08-15 00:01:48 +03:00
Raoul Snyman
b657d255cc Remove blank line 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 22:58:27 +02:00
Raoul Snyman
693c18a23a Add some tests for the MediaShout importer 2016-08-14 22:48:36 +02:00
Olli Suutari
f3533885ec - Merged trunk on 14/8/16. 2016-08-14 23:21:21 +03:00
Olli Suutari
c77dd470c5 - Added the missing "clicked" to make the code easier to understand. 2016-08-14 23:19:54 +03:00
Philip Ridout
f08d0c28a5 further bible refactors 2016-08-14 11:00:27 +01:00
Tim Bentley
c6c7931323 head 2016-08-14 10:23:12 +01:00
Tim Bentley
4211bac47c Fix test 2016-08-14 10:22:28 +01:00
Raoul Snyman
c2b05e3454 Fix bug #1547964 by ignoring the exception (it's harmless) 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 10:24:17 +02:00
raoul@snyman.info
c763585250 Fix bug #1608194 by updated OpenLP to use the new SongSelect website. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194 (revision 2694)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1739/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1650/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1588/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1344/
[SUCCESS] https://ci.openlp.io/job/Branc...

bzr-revno: 2694
Fixes: https://launchpad.net/bugs/1608194
 2016-08-14 09:57:21 +02:00
Raoul Snyman
14b351f2ae HEAD 
Fixes: https://launchpad.net/bugs/1608194
 2016-08-13 16:57:38 +02:00
Raoul Snyman
fbd9b330a3 Fix another pep8 issues 2016-08-13 16:50:15 +02:00
Raoul Snyman
2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
Raoul Snyman
879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Tim Bentley
0ec8b40294 Add mocks 2016-08-13 14:47:19 +01:00
Tim Bentley
3b34721967 remove test 2016-08-13 06:25:40 +01:00
Tim Bentley
f38ad2cc14 move startup code 2016-08-13 06:18:46 +01:00
Tim Bentley
7f22d9c223 add files http_endpoint 2016-08-13 06:03:12 +01:00
Tim Bentley
43a539db64 remove http_endpoint 2016-08-13 06:02:54 +01:00
Tim Bentley
fa19108885 tidy up media 2016-08-12 20:16:39 +01:00
Philip Ridout
2416009860 HEAD 2016-08-12 20:16:12 +01:00
Tim Bentley
eceaf90a64 pep8 2016-08-12 20:03:35 +01:00
Tim Bentley
f2d936c3d3 pep8 2016-08-12 19:59:45 +01:00
Tim Bentley
b3f10eb852 fix test 2016-08-12 19:56:25 +01:00
Tim Bentley
225160be24 Head 2016-08-12 19:21:30 +01:00
raoul@snyman.info
c79917502b Update slot signatures to comply with PyQt5.6's stricter checks. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2693
 2016-08-12 18:28:34 +01:00