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

14279 Commits

Author SHA1 Message Date
Ken Roberts c35a2d1430 String conversions with templates part 1 
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
 2016-08-10 19:29:21 +01:00
Tim Bentley 80f927f5d6 Tidy up code more 2016-08-08 22:01:09 +01:00
Ken Roberts ff56739f35 String format error 2016-08-07 14:08:03 -07:00
Ken Roberts a89495063e merge trunk 2016-08-07 13:52:42 -07:00
Ken Roberts 1ff94a74a3 Qt5 updates for projector/signal mismatches 2016-08-07 13:51:35 -07:00
Tim Bentley 3593e21033 Add media endpoints 2016-08-07 20:08:29 +01:00
Tim Bentley cade36a332 Head 2016-08-07 19:37:15 +01:00
suutari.olli@gmail.com fb105f2e0b This branch introduces following improvements to Quick Bible search: 
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
  (E.g. added actual example verses to Reference error)
- 3 New settings for controllin...

bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
 2016-08-07 19:33:46 +01:00
Ken Roberts 61b591f555 pep8 2016-08-05 12:57:25 -07:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Ken Roberts b41b4a5918 Fix some todo notes 2016-08-05 12:18:47 -07:00
phill.ridout@gmail.com 0b1adffdab Part 1 - Moves the language names out of the database in to a module so that they can be translated. 
bzr-revno: 2685
 2016-08-04 22:41:18 +02:00
Philip Ridout 160cc163fc part 2 - db changes 2016-08-04 21:37:04 +01:00
Philip Ridout 37a5050c38 Removed language table from database 2016-08-04 20:18:40 +01:00
Philip Ridout 8257dbb282 HEAD 2016-08-03 21:27:05 +01:00
Philip Ridout bf28102401 More style fixes 2016-08-03 21:17:48 +01:00
Philip Ridout d9d740ad8b Style fixes 2016-08-03 21:10:41 +01:00
Philip Ridout db00a3980f Missed tests 2016-08-03 20:56:53 +01:00
Philip Ridout 60767c8ce4 Fixes bug #917164. A start on refactoring bibles 2016-08-03 18:26:10 +01:00
second@tgc.dk 5f73d3514c Fix a few pylint issues and only run the pylint test if mentioned in the nosetest arguments. 
bzr-revno: 2684
 2016-08-02 22:16:27 +02:00
Tomas Groth 82faa1da5e Change pylint test so it works with nose2 2016-08-02 21:32:36 +02:00
Tomas Groth c473212107 Added pylint test to jenkins script, and fixed a format error. 2016-08-02 20:57:10 +02:00
Tomas Groth 7ca7ae9c07 Ignore distutils errors 2016-08-01 20:49:01 +02:00
Tomas Groth 76be31fee1 Only run pylint tests if specified. 2016-08-01 20:00:58 +02:00
Tomas Groth 189b2dd400 Improve pylint testing, fixed a few issues. 2016-08-01 19:42:29 +02:00
suutari-olli 7a4ed4813a - Replaced the new icons with 48x48 versions. 2016-07-31 14:01:03 +03:00
suutari-olli feba589d07 - Lock button now gives focus to Search field. 2016-07-30 22:49:37 +03:00
suutari-olli 3937fbccf9 - Changed the Clear button to use QToolButton instead of QPushButton. 
(Fixes the issue where the clear button is larger than the lock button).
 2016-07-30 18:19:44 +03:00
suutari-olli 55ff6d6ff1 - Removed the clean icon manual sizing. 2016-07-28 23:30:14 +03:00
suutari-olli 0923ca6a40 - Merged trunk on 28.7.16 2016-07-28 22:57:21 +03:00
second@tgc.dk 291c9c8902 Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384. 
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.
Make easyslide importer try to recover when reading non-standard xml. Fixes bug 1588822.
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.

bzr-revno: 2683
Fixes: https://launchpad.net/bugs/1562384, https://launchpad.net/bugs/1588822, https://launchpad.net/bugs/1594945, https://launchpad.net/bugs/1599999
 2016-07-27 21:11:22 +02:00
Tomas Groth 449b46ab3d merge trunk 2016-07-27 21:01:57 +02:00
raoul@snyman.info 39e6ba873f Fix the "ret_value" problem created by a little too much linting. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-retvalue (revision 2684)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1666/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1577/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1515/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1280/
[SUCCESS] https://ci.openlp.io/job/Branch-0...

bzr-revno: 2682
 2016-07-25 10:07:12 +02:00
Raoul Snyman 0dcae022bc some pep8 fixes 2016-07-24 22:49:00 +02:00
Raoul Snyman ea455d9b32 Write some tests 2016-07-24 22:41:27 +02:00
Tomas Groth 031ae9ebc1 Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384. 
Fixes: https://launchpad.net/bugs/1562384
 2016-07-24 21:49:29 +02:00
suutari-olli b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
suutari-olli aae7de5899 Changed icons to oxygen icons. 2016-07-24 21:54:34 +03:00
Raoul Snyman ebefc03674 Fix the disappearance of a variable :-) 2016-07-23 23:41:24 +02:00
Tim Bentley 6ea956f432 fix tests 2016-07-23 06:24:28 +01:00
Tim Bentley 6d9d2ef32e remove broken test 2016-07-23 06:14:20 +01:00
Tim Bentley a4ce16809e remove directory 2016-07-23 06:00:01 +01:00
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01:00
Tim Bentley 25a43669d7 fix test 2016-07-23 05:48:36 +01:00
second@tgc.dk c426b8c1a2 "Added a test using pylint to test the code for the most serious issues. 
Added pylintrc for finding more potential issues with pylint (not used in the test).
Made some fixes as suggested by pylint."

bzr-revno: 2681
 2016-07-21 23:32:25 +02:00
Ken Roberts 0150291e4d "- Convert calls to md5_hash and qmd5_hash to use UTF-8 for non-ascii characters 
- Fixed test to verify UTF-8 returns valid ASCII hash
- Switch back to qmd5_hash to stay within the Qt framework

--------------------------------
lp:~alisonken1/openlp/projector-cleanups (revision 2679)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1646/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1495/
[SUCCESS] https://ci.o..."

bzr-revno: 2680
 2016-07-21 23:29:58 +02:00
raoul@snyman.info 0b8b88a587 "Fix a permission error that people keep on getting but we never actually log and fix. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error (revision 2682)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1656/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1567/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1505/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1271/
[SUCCESS] https://c..."

bzr-revno: 2679
 2016-07-21 23:26:09 +02:00
Tim Bentley ea846abab2 clean up tests 2016-07-20 20:59:02 +01:00
Tim Bentley 2c85e3cb36 more tests 2016-07-19 21:47:55 +01:00
Raoul Snyman 785257020d Fix some linting issues 2016-07-17 21:46:06 +02:00