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.

Sign up for GitHub

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

Jump to bottom

updated basemaps widget combining agol and custom basemaps #522

Merged
merged 5 commits into from
Apr 2, 2016
Merged

updated basemaps widget combining agol and custom basemaps #522

merged 5 commits into from
Apr 2, 2016

Commits on Mar 20, 2016

  1. combined arcgis online (agol) and custom basemaps using esri/basemaps 

    maintained support for existing agol and custom configurations
removed BasemapGallery widget custom basemaps allowing for more custom map types
    @tmcgee
    tmcgee committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    ac12c93 View commit details
    Browse the repository at this point in the history

  2. updated configuration with examples of combined agol and custom basemaps 

    Basemap and BasemapLayer dijits no longer needed for custom basemaps
some of the examples required v 3.16 or higher of the ESRI JavaScript API
    @tmcgee
    tmcgee committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    25a3893 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2016

  1. Merge branch 'develop' into feature/updated-basemaps-widget

    @tmcgee
    tmcgee committed Mar 26, 2016
    Configuration menu
    Copy the full SHA
    51ec28a View commit details
    Browse the repository at this point in the history

  2. restored custom mode for basemaps widget. 

    Custom basemaps are also supported in agol mode for those types
    of basemaps which are supported by `esri/basemaps`
Added additional examples of custom basemaps using WebMapTiled layers
    @tmcgee
    tmcgee committed Mar 26, 2016
    Configuration menu
    Copy the full SHA
    68e9b76 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. Merge branch 'develop' into feature/updated-basemaps-widget 

    # Conflicts:
#	viewer/js/config/basemaps.js
    @tmcgee
    tmcgee committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    cdfcc1c View commit details
    Browse the repository at this point in the history