lp://staging/~dobey/ubuntu/lucid/ubuntuone-client/trunk
- Get this branch:
- bzr branch lp://staging/~dobey/ubuntu/lucid/ubuntuone-client/trunk
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 28479 lines (+12474/-8183)92 files modifiedMakefile.am (+15/-6)
Makefile.in (+26/-14)
aclocal.m4 (+21/-5)
bin/u1sdtool (+133/-57)
bin/ubuntuone-client-applet (+0/-1063)
bin/ubuntuone-client-preferences (+0/-360)
bin/ubuntuone-login (+226/-0)
bin/ubuntuone-preferences (+549/-0)
bin/ubuntuone-syncdaemon (+6/-5)
config.guess (+21/-49)
config.sub (+11/-4)
configure (+198/-115)
configure.ac (+28/-2)
contrib/dbus-docs (+196/-0)
contrib/dbus_util.py (+72/-0)
contrib/test (+16/-36)
contrib/testing/testcase.py (+181/-48)
data/Makefile.am (+19/-4)
data/Makefile.in (+57/-20)
data/com.ubuntuone.Authentication.service.in (+1/-1)
data/logging.conf (+13/-0)
data/logging.conf.in (+13/-0)
data/syncdaemon.conf (+8/-8)
data/ubuntuone-client-applet.desktop.in (+0/-9)
data/ubuntuone-icons.rendercache (+1/-2)
data/ubuntuone-icons.svg (+1017/-5096)
data/ubuntuone-preferences.desktop.in (+14/-0)
data/ubuntuone.menu.in (+1/-0)
debian/changelog (+6/-0)
debian/control (+7/-4)
debian/python-ubuntuone-client.install (+1/-0)
debian/ubuntuone-client-gnome.install (+4/-5)
debian/ubuntuone-client.install (+1/-3)
docs/man/u1sdtool.1 (+109/-15)
docs/man/ubuntuone-client-applet.1 (+0/-16)
docs/man/ubuntuone-client-preferences.1 (+0/-16)
docs/man/ubuntuone-preferences.1 (+16/-0)
docs/syncdaemon_dbus_api.txt (+280/-0)
ltmain.sh (+4/-4)
m4/libtool.m4 (+7/-6)
m4/ltversion.m4 (+5/-5)
nautilus/Makefile.am (+28/-0)
nautilus/Makefile.in (+148/-19)
nautilus/contacts-view.c (+507/-0)
nautilus/contacts-view.h (+66/-0)
nautilus/test-contacts-picker.c (+98/-0)
nautilus/u1-contacts-picker.c (+170/-0)
nautilus/u1-contacts-picker.h (+58/-0)
nautilus/ubuntuone-marshallers.c (+123/-0)
nautilus/ubuntuone-marshallers.list (+4/-0)
nautilus/ubuntuone-nautilus.c (+147/-28)
po/POTFILES.in (+4/-3)
po/POTFILES.skip (+1/-0)
tests/oauthdesktop/test_auth.py (+7/-1)
tests/syncdaemon/test_action_predicates.py (+10/-5)
tests/syncdaemon/test_action_queue.py (+487/-7)
tests/syncdaemon/test_config.py (+154/-39)
tests/syncdaemon/test_dbus.py (+689/-60)
tests/syncdaemon/test_eq_inotify.py (+528/-19)
tests/syncdaemon/test_eventqueue.py (+13/-1)
tests/syncdaemon/test_fileshelf.py (+30/-1)
tests/syncdaemon/test_fsm.py (+86/-58)
tests/syncdaemon/test_hashqueue.py (+49/-9)
tests/syncdaemon/test_localrescan.py (+415/-79)
tests/syncdaemon/test_logger.py (+77/-0)
tests/syncdaemon/test_sync.py (+46/-4)
tests/syncdaemon/test_tools.py (+201/-8)
tests/syncdaemon/test_u1sdtool.py (+102/-3)
tests/syncdaemon/test_vm.py (+1763/-249)
tests/test_login.py (+187/-0)
tests/test_preferences.py (+247/-0)
ubuntuone/oauthdesktop/auth.py (+6/-4)
ubuntuone/oauthdesktop/main.py (+2/-2)
ubuntuone/syncdaemon/__init__.py (+1/-0)
ubuntuone/syncdaemon/action_queue.py (+298/-127)
ubuntuone/syncdaemon/config.py (+180/-24)
ubuntuone/syncdaemon/dbus_interface.py (+442/-31)
ubuntuone/syncdaemon/event_queue.py (+161/-25)
ubuntuone/syncdaemon/events_nanny.py (+7/-7)
ubuntuone/syncdaemon/file_shelf.py (+19/-3)
ubuntuone/syncdaemon/filesystem_manager.py (+51/-35)
ubuntuone/syncdaemon/fsm/fsm.py (+3/-3)
ubuntuone/syncdaemon/local_rescan.py (+88/-30)
ubuntuone/syncdaemon/logger.py (+70/-15)
ubuntuone/syncdaemon/main.py (+53/-58)
ubuntuone/syncdaemon/marker.py (+3/-0)
ubuntuone/syncdaemon/sync.py (+42/-16)
ubuntuone/syncdaemon/tools.py (+244/-8)
ubuntuone/syncdaemon/u1fsfsm.py (+77/-12)
ubuntuone/syncdaemon/volume_manager.py (+973/-191)
ubuntuone/u1sync/client.py (+23/-18)
ubuntuone/u1sync/main.py (+3/-3)
Branch information
- Owner:
- dobey
- Status:
- Merged
Recent revisions
- 15. By dobey
-
* New upstream release.
- Avoid conflicts due to bouncing FS events (LP: #449605)
- Don't try to authorize if connect on start is never (LP: #451154) - 14. By dobey
-
* New upstream release.
- Only add emblems to files under the Ubuntu One folder (LP: #450112)
- Support having an -idle icon for other themes (LP: #438641)
- Fix ValueError when updating completed (LP: #450140)
- Fix AttributeError crash in syncdaemon (LP: #440908) - 13. By dobey
-
* New upstream release.
- Limit log messages, file size, and rotate more often (LP: #435137)
- Rotate oauth-login.log and cap the file size (LP: #445514)
- Remove pycurl usage in favor of urllib and better errors (LP: #411029)
- Save the syncdaemon settings for bw limiting (LP: #418882)
- Fix NoSuchDatabase when pairing desktopcouch (LP: #438411)
- Fix IOError when launching preferences window (LP: #441039)
- Update icons to remove Ubuntu logo, better names (LP: #434886)
- Use ngettext for the possibly singular notification (LP: #449269)
- Only create Places bookmark when first authorizing (LP: #397749)
- Don't always recreate the bookmark (LP: #401211)
- Handle showing emblems better (LP: #440839)
- Remove the System->Preferences menu item (LP: #443342)
- Remove NotOnlineError usage (LP: #404550)
- Set a default share name in the Nautilus sharing UI (LP: #369488)
- Simplify some state handling (LP: #420354) - 12. By dobey
-
* New upstream release.
- Make preferences more accessible (LP: #434884)
- Handle errors better when sharing from Nautilus (LP: #381012)
- Use a better icon size for notifications (LP: #423034)
- Remove partial file handling from nautilus extension (LP: #429482) - 11. By dobey
-
* New upstream release.
- Fix the tooltip for non-connecting states (LP: #420964)
- Update config for domain name move (LP: #426804)
- Handle redirections in oauth token request (LP: #426622) - 9. By Elliot Murphy
-
Don't attach logs containing filenames in the apport
hook, as this is a privacy concern (LP: #419895)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/lucid/ubuntuone-client