History | View | Annotate | Download (2.4 kB)
Merge branch 'object_details' into experimentaland some xlarge layoutsand detailed error handling in placeConflicts: AndroidManifest.xml src/com/rackspacecloud/android/ListContainerActivity.java src/com/rackspacecloud/android/ListServersActivity.java...
Created popups that display when a user performs a task toinform then that it started. Also fixed bugs.
Merge branch 'mutipleAccounts' into HEAD
Conflicts: AndroidManifest.xml src/com/rackspace/cloud/servers/api/client/FlavorManager.java src/com/rackspace/cloud/servers/api/client/ImageManager.java src/com/rackspace/cloud/servers/api/client/ServerManager.java...
mutiple accounts are working, storage of them is not(to be implemented)
added support for using uk accounts on <2.2
version 1.0
remove TODOs and generated blocks
flavor and image loading