Merge lp://qastaging/~unity-team/unity-lens-video/split-online-results into lp://qastaging/unity-lens-video
Proposed by
Michal Hruby
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~unity-team/unity-lens-video/split-online-results |
| Merge into: | lp://qastaging/unity-lens-video |
| Diff against target: |
1187 lines (+1153/-0) (has conflicts) 6 files modified
COPYING (+674/-0) MANIFEST.in (+4/-0) setup.py (+16/-0) src/unity-scope-video-remote (+453/-0) unity-scope-video-remote.service (+3/-0) video-remote.scope (+3/-0) Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file MANIFEST.in. Moved existing file to MANIFEST.in.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file src. Moved existing file to src.moved. |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity-lens-video/split-online-results |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Videos lens | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-09-14.
Commit message
Add the split parameter to the queries
Description of the change
Update to match latest designs - the scope now adds the 'split' parameter to the query to distinguish "online" and "suggestion" results.
To post a comment you must log in.
Unmerged revisions
- 59. By Michal Hruby
-
A few more tweaks
- 58. By Michal Hruby
-
Update to match latest designs
- 57. By Jim Hodapp
-
Added details to the Amazon video preview. Fixes: . Approved by Pawel Stolowski.
- 56. By Ken VanDine
-
0.3.7
- 55. By Paweł Stołowski
-
Implementation of previews. Fixes: . Approved by Michal Hruby.
- 54. By David Callé
-
New project architecture
- 53. By David Callé
-
Add missing changelog entry
- 52. By David Callé
-
Update changelog
- 51. By David Callé
-
Depends on gvfs-bin
- 50. By David Callé
-
Exit on dbus unavailability, Unity will take care of restarting the scope, eventually disabling for the session if it fails more than a few times
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
