lp:unity-scopes-shell/rtm-14.09

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-scopes-shell at revision 125

Unity Team: Pending requested 2014-08-19

Diff: 707 lines (+330/-62)

16 files modified

debian/changelog (+12/-0)
debian/control (+1/-2)
src/Unity/CMakeLists.txt (+1/-2)
src/Unity/collectors.cpp (+52/-12)
src/Unity/collectors.h (+1/-1)
src/Unity/scope.cpp (+26/-7)
src/Unity/scope.h (+2/-0)
src/Unity/settingsmodel.cpp (+48/-27)
src/Unity/settingsmodel.h (+13/-8)
tests/CMakeLists.txt (+1/-1)
tests/data/CMakeLists.txt (+1/-0)
tests/data/mock-scope-info/CMakeLists.txt (+15/-0)
tests/data/mock-scope-info/mock-scope-info.cpp (+121/-0)
tests/data/mock-scope-info/mock-scope-info.ini.in (+5/-0)
tests/registry-spawner.h (+1/-1)
tests/resultstest.cpp (+30/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

155. By CI Train Bot Account on 2015-04-30

Releasing 0.5.4+15.04.20150430.1~rtm-0ubuntu1

154. By Paweł Stołowski on 2015-04-30

Delay change notifications received from scope registry. Fixes: #1446499

Merged branch lp:~stolowski/unity-scopes-shell/fix-1446499-rtm

Bug #1446499: Updating scope from store removes it from favorites

153. By CI Train Bot Account on 2015-02-26

Releasing 0.5.4+15.04.20150226~rtm-0ubuntu1

152. By Pete Woods on 2015-02-26

Manage location activations with shared pointers instead of manual reference counting Fixes: #1422879

Merged branch lp:~unity-api-team/unity-scopes-shell/fix-location-refcount-bug

Bug #1422879: GPS stays active after location data is used by a scope (even after not not using the scopes anymore)

151. By CI Train Bot Account on 2015-02-06

Releasing 0.5.4+15.04.20150206.1~rtm-0ubuntu1

150. By Timo Jyrinki on 2015-02-06

Add a new changelog entry manually.

Merged branch lp:~timo-jyrinki/unity-scopes-shell/new_changelog_entry

149. By Marcus Tomlinson on 2015-02-06

Allow scope ID to be optional in a log-in result's online_account_details map. Fixes: #1415595
Approved by: Pawel Stolowski

Merged branch lp:~marcustomlinson/unity-scopes-shell/oa_allow_no_scope_id-rtm

Bug #1415595: Instagram Photos scope and Photos scope don't recognize Instagram online account

148. By Timo Jyrinki on 2015-02-05

Include the changelog entry (but changelog entry only) for 0.5.4+15.04.20150126~rtm.is.0.5.4+15.04.20150120~rtm-0ubuntu1 so that trunk can be relanded again.

147. By CI Train Bot Account on 2015-01-26

Releasing 0.5.4+15.04.20150126~rtm-0ubuntu1

146. By Marcus Tomlinson on 2015-01-26

Read scope ID from the OA details embedded in a log-in item Fixes: #1414560

Merged branch lp:~marcustomlinson/unity-scopes-shell/fix_acl-rtm

Bug #1414285: Logging into facebook from the photos scope didn't display any photos

Bug #1414560: Parent scope is authorised when logging in to a child scope