Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature history logs #1779

Merged
merged 58 commits into from
Aug 8, 2016
Merged

Feature history logs #1779

merged 58 commits into from
Aug 8, 2016

Conversation

m4gr3d
Copy link
Member

@m4gr3d m4gr3d commented Aug 3, 2016

Restore and improve the vehicle history section

m4gr3d added 30 commits June 12, 2016 13:59
…g the data

Dismiss the tlog data picker on file selection
Add position event adapter
Fix invalid casting warning
Refactor map marker api
….com:DroidPlanner/Tower into map_internal_api_refactoring

# Conflicts:
#	build.gradle
…hub.com:DroidPlanner/Tower into map_internal_api_refactoring

# Conflicts:
#	Android/build.gradle
#	settings.gradle
m4gr3d added 27 commits July 12, 2016 14:04
Add stub for the droneshare tlog backend uploader
…DroidPlanner/Tower into feature_history_logs
…hub.com:DroidPlanner/Tower into feature_history_logs

# Conflicts:
#	Android/AndroidManifest.xml
#	Android/res/values/strings.xml
#	Android/src/org/droidplanner/android/activities/LocatorActivity.java
Highlight selected session
Fix position events loading logic
@m4gr3d m4gr3d merged commit ab977d5 into standalone Aug 8, 2016
@m4gr3d m4gr3d deleted the feature_history_logs branch August 8, 2016 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant