lp:~michael-sheldon/ubuntu-keyboard/emoji

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-keyboard at revision 261

PS Jenkins bot: Approve (continuous-integration) on 2014-12-10

Bill Filler (community): Approve on 2014-12-10

Ken VanDine: Approve on 2014-12-09

Diff: 1131 lines (+822/-20)

29 files modified

debian/control (+8/-0)
debian/ubuntu-keyboard-emoji.install (+1/-0)
plugins/emoji/emoji.pro (+9/-0)
plugins/emoji/qml/Keyboard_emoji.qml (+188/-0)
plugins/emoji/qml/Keyboard_emoji_email.qml (+93/-0)
plugins/emoji/qml/Keyboard_emoji_url.qml (+92/-0)
plugins/emoji/qml/Keyboard_emoji_url_search.qml (+94/-0)
plugins/emoji/qml/emoji.js (+14/-0)
plugins/emoji/qml/qml.pro (+20/-0)
plugins/emoji/src/emojilanguagefeatures.cpp (+83/-0)
plugins/emoji/src/emojilanguagefeatures.h (+39/-0)
plugins/emoji/src/emojiplugin.cpp (+19/-0)
plugins/emoji/src/emojiplugin.h (+29/-0)
plugins/emoji/src/emojiplugin.json (+7/-0)
plugins/emoji/src/src.pro (+32/-0)
plugins/pinyin/src/chineselanguagefeatures.cpp (+5/-0)
plugins/pinyin/src/chineselanguagefeatures.h (+1/-0)
plugins/plugins.pro (+1/-0)
plugins/westernsupport/westernlanguagefeatures.cpp (+5/-0)
plugins/westernsupport/westernlanguagefeatures.h (+1/-0)
qml/KeyboardContainer.qml (+14/-2)
qml/keys/LanguageKey.qml (+8/-1)
qml/keys/LanguageMenu.qml (+1/-0)
src/lib/logic/abstractlanguagefeatures.h (+1/-0)
src/lib/logic/wordengine.cpp (+6/-1)
src/plugin/inputmethod.cpp (+1/-6)
src/plugin/inputmethod_p.h (+0/-9)
tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+5/-0)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+45/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1340598: Emoji support: Can't select an emoji

Wishlist

Fix Released

Link a bug report

Related blueprints

247. By Michael Sheldon on 2014-12-08

Add tests for emoji layout

246. By Michael Sheldon on 2014-12-08

Wrap emoji internal properties in 'internal' object

245. By Michael Sheldon on 2014-12-08

Don't enable preedit for plugins that don't supply a word engine implementation

244. By Michael Sheldon on 2014-12-08

Add missing emoji plugin json definition

243. By Michael Sheldon on 2014-12-05

Implement emoji plugin as separate plugin, instead of western languages based plugin

242. By Michael Sheldon on 2014-12-05

Fix instant switch back for emoji layout

241. By Michael Sheldon on 2014-12-05

Merge from trunk

240. By Michael Sheldon on 2014-12-05

Precalculate all valid emoji to allow for skipping of missing characters

239. By Michael Sheldon on 2014-12-03

Add missing emoji install file

238. By Michael Sheldon on 2014-12-03

Split emoji in to blocks of supported characters and wrap between those blocks