github.com/ESHackathon/eviatlas commits | Ecosyste.ms: OpenCollective

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

cdb368d9624ee8bfc01fc926adeafbc25d2cef7f authored about 6 years ago

Merge pull request #32 from ESHackathon/mw_changes

Mw changes + Af filtering

038fed234309925e1c46d97ecd9486e981ac7df9 authored about 6 years ago

popup/links in map improved. forgot to go back to master branch, will do that now!

ebabd51cd9f8c57bceae6a61d4ee9e84a33c5e9d authored about 6 years ago

basic filtering added to Martins upload solution. removed some legacy code.

f1010bfa94f4bdaae9ae10f26fb5624fc5f434f8 authored about 6 years ago

utilize user-loaded data in all tabs

This is a first try at including user-defined data in all sections of EviAtlas. This required so...

23b49b0085b45b77b415cb8bf031806f86b4263f authored about 6 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

19ef582595a8803c8b69c542b9630802c374ebc4 authored about 6 years ago

Merge pull request #28 from afeierman/master

map functionality improved. clustering, and more flexible

b99a7f28c2f5c0cf7ea36ba8d418b31d4cf8823c authored about 6 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

694b1e4ae618219fb2b91ef913526b8579d00c7e authored about 6 years ago

map is prettier, more flexible, and has basic clustering features

93c90bee57ec18bd96114054ec94390d069c5f7f authored about 6 years ago

Update README.md

b41340dbaefe05683866000884ebd0fce177f7d0 authored about 6 years ago

Update README.md

0f80ffd34bc39dd30b41e6a7aaf3e6760e8f1f96 authored about 6 years ago

Update README.Rmd

d9d465e5194b48c540581c062f01577173162104 authored about 6 years ago

Merge pull request #26 from softloud/dev

get_obs function for unnesting :notes:

526cec1a7dbc657281782372bd431a23101d6e65 authored about 6 years ago

get_obs function for unnesting :notes:

52085ab2dac95272c7f7c37800916e2b2960fbd6 authored about 6 years ago

Merge pull request #25 from DrMattG/master

Merge pull request #1 from ESHackathon/master

f9c9178b0390f0fb5871eafa069f7ccf66a62efb authored about 6 years ago

