Merge lp://staging/~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.92 into lp://staging/ubuntuone-client/stable-3-0
| Status: | Merged | ||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||||||||||||||||||||||||||||||||||
| Approved revision: | 1181 | ||||||||||||||||||||||||||||||||||||||||
| Merged at revision: | 1180 | ||||||||||||||||||||||||||||||||||||||||
| Proposed branch: | lp://staging/~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.92 | ||||||||||||||||||||||||||||||||||||||||
| Merge into: | lp://staging/ubuntuone-client/stable-3-0 | ||||||||||||||||||||||||||||||||||||||||
| Diff against target: |
557 lines (+194/-26) 19 files modified
bin/u1sdtool (+7/-1) tests/platform/linux/test_notification.py (+6/-6) tests/platform/test_external_interface.py (+2/-0) tests/platform/test_tools.py (+29/-5) tests/proxy/test_tunnel_server.py (+33/-0) tests/syncdaemon/test_interaction_interfaces.py (+18/-0) tests/syncdaemon/test_tunnel_runner.py (+9/-0) tests/syncdaemon/test_vm.py (+27/-0) ubuntuone/platform/linux/dbus_interface.py (+4/-0) ubuntuone/platform/linux/notification.py (+1/-1) ubuntuone/platform/tools/__init__.py (+11/-7) ubuntuone/platform/tools/windows.py (+1/-0) ubuntuone/platform/windows/ipc.py (+5/-0) ubuntuone/platform/windows/ipc_client.py (+9/-1) ubuntuone/proxy/tunnel_server.py (+10/-2) ubuntuone/syncdaemon/event_queue.py (+1/-1) ubuntuone/syncdaemon/interaction_interfaces.py (+11/-0) ubuntuone/syncdaemon/tunnel_runner.py (+7/-2) ubuntuone/syncdaemon/volume_manager.py (+3/-0) |
||||||||||||||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntuone-client/stable-3-0-update-2.99.92 | ||||||||||||||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alejandro J. Cura (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Updating from trunk up to revno 1222:
[ Alejandro J. Cura <email address hidden> ]
- Do not use the Qt Dbus mainloop on Windows (LP: #969150).
- Force using the system proxy on Windows (LP: #969157).
[ Diego Sarmentero <email address hidden> ]
- Converting abspath to unicode (LP: #917222).
[ Natalia B. Bidart <email address hidden> ]
- Fixed typo and added a missing test for validate_path in
SyncDaemonTool (LP: #968637).
[ Natalia B. Bidart <email address hidden>,
Brian Curtin <email address hidden> ]
- Emit a notification when volumes are ready after a server rescan,
allowing clients to follow and update their information accordingly
(LP: #851810).
[ Rodney Dawes <email address hidden> ]
- Use set_hint_int32 for the boolean transient hint instead of set_hint
(LP: #961342).
+1