lp://qastaging/~knightrider0xd/openlp/ios-app-2.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp/2.4 at revision 2625

Raoul Snyman: Approve on 2016-04-26

Diff: 113212 lines (+56496/-56398)

4 files modified

openlp/core/resources.py (+56440/-56385)
openlp/plugins/remotes/lib/remotetab.py (+33/-13)
resources/images/openlp-2.qrc (+1/-0)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+22/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2627. By Ian Knight on 2016-04-26

Testing

2626. By Ian Knight on 2016-04-26

Added Test to HTML Builder

2625. By Ian Knight on 2016-04-18

Added QR code

2624. By Ian Knight on 2016-04-18

Added QR code and link for iOS app to remote plugin ui

2623. By Tim Bentley on 2016-04-03

"Fix the service when the theme changes"

2622. By Ken Roberts on 2016-03-03

"Bugfix #1550891 Projector manager rejecting replies as invalid (backport from trunk)

--------------------------------
lp:~alisonken1/openlp/2.4-bug-1550891 (revision 2622)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1306/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1228/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1002/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_I..."

2621. By Raoul Snyman on 2016-02-13

Release 2.4

2620. By Tim Bentley on 2016-02-13

Translations 1302

2619. By Tomas Groth on 2016-02-12

Fix for force-updating display on windows when using themes without transitions.
Pep8 fix + a test.

2618. By Raoul Snyman on 2016-02-12

"Fix the toggle song usage menu item not working

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1544263 (revision 2618)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1279/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1203/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1142/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/978/
Stopping after failure"