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

merge dev #1

Merged
merged 70 commits into from
Sep 17, 2017
Merged

merge dev #1

merged 70 commits into from
Sep 17, 2017

Conversation

sdpeyton
Copy link
Owner

No description provided.

sdpeyton and others added 30 commits August 12, 2017 17:38
@sdpeyton
Upgraded styling
d4d7c1f
@sdpeyton
updated modal to work with new styling
343f67f
@sdpeyton
Added new functionality to Map object and separated it out from its R…
0e0e970 
…eact parent container
@sdpeyton
set up logic for consuming new tools and jumping between tools in the…
aec0c1f 
… menu
@sdpeyton
updated packages
e0248d5
@sdpeyton
added load tool
2cae8b8
@sdpeyton
upgraded main.js modal to work with load tool code
4d41a78
@sdpeyton
logic for parsing out tools
ac490cc
@sdpeyton
added identify tool
6b1c221
@sdpeyton
test data (easier naming than current tiff)
f64db4a
@sdpeyton
added prod build and copied it to docs dir for github pages
30bdaa9
@DanielJDufour
Merge pull request GeoTIFF#15 from sdpeyton/dev
cb79c1a 
merge new updates
@sdpeyton
adding test tiff to docs folder
bcc12e9
@DanielJDufour
Merge pull request GeoTIFF#24 from sdpeyton/dev
826f2e4 
adding test tiff to docs folder
@sdpeyton
updated identify function
6968e9c
@sdpeyton
added cname back in
4ede2ab
@DanielJDufour
Update README.md
b701d1f
@DanielJDufour
Merge pull request GeoTIFF#29 from sdpeyton/dev
fd072db 
fixed identify
@DanielJDufour
Update README.md
86cd7c4
@DanielJDufour
added underscore dependency
20d1f60
@DanielJDufour
added webpack dev dependencies
3c8f071
@DanielJDufour
updated dep version for extracted-text-webpack-plugin
9bcdbbe
@DanielJDufour
filter out blanks lines when reading in lines from tools.txt
d1b3559
@DanielJDufour
added small example_4326.tif file for testing
317af0a
@DanielJDufour
oMerge branch 'master' of github.com:DanielJDufour/geotiff.io into fi…
0d8e97d 
…lter_out_blank_lines
@DanielJDufour
Merge branch 'master' of github.com:GeoTIFF/geotiff.io
1b438ad
@DanielJDufour
Merge pull request GeoTIFF#34 from DanielJDufour/master
31ec9a6 
Added Small Test File
@DanielJDufour
oMerge branch 'master' of github.com:GeoTIFF/geotiff.io into filter_o…
629a78e 
…ut_blank_lines
@DanielJDufour
added small tif file to docs
fcf65bb
@DanielJDufour
Merge pull request GeoTIFF#35 from DanielJDufour/master
88e448e 
added small tif file to docs
sdpeyton and others added 29 commits September 9, 2017 12:13
@sdpeyton
Merge pull request GeoTIFF#36 from DanielJDufour/download_tool
5c5e066 
Download tool
@DanielJDufour
added param hide_menu which when set to true will hide the menu
578f447
@sdpeyton
Merge pull request GeoTIFF#42 from DanielJDufour/41_Hide_Panel
0c0d12e 
added param hide_menu which when set to true will hide the menu
@sdpeyton
merged with main repo
4e2b74c
@sdpeyton
update package.json with new gio features (sum, mean, mode)
ca9257c
@sdpeyton
fixed identify tool error where exiting tool didn't stop generation o…
321a1f8 
…f markers
@sdpeyton
added leaflet draw
644fedf
@sdpeyton
added leaflet map interface functions for new tools
5446dab
@sdpeyton
added mean/avg tool
766bcd1
@sdpeyton
added sum tool
148f650
@sdpeyton
added mode tool
b7b2451
@sdpeyton
added new tools to tools.txt so they will be available on the site
c313fc2
@sdpeyton
updated close functions to be more logical
4271a45
@sdpeyton
semicolon for daniel
ed71bde
@sdpeyton
updated styling for button hover
dcb96b9
@DanielJDufour
fixed typo
a22e221
@DanielJDufour
Merge pull request GeoTIFF#49 from DanielJDufour/LoadToolClassNameError
b93c035 
fixed typo
@sdpeyton
added new version of geotiff/gio
bf8075a
@sdpeyton
added median tool
a28bc2a
@sdpeyton
clean up - tabs to spaces and semicolons
7e86d66
@sdpeyton
added semicolons to Menu.js
85e242c
@DanielJDufour
Merge branch 'dev' into dev
8c0bb25
@DanielJDufour
Merge pull request GeoTIFF#44 from sdpeyton/dev
e74ace0 
Added new features and bug fixes
@DanielJDufour
moving to production
506ccae
@DanielJDufour
built and moved to docs folder
9b2c415
@DanielJDufour
added alert when try to load tool that doesn't exist
4243a30
@DanielJDufour
Merge pull request GeoTIFF#69 from DanielJDufour/Issue_68_Auto_Activa…
201da95 
…te_Tools

added alert when try to load tool that doesn't exist
@sdpeyton
added min and max tools
7126484
@sdpeyton
added larger tiff file to test
1b3156f
@sdpeyton sdpeyton merged commit 1d3f199 into master Sep 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sdpeyton @DanielJDufour