lp:~alisonken1/openlp/pjlink2-c-resources

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2739

Tomas Groth: Approve on 2017-05-22

Tim Bentley: Approve on 2017-05-20

Diff: 2 lines (+0/-0)

0 files modified

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2738. By Ken Roberts on 2017-05-19

Added old pjlink1 database to test resources

2737. By Ken Roberts on 2017-05-17

- Added PJLINK_DEFAULT_CODES to pjink1 imports
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on

--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...

2736. By Ken Roberts on 2017-05-17

Initial PJLink class 2 updates

- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO

--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...

2735. By Tomas Groth on 2017-05-17

Added support for chords in Chord Pro format (using brackets), with support for chord transposing and 3 different notations.
Added support for import of song in ChordPro file format
Added support for importing chords and verseorder from songbeamer.
Add support for export and import of chords in openlyrics
Added support for importing chords from opensong.
Added support for importing chords from videopsalm.
Added support for printing chords.

2734. By Ken Roberts on 2017-05-17

Added test data for upcoming PJLink2 changes. No code changes here.

--------------------------------
lp:~alisonken1/openlp/pjlink2-resource-data (revision 2733)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1980/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1890/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1831/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1212/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1077/
[SUCCESS] ht...

2733. By Raoul Snyman on 2017-05-10

Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now.

Windows tests are failing due to file sharing (we've had this issue before), unrelated to my changes.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/refactor-mock (revision 2734)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1992/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1902/
[SUCCESS] https://...

2732. By Phill on 2017-05-06

Fix the QFormLayout in BibleImportForm
Fix one of the tests that was skipped

lp:~phill-ridout/openlp/test_fixes (revision 2732)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1973/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1883/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1824/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1206/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1074/
[SUCCESS] https://ci.openlp.io/job/Branch-04c...

2731. By Tomas Groth on 2017-05-05

Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.

2730. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/...

2729. By Raoul Snyman on 2017-03-28

Fix a problem with loading Qt's translation files, bug #1676163

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1944/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1796/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1522/
[SUCCESS] https://ci.openlp.io/job/Branch...