lp:~zhangew401/scope-aggregator/fix-lp-1604212

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:scope-aggregator at revision 168

Kyle Nitzsche (community): Approve on 2016-07-19

Gary.Wang: Approve on 2016-07-19

Penk Chen: Pending requested 2016-07-19

Diff: 38 lines (+11/-5)

2 files modified

CMakeLists.txt (+1/-1)
src/utils.cpp (+10/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1604212: child_department in category->scopes doesn't work

Critical

Fix Released

Link a bug report

Related blueprints

168. By Zhang Enwei on 2016-07-19

fix lp:1604212

167. By Kyle Nitzsche on 2016-07-13

release version 4.9. fixes fallback handling (bug 1599948)

166. By Kyle Nitzsche on 2016-06-30

remove reference to icond dir in cmake

165. By Gary.Wang on 2016-06-30

1.compile time optimization for string(QStringLiteral).
2.load the various json files once aggregator scope startup.
3.specify 'const' keyword for some variable in some cases.
4.pass by reference instead of by value if possible.
5.don't allocated memory(make_shared) based on local variable to avoid copy constructor.
6 remove duplicate obj creation.
7.fix invalid pointer for us::Category::SCPtr when look_up is called.
8.remove redundant files.

164. By Kyle Nitzsche on 2016-06-28

scope-agg projects no longer require a separate hints child scope to
provide quick start help or to provide the no netork of the no location
message. All scopes rebasing on 4.8 must change their hints.json file
since the structure is now chagned.

See 4.8-rebase-local-hints-README.md for complete details.

163. By Kyle Nitzsche on 2016-04-27

merge branch with many changes:
* in handle_child_scope_results(), check if the query is still
  valid. If not, then return.
* do not save ptrs to categories. Instead, use from shell if already registered, else register and then use it from shell.
* feature testing with some new parts and some fixes

162. By Kyle Nitzsche on 2016-04-18

release 4.6: strip binary per 1570568

161. By Gary.Wang on 2016-03-11

1.Fix duplicated scope ids issue(lp:1554411) which blocks child scopes search)
2.Fix compiler warning

160. By Kyle Nitzsche on 2016-03-03

Merge that works withi/requires 1.0 version of hints scope as follows:

Previously when hints quickstart displayed and user tapped "Skip" button
the hints scope set the uri on the Skip button result like so:
scope://com.canonical.scopes.dashboard_dashbiard?q=start

The result was that the "start" string displayed in the agg scope search
box, which is not great.

The agg scope looked for an incoming query string of "start" and if found
it treated it as signal to dismiss hints quick start (by writing a file
to cache dir, a file that is checked on every refresh).

This merge changes the expectation of the agg scope as follows:

The signal to dismiss hints now takes the form of user_data of
"hide_quickstart" in the incoming uri, for example:
        std::string data = query().user_data().get_string();
        if (data == "hide_quickstart")
        ... then write the file to dismiss hints.

159. By Kyle Nitzsche on 2016-03-03

use actual runtime id of agg scope in those log messages that were not
previously using them, fixing lp:1549844