lp://staging/~timeout-scope-team/timeout-scope/timeout_ready_for_publish

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/timeout

Michał Karnicki: Pending (optional) requested 2014-09-23

Diff: 3215 lines (+3000/-0) (has conflicts)

40 files modified

.bzrignore (+14/-0)
CMakeLists.txt (+48/-0)
COPYING.txt (+674/-0)
NOTICE.txt (+16/-0)
README.org (+65/-0)
apparmor/confined.json (+7/-0)
apparmor/unconfined.json (+4/-0)
data/CMakeLists.txt (+25/-0)
data/renderer/carousel.json (+12/-0)
data/renderer/horizontal-list.json (+12/-0)
data/renderer/large-grid.json (+12/-0)
data/renderer/medium-grid.json (+12/-0)
data/renderer/vjournal.json (+15/-0)
data/renderer/wide-art.json (+13/-0)
data/timeout.ini.in (+13/-0)
manifest.json.in (+15/-0)
push.sh (+8/-0)
run.sh (+24/-0)
security.json (+5/-0)
src/CMakeLists.txt (+22/-0)
src/TimeOut-client.cpp (+372/-0)
src/TimeOut-client.h (+101/-0)
src/TimeOut-preview.cpp (+413/-0)
src/TimeOut-preview.h (+46/-0)
src/TimeOut-query.cpp (+491/-0)
src/TimeOut-query.h (+69/-0)
src/TimeOut-scope.cpp (+62/-0)
src/TimeOut-scope.h (+51/-0)
src/TimeOut-scope.h.autosave (+50/-0)
src/com.canonical.scopes.timeout_timeout.ini (+13/-0)
src/com.canonical.scopes.timeout_timeout_automoc.cpp (+2/-0)
src/config.h.in (+47/-0)
src/timeout.ini (+13/-0)
src/timeout_automoc.cpp (+2/-0)
test/CMakeLists.txt (+24/-0)
test/files/CMakeLists.txt (+1/-0)
test/test-timeout-client.cpp (+16/-0)
timeout-scope.json (+6/-0)
timeout.cbp (+199/-0)
timeout.json (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

16. By Victor Tuson Palau on 2014-09-24

fixed bug with canned queries

15. By Victor Tuson Palau on 2014-09-23

changes: multi-city surfacing, location awareness, html formating, preview implementations, and confinment

14. By Michał Karnicki on 2014-08-13

Comment out main block of TimeOut-client.

13. By Michał Karnicki on 2014-08-13

Merge refactored Victor's improvements to image sizes.

12. By Michał Karnicki on 2014-08-12

Bump version to 0.4.1.

11. By Michał Karnicki on 2014-08-12

Fetch smaller images, 312x208.

10. By Michał Karnicki on 2014-08-11

Bump version to 0.4

9. By Michał Karnicki on 2014-08-11

Fetch smaller images for better speed.

8. By Michał Karnicki on 2014-08-08

Fix background and header foreground colors.

7. By Michał Karnicki on 2014-08-08

Remove cache directory.