History | View | Annotate | Download (14.6 kB)
Merge branch 'analytics' into experimental
Conflicts: src/com/rackspacecloud/android/ListAccountsActivity.java
modified CustomHttpClient, so Http requests are faster
added google analytics activity superclasses and activites thattrack now extend these and most of the tracking calls are in place
updated the addserverpage and general clean up
bug fixes
folders for cloud files are now working as well as their function,and persist through configuration changes
fixed issue #1 on github, also added some support for file names withnon url safe characters (still in progress)
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...
Merge branch 'contact_and_password' into experimental
fixed bug on viewserveractivity page
Fixed activity lifecycle management issues and removed background logofrom ViewServerActivity
added images to the contact page and app password protectionis fully functioning
Partial addition of an ability to contact rackspace through the app
Created popups that display when a user performs a task toinform then that it started. Also fixed bugs.
working with ukaccounts, mutiple accounts, and all server tasks
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 now working with deletes and orentation bug fixes
fixed the crashes on rotation change during the authentication process
mutiple accounts are working, but a delete still needs to be implemented
more implementation for mutiple accounts
same as pervious, just added files