GenLocationTrend exporting correctly (#24)

de3b28f69a364b7fde983fe85d2238d86b1b2307 authored about 6 years ago

GenLocationTrend exporting correctly

7693a057ce2550d6702bfb41d6e40372ac313ceb authored about 6 years ago

Merge pull request #23 from ezz-uh/master

added popup for systematic map

d68014e29950e433fa5abe1afb34523d5c46fdd3 authored about 6 years ago

Merge branch 'master' into master

687846e49dbe9db62c668a8594069454ed6a2e7c authored about 6 years ago

added popup for systematic map

6c60436424e8e93b3e9ae180f90e40f2df72bafa authored about 6 years ago

Merge pull request #21 from softloud/master

added link to stages of dev :notes:

b9a2c67b519f824acac154474977bbba0aefc0e3 authored about 6 years ago

added link to stages of dev :notes:

e2156a35da7f95777bbad2ddea4063e37b74bf1d authored about 6 years ago

Merge pull request #1 from ESHackathon/master

update

993ab3d10744dbf8676f32e1a0e88374a8db77fa authored about 6 years ago

Merge pull request #20 from softloud/master

builds now :notes:

f0616b972bb38233a18d464d71506983d5891d47 authored about 6 years ago

with documentation :notes:

3668c0b4b0f02fda08ba5b7020a0fb1269d819d9 authored about 6 years ago

builds now :notes:

6dbabad5ea6be064cce6779671e32a996495f59e authored about 6 years ago

order of data load

0e7fb92575fc13b2d284f539582e69c86d09481f authored about 6 years ago

rogue reference to pd;

4303ebe904f3e5dc8099452e7354e445b4679a3f authored about 6 years ago

start of miniEShackathon2018

26814c4f2a9ddafe8809d6cb3a8e8c9b0730e662 authored about 6 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

6cafc6c3e9544f940de80d4fec9fdd67ede88292 authored over 6 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

4cd9c261d20ecc5db884c5de0b0bf4c1872fca47 authored over 6 years ago

function changes on disk

e1e3770629e8798da6be0f82cb8bd6dbb88c7664 authored over 6 years ago

more roxygen stuff that I do not trust

dc559a13d24d0a8f0a301765f7f522ba3773925f authored over 6 years ago

pkg docs

82987ca4cbe896f346417125ccf70227a200239c authored over 6 years ago

remove merge confusion from description so that package will build

f16bb3d7bdb322d17faff17adbacb2b1ff022309 authored over 6 years ago

visual improvements for plots

dbb5762dba9479eb250eebdd496cd68f276bde23 authored over 6 years ago

Add data filtering option

Added a reactiveValues object named 'filtered_data' to store subsetted versions of pilotdata. Th...

8f1eb7d49f02cc7e4f2da149aff562bf131f9c28 authored over 6 years ago

UI improvements

6c1a62389d5c11291a79159d96127c245be842c9 authored almost 7 years ago

map circles now cluster for zoom in /out

7d856afdb1899a4c7483aa06b2fb1dc3c5ca3974 authored almost 7 years ago

map is working, with popup selector

f63af27c937e8712d3dedee531ea3d0cce8d6f62 authored almost 7 years ago

everything works!

b8aa44a17cf1464d6d8f09b1f1f8da56b790c7b0 authored almost 7 years ago

sys_map can now accept input for popup

68610475e1837357f84456070bb1658115d98a88 authored almost 7 years ago

GenLocationTrend function moved to working folder. its great. made by Sanita

64e10745c00b0c7a8652beef60ef8f646f2d2e34 authored almost 7 years ago

putting shiny/rsconnect stuff in gitignore because i dont **think** we want it

5ff6b0585dc751765a160eacb33471b7bc90190d authored almost 7 years ago

data table, map, and graph over time functioning in shiny

073b9390e638c606dd613c848ccd7b7fe02073e1 authored almost 7 years ago

function updates and bugfixes

8478f08f9b8ba24b2b3897897fd3b9aee3d0d745 authored almost 7 years ago

function bug fixes and try to load with package

7ddc81c35733ddf187f3afb54cf8a7524c4ebc4b authored almost 7 years ago

Merge pull request #15 from ESHackathon/add-license-1

Create LICENSE

ab462c318501787e462e9b2ff407007851b41178 authored almost 7 years ago

Create LICENSE

2e86171272417b01e76791e95c66082a99e4199b authored almost 7 years ago

update

498518f76b535ff3533a3c88a9c08e3c0ac18153 authored almost 7 years ago

update

b3741c95cae6e190b25c9e8e5f076229f1c4194b authored almost 7 years ago

Update

7c15b8a1e5566ec9834643986d0e40325a005cd2 authored almost 7 years ago

update in functions to define the packages

3c11e288b9d9e9b6f81fced62f4ffd88a3c2bd38 authored almost 7 years ago

Working function that takes colindx for region and creates bar plot #11

7dcb31e2726ac42a3f229b0985d82f56b71128e0 authored almost 7 years ago

Working function that takes colindx for region and creates bar plot #11

d9a4bb1952f24fe22fd24b2b1cde2446b2f9e17a authored almost 7 years ago

correction of errors

f2430e26209285e6d3a7f1a22179e3d2fb3d9216 authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

891d8f8178beb1dda5e7f159155f2f217dab78e0 authored almost 7 years ago

cleaning the code #9

428ed48691d800c922b14fb7994bfc2a4f88338c authored almost 7 years ago

Updated to output latlon as well as counrty/continent #11

c45abfe7bfd529a2eef86fadfc8c9ec98ac66b4e authored almost 7 years ago

Updated to output latlon as well as counrty/continent #11

e1d7d9e5876918c2e29f0ccac1545574e414d51a authored almost 7 years ago

update #9

c173670e37d747d89204d865eb1f70548df7e2e1 authored almost 7 years ago

sonia building docs

8ddc161160c78f0204586b320447096712d657d5 authored almost 7 years ago

Removed test file

e23b8050cbbe88414c1c16c90a184a459d1a4a70 authored almost 7 years ago

Spatial distribution code #11

f42be0aba669bbc3c627ff025ec58dcda3f28787 authored almost 7 years ago

Solve merge conflict

bde98968d5ce0a903c2b67a8a9853532f1abd118 authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

894918c82bc76eef1d29d6661675d37890d15ede authored almost 7 years ago

remove bad line

7af9bd9c6fbc39e6a90f8159cdb7f9fcb855cec2 authored almost 7 years ago

1st working version

342feec65ca0fe106af29e09b0ac28704213e722 authored almost 7 years ago

GenHeatMap.R: Check variable unique lengths and set longest one as x-axis.

d0636edcef0b9e2aa7bc32f74b0fb71600e70dd0 authored almost 7 years ago

shiny updates small

971766ec8f29c9203cff110c0cbf79a61ebb1c4b authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

a54561e7f213e83b775eadf3441c5be239b146fb authored almost 7 years ago

try to remove pd

3796ce64e8df953c7cb2a19a2843c060be3e2555 authored almost 7 years ago

Update .gitignore

ignore weird mac files

66c1b969e6caa2e89a307f9775aa78ca6c48d7b9 authored almost 7 years ago

GenHeatMap.R: Index data by column indices rather than colnames to avoid errors caused by unusual symbols

48c719c90757c5da342e4059496a2117db253d65 authored almost 7 years ago

DESCRIPTION: added rehshape2 and ggplot2 as dependencies

8bdc98091ef03407b56405c279f92d45aa60e676 authored almost 7 years ago

eviatlas.R: added reshape2 and ggplot2 as imported packages

747e1ca7ff807f893aa00cbf1e09a1febe7242a2 authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

* 'master' of https://github.com/ESHackathon/eviatlas:
package stuff is urgh
package stuff i...

4640e904180e47eee22c0b108333381ac9fd2d15 authored almost 7 years ago

GenHeatMap.R: Remove library() from inside function

d0e16109239ca93064c0d190ec1b81a32c4ccf49 authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

da05c8ca7fc5f382feb8cc54afc3555c21e52a99 authored almost 7 years ago

package stuff is urgh

e704908aa467d46ee460ea8e361c048fd0051315 authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

* 'master' of https://github.com/ESHackathon/eviatlas:
shiny update
slight changes to functi...

7accb93ad05b16b35b643402cfac1b1b3d5f0469 authored almost 7 years ago

package stuff is dumb

4dde5b1694ceeb5798bd735cc99f9c80a94d7e63 authored almost 7 years ago

GenHeatMap.R: replace deprecated functions

b1f248e27a0c8c3478784b7b5851c4064873485f authored almost 7 years ago

shiny update

b63bec01e0221068e82c12ed443881bac85b2367 authored almost 7 years ago

slight changes to functions

9b01007ec3cba156fe222f103d633d863910b4ae authored almost 7 years ago

The package now loads! Dependencies now seem to load #13. And the function's documentation is fixed up #1. :notes:

b0734d8e448b5e13d25373e9da7d094df9d77778 authored almost 7 years ago

Trying to figure out how to load the dependencies required for the function. #1 #13 :notes:

72228e86b8e4fa94f35bd9aaf8e46d3224eaa319 authored almost 7 years ago

Minor change in comments #9

8a4b9edaa852d1a07ae219e103e4a0327f62ad9a authored almost 7 years ago

Merge branch 'master' of https://github.com/ESHackathon/eviatlas

fbadc229181674aa102ec17cee55a288c5d9d77c authored almost 7 years ago

Minor change in description #9

8be5ba5a6e705bb68261db59e8719746331742bd authored almost 7 years ago

heatmap generates based on dropdown input

0aa382e11940fa6aa6c76ec44af386bf146e534e authored almost 7 years ago

shiny update before Ezgi breaks everything!!!

c14b504f28b7402ec3d7fa01234b6289c84c4689 authored almost 7 years ago

Function created for Time Trend plots, still needs checking #9

bc56d0737e3c7c25480eec22ff62263435371fac authored almost 7 years ago

Code for creating time trend plot #9

860c84ab5908fc4f6d3819806ff84ad484c55395 authored almost 7 years ago

actually giving the correct name

bb36ca61e13f304770a2c2db33ee06d2358e133a authored almost 7 years ago

heatmap func in right place (cue radiohead)

2f2d0bccdc54c05c8e8267db40049401d409ea6f authored almost 7 years ago

Test code for funct_heatmap01 #7

2c5dfa21154005846db9a363f8474c771c44236e authored almost 7 years ago

heatmap appears via bootleg process, next step is to generate via sanitas function

720b610cf25e9d8bb44bf0b5dcd6c1b7bcf70f0c authored almost 7 years ago

Function version of heatmap that can handle both numerical and character data #7

392db39ee2ac7fff9c00dc27b494088d12a25252 authored almost 7 years ago

basic functioning shiny app working

7d16253bc426f5a417e44bea230f774d9b85e02a authored almost 7 years ago