lp:~oliwee/openlp/selecttimesource

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openlp

Andreas Preikschat (community): Needs Fixing on 2015-05-09

Oliver Wieland: Pending requested 2015-02-28

Tim Bentley: Pending requested 2015-02-28

Raoul Snyman: Pending requested 2015-02-28

Diff: 307 lines (+118/-12)

7 files modified

openlp/plugins/remotes/html/stage.js (+24/-8)
openlp/plugins/remotes/lib/__init__.py (+9/-0)
openlp/plugins/remotes/lib/httprouter.py (+10/-2)
openlp/plugins/remotes/lib/remotetab.py (+18/-0)
openlp/plugins/remotes/remoteplugin.py (+2/-2)
tests/functional/openlp_plugins/remotes/test_remotetab.py (+2/-0)
tests/functional/openlp_plugins/remotes/test_router.py (+53/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2503. By Oliver Wieland on 2015-02-28

forgot to remove sortKeys

2502. By Oliver Wieland on 2015-02-28

removed change with sorted JSON and adjust test

2501. By Oliver Wieland on 2015-02-27

merged with r2513

2500. By Oliver Wieland on 2015-02-16

updated to trunk

2499. By Oliver Wieland on 2015-02-16

completed poll_test

2498. By Raoul Snyman on 2015-02-15

A little help with a unit test

2497. By Oliver Wieland on 2015-02-15

incomplete test

2496. By Oliver Wieland on 2015-02-08

fixed error on loading remote settings

2495. By Oliver Wieland on 2015-02-08

New function: Select time source for remote view
  Client (default): show the time of the client PC
  Server: show the time of the server PC
  NoTime: don't show any time

2494. By Phill on 2015-02-01

Fixes #1414585 Thumbnail of images isn't shown in stage view and remote control
and #1414585 2.1.2 Traceback on Presentations for MAC