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

general merge and release of 1.1.0 #236

Merged
merged 43 commits into from
Aug 11, 2015
Merged

general merge and release of 1.1.0 #236

merged 43 commits into from
Aug 11, 2015

Conversation

matthesrieke
Copy link
Member

No description provided.

Drifftr and others added 30 commits June 18, 2015 19:09
Align with origin dev branch
…nto dev

* 'dev' of https://github.com/enviroCar/enviroCar-server:
  adjust storage directory
  added preview and share resources
  added auto zooming
  added tile rendering
  added OSM rendering utils
  added OSMTileRendering utils
  added share resource
  fixed incorrect minimum longitude bound
  order tracks by creation date
  adjust broker URL to ags.dev
  update API documentation with regard to URLs
  Update README.md
  Fix endpoints in README.md
  updated bbox query documentation
Version bumps and Java 8 compatibility
Conflicts:
	rest/src/main/java/org/envirocar/server/rest/util/OSMTileRenderer.java
@matthesrieke matthesrieke changed the title general merge general merge and release of 1.1.0 Aug 11, 2015
matthesrieke added a commit that referenced this pull request Aug 11, 2015
general merge and release of 1.1.0
@matthesrieke matthesrieke merged commit c794e53 into master Aug 11, 2015
@autermann autermann deleted the release/1.1.0 branch December 3, 2015 09:02
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.

3 participants