lp:~dobey/ubuntuone-control-panel/update-4-2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-control-panel/stable-4-2 at revision 383

Roberto Alsina (community): Approve on 2013-03-26

Diff: 429 lines (+133/-141)

6 files modified

ubuntuone/controlpanel/gui/qt/controlpanel.py (+5/-0)
ubuntuone/controlpanel/gui/qt/share_links.py (+6/-1)
ubuntuone/controlpanel/gui/qt/share_links_search.py (+9/-16)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+42/-2)
ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+8/-0)
ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+63/-122)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

383. By dobey on 2013-03-26

Merge changes from trunk for 4.2.0 release.

382. By dobey on 2013-02-22

[release] 4.1.91

381. By Mike McCracken on 2013-02-22

[Mike McCracken]

    - Use officially recommended API for creating file URLs. (LP: #1112792)
    - Change quit handler to quit immediately. (LP: #1042834)

[Rodney Dawes]

    - Append query arguments to the URI, rather than passing in as parameters.
    - Fix new pyflakes warnings about variable redefinition in list comprehensions.

380. By dobey on 2013-01-29

[release] 4.1.90

379. By Brian Curtin on 2013-01-29

[Mike McCracken]

    - Do all filename searching via IPC - allows fuzzy searching and avoids display bug with fast typing.
    - Kill animation timer when hiding loading overlay.
    - Use applescript on OS X to show native file-chooser dialog. (LP: #1044201)

[Brian Curtin]

    - Use logging functionality instead of printing messages to stdout (LP: #1105447)

[Alejandro J. Cura]

    - Use a standard LC_CTYPE locale when the LANG is turkish. (LP: #997326)

378. By dobey on 2013-01-10

[release] 4.1.2

377. By dobey on 2013-01-10

[Mike McCracken]
    - Remove a debug print statement in the tests that snuck through.
    - Use new SSO API to get platform-appropriate translation function. (LP: 1074116)
    - Add u1 folder to OS X Finder favorites sidebar on first launch.

[Brian Curtin]

    - Add common updater script for mac and windows. (LP: #1087262)

376. By dobey on 2012-12-07

{release] 4.1.0

375. By Diego Sarmentero on 2012-12-07

[Mike McCracken]

    - Trivial fix to make a test in test_folders actually run.
    - Add support for menu in separate process on darwin. (LP: #1045939)
    - Connect files service in wizard to enable display of remote folders. (LP: #978043)

[Rodney Dawes]

    - Remove messaging menu integration file.
    - Ignore some of the new pep8 warnings, and fix some others.

[Brian Curtin]

    - Encode the volume path before checking whether or not it is a link.

[Barry Warsaw]

    - Replace the third party simplejson module with the stdlib json module.

[Jeremy Bicha]

    - Don't show Ubuntu One in System Settings when running GNOME.

[Diego Sarmentero]

    - Adding IPC, so the new instances can send messages to the already running instance (LP: #1063927).
    - Remove the text on x button pressed (LP: #1070917).
    - Implementing new share tab design (LP: #1065194, #1056194).
    - Accessing the Share tab from the systray menu and avoid refreshing the menu unnecesary (LP: #1072859 #1063781).

374. By Brian Curtin on 2012-10-29

- Fix a failing test on Windows by creating a platform-correct file_path to be tested.