lp:~stolowski/unity-scope-click/two-scopes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scope-click/devel at revision 282

Alejandro J. Cura (community): Approve on 2014-06-04

PS Jenkins bot (community): Approve (continuous-integration) on 2014-06-04

Diff: 1160 lines (+735/-115)

25 files modified

CMakeLists.txt (+10/-5)
data/CMakeLists.txt (+41/-19)
data/clickscope.ini.in.in (+8/-0)
data/com.canonical.scopes.clickstore.ini.in.in (+3/-3)
libclickscope/click/interface.cpp (+0/-5)
libclickscope/click/preview.cpp (+28/-0)
libclickscope/click/preview.h (+7/-0)
libclickscope/click/scope_activation.cpp (+31/-0)
libclickscope/click/scope_activation.h (+13/-0)
po/POTFILES.in (+5/-3)
scope/CMakeLists.txt (+3/-2)
scope/clickapps/CMakeLists.txt (+37/-0)
scope/clickapps/apps-query.cpp (+218/-0)
scope/clickapps/apps-query.h (+82/-0)
scope/clickapps/apps-scope.cpp (+158/-0)
scope/clickapps/apps-scope.h (+71/-0)
scope/clickstore/CMakeLists.txt (+8/-7)
scope/clickstore/store-query.cpp (+3/-39)
scope/clickstore/store-query.h (+2/-5)
scope/clickstore/store-scope.cpp (+2/-2)
scope/tests/CMakeLists.txt (+1/-1)
scope/tests/click_interface_tool/CMakeLists.txt (+1/-1)
scope/tests/download_manager_tool/CMakeLists.txt (+1/-1)
scope/tests/integration/CMakeLists.txt (+1/-1)
scope/tests/test_query.cpp (+1/-21)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

301. By Paweł Stołowski on 2014-06-04

Make it more like current design draft.

300. By Paweł Stołowski on 2014-06-03

Minor cleanup.

299. By Paweł Stołowski on 2014-06-03

Added an fallback preview for fake store scope.

298. By Paweł Stołowski on 2014-06-03

Only display store if name matches search.

297. By Paweł Stołowski on 2014-06-03

Merged devel.

296. By Paweł Stołowski on 2014-05-28

Fix icon.

295. By Paweł Stołowski on 2014-05-28

Add fake store after results.

294. By Paweł Stołowski on 2014-05-28

Put store link in a separate category.

293. By Paweł Stołowski on 2014-05-28

Make uninstall action in apps query issue new search request instead of displaying 'install' preview.

292. By Paweł Stołowski on 2014-05-27

Removed unneeded test for null category. Commented test for pushing local results for now (needs a new test).