lp:~flscogna/ubuntu-terminal-app/ubuntu-terminal-app

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-terminal-app at revision 128

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-08-28

Alan Pope 🍺🐧🐱 🦄 (community): Approve on 2014-08-28

Diff: 1196 lines (+871/-78)

10 files modified

apparmor.json (+1/-1)
po/com.ubuntu.terminal.pot (+73/-32)
src/app/qml/ColorDialog.qml (+166/-0)
src/app/qml/Configs.qml (+205/-4)
src/app/qml/GraphicalTerminal.qml (+130/-0)
src/app/qml/ShaderTerminal.qml (+143/-0)
src/app/qml/Terminal.qml (+58/-25)
src/app/qml/config/JsConfig.qml (+86/-11)
src/app/qml/ubuntu-terminal-app.qml (+7/-3)
src/plugin/konsole/TerminalDisplay.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

119. By Filippo Scognamiglio on 2014-08-26

Merged with new trunk.

118. By Filippo Scognamiglio on 2014-08-26

Fixes for upstream merge.

117. By Filippo Scognamiglio on 2014-08-26

Parameters fine tuning. Settings page is now taller.

116. By Filippo Scognamiglio on 2014-08-26

Fix: Jitter was not working without noise.

115. By Filippo Scognamiglio on 2014-08-26

Small reorganization in Terminal.qml to make screen curvature and keyboard play together.

114. By Filippo Scognamiglio on 2014-08-26

Improved fake frames reflections.

113. By Filippo Scognamiglio on 2014-08-26

Added color dialog. The screen color can now be set in the settings page. (Colors might be improved).

112. By Filippo Scognamiglio on 2014-08-26

Added global effect switch.

111. By Filippo Scognamiglio on 2014-08-26

Fix wrong import.

110. By Filippo Scognamiglio on 2014-08-25

Merged last version from trunk.