Permalink
Commits on Jul 26, 2017
  1. Merge pull request #423 from performant-software/as/image-size

    Static image layer workaround and zoom improvement
    akstuhl committed on GitHub Jul 26, 2017
  2. js workaround for missing image dimensions

    set min resolution for better image layer zooming
    
    compile production assets
    
    prevent error message when allow_url_fopen off
    
    js workaround for missing image dimensions
    
    set min resolution for better image layer zooming
    
    compile production assets
    
    recompile assets
    akstuhl committed Jul 3, 2017
Commits on Jun 28, 2017
  1. Merge branch 'jf/rebuild'

    jamiefolsom committed Jun 28, 2017
  2. Rebuild, excluding third party library, including bumped version number.

    - upgrade version in hookInstall
    
    Rebuild, without ol2.zip
    - Because that was in the plugin root, and not explicitly excluded, in grunt/compress.js, it was getting zipped into the plugin.
    - Also, build bumped the CKeditor version number to 4.7.1, and some language files as well.
    akstuhl committed with jamiefolsom Jun 28, 2017
  3. Merge pull request #420 from performant-software/as/hook-install

    upgrade version in hookInstall
    akstuhl committed on GitHub Jun 28, 2017
  4. upgrade version in hookInstall

    akstuhl committed Jun 28, 2017
Commits on Jun 21, 2017
  1. Bump version numbers.

    jamiefolsom committed Mar 27, 2017
  2. Merge pull request #416 from performant-software/as/tool-grabber

    Editor map layering and presenter fixes
    akstuhl committed on GitHub Jun 21, 2017
Commits on Jun 20, 2017
  1. editor map layering and presenter fixes

    removed console log
    
    remove dev assets
    
    build assets
    akstuhl committed Jun 5, 2017
  2. Added documentation about git branch workflow.

    Add neatline preamble.
    
    Fix header format
    
    Wordsmith
    
    Wordsmith
    
    Adjust to refer to two remotes
    
    Clarify conflict resolution
    
    Adjust to make the steps more neatline specific, including forked repo workflow.
    
    Tweaks
    
    Renumber
    
    Fix heading formatting
    jamiefolsom committed Mar 20, 2017
  3. Fixed OpenLayer config issue which prevented exhibits from loading WM…

    …S base layers.
    
    Per: openlayers/ol2#350
    
    Make record handling consistent with exhibit handling.
    
    Remove dev assets
    
    Remove dev assets
    
    Possible fix for WMS as a base layer in exhibits.
    
    Add updated production assets.
    jamiefolsom committed Mar 27, 2017
Commits on Mar 17, 2017
  1. Merge pull request #411 from performant-software/jf/assets

    Removed development assets from the repository
    jeremyboggs committed on GitHub Mar 17, 2017
Commits on Mar 16, 2017
  1. Merge pull request #410 from performant-software/jf/googlemaps

    Fixed Google Maps API / OpenLayers 2 incompatibility
    jeremyboggs committed on GitHub Mar 16, 2017
Commits on Mar 15, 2017
  1. Added Google Maps API key config, pegged to vendored build of ol2

    Update sinon; 1.7.3 was no longer available.
    
    Applied patch per scholarslab/Neatline#379
    
    Made method signatures match parents'
    
    Tests passing.
    
    Update sinon, reorder script loading in jasmine test runner template
    
    Added Google Maps API key infrastructure
    
    Add Google Maps API key infrastructure.
    
    Remove migrations and version bump in favor of plugin-wide config var.
    
    Clean up some cruft from first approach
    
    Use a local build of ol2
    
    Testing difference between dev and prod assets.
    
    Re-ignore dev assets for PR
    
    Removing dev assets for PR
    jamiefolsom committed Feb 23, 2017
Commits on Feb 1, 2016
Commits on Dec 7, 2015
  1. Merge tag '2.5.1' into develop

    Bug Fixes
    
      - Upgraded geoPHP
      - Only close static bubble if the you unselect the bubble's record (several issues, e.g., #375).
    erochest committed Dec 7, 2015
  2. Merge branch 'release/2.5.1'

    erochest committed Dec 7, 2015
  3. Version 2.5.1.

    erochest committed Dec 7, 2015
  4. Updated changelog.

    erochest committed Dec 7, 2015
  5. Bumped version to 2.5.1.

    erochest committed Dec 7, 2015
Commits on Oct 30, 2015
  1. Committing static assets.

    davidmcclure committed Oct 30, 2015
  2. When a record is unselected, only hide the static bubble if the unsel…

    …ected record is the same as the record currently bound to the bubble.
    davidmcclure committed Oct 30, 2015
Commits on Oct 19, 2015
  1. Merge branch 'release/2.4.3'

    erochest committed Oct 19, 2015
  2. Removed map files.

    erochest committed Oct 19, 2015
  3. Version 2.5.0.

    erochest committed Oct 19, 2015