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

15448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phill
71eaccb547 Various fixes 
lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/               [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/                [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/B...

bzr-revno: 2788
 2017-11-16 18:52:59 +00:00
Raoul Snyman
5d16217a70 Add multi-to-one settings upgrading, and merge all the post-2.4 settings changes into __setting_upgrade_2__ 
Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/settings-upgrade (revision 2791)
https://ci.openlp.io/job/Branch-01-Pull/2295/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2196/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2074...

bzr-revno: 2787
 2017-11-16 18:52:40 +00:00
Phill Ridout
d216766586 Remove some unused imports 2017-11-16 17:43:17 +00:00
Phill Ridout
ab810734d8 Rework mediainfo fix 
Fixes: https://launchpad.net/bugs/1732348
 2017-11-16 17:17:47 +00:00
Raoul Snyman
fad67f7339 Add some more tests 2017-11-15 22:03:19 -07:00
Raoul Snyman
0bef29758c HEAD 2017-11-15 20:52:11 -07:00
Phill
1d1195d732 Add this to your merge proposal: 
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib9 (revision 2783)
https://ci.openlp.io/job/Branch-01-Pull/2286/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2187/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2068/               [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch...

bzr-revno: 2786
 2017-11-15 20:51:52 -07:00
Raoul Snyman
923dc1436e Remove monitor migration 2017-11-15 17:19:26 -07:00
Phill Ridout
3560b27bfb Use the OLDXML output type for the new version of mediainfo 
Fixes: https://launchpad.net/bugs/1732348
 2017-11-15 21:58:19 +00:00
Phill Ridout
35e13022a6 image media test fixes 2017-11-15 18:33:21 +00:00
Raoul Snyman
8c3fd99ed5 Fix missing line 2017-11-15 00:03:35 -07:00
Raoul Snyman
d05e39fc70 Fix up test after merges 2017-11-14 23:55:57 -07:00
Ken Roberts
d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
Raoul Snyman
1c10227c38 HEAD 2017-11-14 17:01:57 -07:00
Raoul Snyman
e5c9b7c98e Merge from upstream 2017-11-14 17:01:19 -07:00
Phill Ridout
4fbed73e95 Typo fix 2017-11-14 22:30:46 +00:00
Phill Ridout
2ccd6a01f0 Set the default filter in accordance to the current service file type 
Fixes: https://launchpad.net/bugs/1673251
 2017-11-14 22:13:38 +00:00
Phill Ridout
66bae6716c chage media replace background context icon, add replace and reset actions to image context menu 
Fixes: https://launchpad.net/bugs/1650358
 2017-11-14 17:35:37 +00:00
Raoul Snyman
1cb11832bd Added some tests for the settings upgrade and fixed a bug I had introduced. 2017-11-14 00:19:10 -07:00
Phill Ridout
4e9fcf2e50 Sort media items by natural order 
Fixes: https://launchpad.net/bugs/1625087
 2017-11-13 21:40:49 +00:00
Phill Ridout
4f769d5622 Fix the handler passing False 
Fixes: https://launchpad.net/bugs/1672777
 2017-11-13 21:31:54 +00:00
Phill Ridout
9606b99976 Fix md5 thumbnail regression 
Fixes: https://launchpad.net/bugs/1692187
 2017-11-13 20:07:20 +00:00
Phill Ridout
b1d88ac4f7 test fix 2017-11-11 16:36:50 +00:00
Phill Ridout
dc1ca6c071 head 2017-11-11 16:29:55 +00:00
Tim Bentley
5ae5d8c07e fix a couple of small issues 
lp:~trb143/openlp/refactorfixes (revision 2787)
https://ci.openlp.io/job/Branch-01-Pull/2278/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2180/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2061/               [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1391/                [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1216/                [SUCCESS]
https://ci.ope...

bzr-revno: 2785
 2017-11-11 08:36:22 -07:00
Phill Ridout
e763cd81df HEAD 2017-11-11 12:20:45 +00:00
Tim Bentley
12b71fc068 head 2017-11-11 08:35:02 +00:00
Raoul Snyman
6b0de04694 HEAD + Regrouped upgrades 2017-11-10 23:54:54 -07:00
Phill
f302b21c4c Fixed a number of bugs, and tests. 
Failing on Code Analysis2, but this looks like fallout from the refactors (it hasn't passed since the beginning of october)

Also contains superflys branch lp:~raoul-snyman/openlp/fix-linting

--------------------------------
lp:~phill-ridout/openlp/fixes-mkII (revision 2794)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2276/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2178/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests...

bzr-revno: 2784
 2017-11-10 22:36:52 -07:00
Phill Ridout
1c760e44e5 Small modification to upgrade settings as per superflys request 2017-11-10 22:50:04 +00:00
Phill Ridout
9dc68269aa Merge superflys branch 2017-11-10 20:39:39 +00:00
Raoul Snyman
c1dc7455db Change the Jenkins script to use the official Jenkins Python API module (python3-jenkins in Debian/Ubuntu and Fedora). Also updated the display a bit and added some helpful messaging. This script now uses your username and your password (or personal token) for authentication instead of a a shared token. 
$ python3 scripts/jenkins_script.py -h                                                             
usage: jenkins_script.py [-h] [-d] [-b] [-n] -u USERNAME -p PASSWORD

optional arguments:
 ...

bzr-revno: 2783
 2017-11-10 19:02:49 +00:00
Raoul Snyman
dd2d1002ce Fix up a couple of issues, and move URL creation to where the job info is pulled 2017-11-10 10:51:42 -07:00
Raoul Snyman
a9692f8391 Print out the build info before the build starts with a WAITING status 2017-11-10 09:36:06 -07:00
Raoul Snyman
ac61fb5a4f Make the heading line as long as the others 2017-11-10 08:57:35 -07:00
Raoul Snyman
c962493b37 HEAD 2017-11-10 08:53:53 -07:00
Ken Roberts
3d4ed035e9 PJLink2-L updates 2017-11-10 03:59:38 -08:00
Raoul Snyman
3a404f074c Merge in Phil's changes 2017-11-09 21:47:37 -07:00
Raoul Snyman
a408e3d74e Fix some linting issues, and fix the test for newer versions of PyLint 2017-11-09 21:11:03 -07:00
Tim Bentley
e0341ab3eb fix tests 2017-11-09 21:24:38 +00:00
Phill Ridout
536a187fb9 PEP8 2017-11-09 20:39:17 +00:00
Phill Ridout
881c3648cc Test fixes 2017-11-09 20:24:46 +00:00
Tim Bentley
7a345d5770 fix code 2017-11-09 19:55:01 +00:00
Tim Bentley
0d1bbe3417 add preview to live 2017-11-09 19:42:30 +00:00
Tim Bentley
1a0a828ad3 fix errors 2017-11-09 19:25:26 +00:00
Phill Ridout
6d66cadb0a head 2017-11-09 19:15:31 +00:00
Phill Ridout
83eaad48ad Fix action test failure by removing un used actions 2017-11-09 19:11:37 +00:00
Raoul Snyman
3140ea434d Add support for a multi to single setting migration 2017-11-08 22:06:48 -07:00
Phill Ridout
66534a58ab Head 2017-11-06 22:41:36 +00:00
Phill Ridout
312571b81b Head 2017-11-03 22:52:43 +00:00