lp:~alecu/unity-scope-click/merge-trunk6

Branch merges

Propose for merging

No branches dependent on this one.

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

dobey (community): Approve on 2014-07-23

PS Jenkins bot (community): Approve (continuous-integration) on 2014-07-23

Diff: 90 lines (+44/-2)

4 files modified

debian/changelog (+33/-0)
debian/control (+3/-0)
debian/rules (+6/-0)
libclickscope/click/interface.cpp (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

358. By Alejandro J. Cura on 2014-07-23

Merged with tip of trunk

357. By Paweł Stołowski on 2014-07-22

Handle X-Ubuntu-Default-Department-ID key of .desktop files to support departments for preinstalled apps.

Approved by PS Jenkins bot, Rodney Dawes.

356. By Paweł Stołowski on 2014-07-22

Remove fallback to old server API if highlights call fails, this was needed only initially when server was not ready. Ensure we call ad highlights only if there was no network error (check general status, not the http code). Replaced assert with warning and early return. Fixes: https://bugs.launchpad.net/bugs/1343280.

Approved by Rodney Dawes, PS Jenkins bot.

355. By Paweł Stołowski on 2014-07-22

Only show apps category title when in the root of departments hierarchy. Updated the title to say "Apps" instead of "My apps".

Approved by PS Jenkins bot, Rodney Dawes.

354. By Alejandro J. Cura on 2014-07-22

Change the order of screenshot and header widgets; initial tests for previews.

Approved by PS Jenkins bot, Pawel Stolowski, Rodney Dawes.

353. By Paweł Stołowski on 2014-07-22

Make "Ubuntu store'" orange card carry current department id when browsing Apps by department and change its category title to "Get more apps like this from the Store". .

Approved by Alejandro J. Cura, PS Jenkins bot.

352. By Launchpad Translations on behalf of unity-team on 2014-07-22

Launchpad automatic translations update.

351. By dobey on 2014-07-21

Use dngettext to have the results string be pluralized. Fixes: https://bugs.launchpad.net/bugs/1346110.

Approved by Alejandro J. Cura, PS Jenkins bot.

350. By Paweł Stołowski on 2014-07-21

Ensure click apps scope opens an existing database only and doesn't attempt to initialize it.

Approved by Alejandro J. Cura, PS Jenkins bot, Rodney Dawes.

349. By Launchpad Translations on behalf of unity-team on 2014-07-21

Launchpad automatic translations update.