Code

Rails4#188

Code

Merged

jywarren merged 143 commits intojywarren:rails4jywarren/mapknitter:rails4from alaxalves:rails4alaxalves/mapknitter:rails4Copy head branch name to clipboardApr 6, 2019

+5,635-800

Commits

Commits on May 12, 2016

• Contribute Dockerfile for working within a container

  icarito

  committed
  efd787d

  Copy full SHA for efd787d

Commits on Jan 16, 2017

• Initial change made.

  Pk13055

  committed
  5cb85e4

  Copy full SHA for 5cb85e4

• Merge pull request publiclab#223 from icarito/master

  Show description for c44b644
  jywarren

  authored
  c44b644

  Copy full SHA for c44b644

• .travis.yml

  Show description for e490048
  jywarren

  committed
  e490048

  Copy full SHA for e490048

• slight adjustment to docker-compose.yml

  jywarren

  committed
  f5e71a7

  Copy full SHA for f5e71a7

• path fix

  jywarren

  committed
  e5e86c7

  Copy full SHA for e5e86c7

• bower.json

  jywarren

  committed
  11296e5

  Copy full SHA for 11296e5

• bower.json openlayers

  jywarren

  committed
  afa6af5

  Copy full SHA for afa6af5

• bower.json openlayers tweak 2

  jywarren

  committed
  69f5471

  Copy full SHA for 69f5471

Commits on Jan 17, 2017

• added rake

  jywarren

  committed
  2651f44

  Copy full SHA for 2651f44

• Gemfile version tweak

  jywarren

  committed
  8226dc0

  Copy full SHA for 8226dc0

• updated gemfile and Gemfile.lock

  jywarren

  committed
  5da1320

  Copy full SHA for 5da1320

• bundle exec

  jywarren

  committed
  162b95a

  Copy full SHA for 162b95a

Commits on Feb 14, 2017

• testing map map for only non-anonymous

  jywarren

  committed
  8025b9b

  Copy full SHA for 8025b9b

Commits on Feb 15, 2017

• echoing gem list to debug

  jywarren

  committed
  c5393ae

  Copy full SHA for c5393ae

• rvm

  jywarren

  committed
  4856043

  Copy full SHA for 4856043

• additional travis.yml tweaks

  jywarren

  committed
  d67c077

  Copy full SHA for d67c077

Commits on Feb 17, 2017

• Update .travis.yml

  jywarren

  authored
  1d53cfb

  Copy full SHA for 1d53cfb

• Allow bundler to use system gems.

  icarito

  committed
  ab7bdf5

  Copy full SHA for ab7bdf5

• Added mysql2 adapter dependency, tweaked database.yml and travis.yml

  icarito

  committed
  c1873b0

  Copy full SHA for c1873b0

Commits on Feb 18, 2017

• Added mysql2 adapter, longer wait for db

  icarito

  committed
  4b810f0

  Copy full SHA for 4b810f0

Commits on Jul 5, 2017

• Update _list.html.erb

  jywarren

  authored
  b9dc546

  Copy full SHA for b9dc546

• Update _list.html.erb

  jywarren

  authored
  64f05b3

  Copy full SHA for 64f05b3

• Update maps_controller.rb

  jywarren

  authored
  d7f61c0

  Copy full SHA for d7f61c0

• Update feeds_controller.rb

  jywarren

  authored
  af6721b

  Copy full SHA for af6721b

• Update Gemfile

  jywarren

  authored
  013cad2

  Copy full SHA for 013cad2

• Update Gemfile

  jywarren

  authored
  26f0bc1

  Copy full SHA for 26f0bc1

• Update .travis.yml

  jywarren

  authored
  20eb710

  Copy full SHA for 20eb710

• Update database.yml.example

  jywarren

  authored
  d1e801b

  Copy full SHA for d1e801b

• recaptcha tweaks

  jywarren

  committed
  a72a0c4

  Copy full SHA for a72a0c4

• Merge pull request publiclab#235 from publiclab/travis-yml

  Show description for a415054
  jywarren

  authored
  a415054

  Copy full SHA for a415054

• Merge pull request publiclab#234 from jywarren/map-map-non-anon

  Show description for 5c372b0
  jywarren

  authored
  5c372b0

  Copy full SHA for 5c372b0

• Merge pull request publiclab#231 from Pk13055/logged-in-maps

  Show description for b865c2e
  jywarren

  authored
  b865c2e

  Copy full SHA for b865c2e

• Merge branch 'archiving' of https://github.com/publiclab/mapknitter into archiving

  jywarren

  committed
  3ddf7ae

  Copy full SHA for 3ddf7ae

• Merge pull request publiclab#238 from publiclab/archiving

  Show description for 27e8a31
  jywarren

  authored
  27e8a31

  Copy full SHA for 27e8a31

Commits on Jul 6, 2017

• Update _list.html.erb

  jywarren

  authored
  ae34b39

  Copy full SHA for ae34b39

• Update routes.rb

  jywarren

  authored
  eced918

  Copy full SHA for eced918

• Merge pull request publiclab#239 from publiclab/spam-mgmt

  Show description for 0badbde
  jywarren

  authored
  0badbde

  Copy full SHA for 0badbde

• Update maps_controller.rb

  jywarren

  authored
  2ec02dd

  Copy full SHA for 2ec02dd

• Merge pull request publiclab#240 from publiclab/spam-fix-2

  Show description for 7977982
  jywarren

  authored
  7977982

  Copy full SHA for 7977982

Commits on Jul 7, 2017

• Update clean.builder

  jywarren

  authored
  48260ab

  Copy full SHA for 48260ab

• Merge pull request publiclab#241 from publiclab/feed-images

  Show description for 9cfb312
  jywarren

  authored
  9cfb312

  Copy full SHA for 9cfb312

• Update clean.builder

  jywarren

  authored
  7d06f7a

  Copy full SHA for 7d06f7a

Commits on Jan 4, 2018

• leaflet v1.0

  jywarren

  committed
  20521ec

  Copy full SHA for 20521ec

• dockerfile fix

  jywarren

  committed
  4d0a5d6

  Copy full SHA for 4d0a5d6

Commits on Jan 5, 2018

• updating to Leaflet 1.0, GoogleMutant tile layer, other tweaks

  jywarren

  committed
  dc5fb66

  Copy full SHA for dc5fb66

• js tweaks

  jywarren

  committed
  46872e2

  Copy full SHA for 46872e2

• update gemfile recaptcha version

  jywarren

  committed
  23ea8a8

  Copy full SHA for 23ea8a8

• Gemfile.lock

  jywarren

  committed
  405a1a7

  Copy full SHA for 405a1a7

• unrelated tweaks

  jywarren

  committed
  88bd8bd

  Copy full SHA for 88bd8bd

Commits on Jan 6, 2018

• Update Readme.md

  Show description for a048ebe
  H1manshu21

  authored
  a048ebe

  Copy full SHA for a048ebe

Commits on Jan 12, 2018

• recaptcha fixes

  jywarren

  committed
  e28933a

  Copy full SHA for e28933a

• Merge pull request publiclab#243 from jywarren/leaflet-1.0

  Show description for da920d1
  jywarren

  authored
  da920d1

  Copy full SHA for da920d1

• fixes

  jywarren

  committed
  4f8408f

  Copy full SHA for 4f8408f

• Upgrade dependencies.

  

  plotsbot

  authored and

  jywarren

  committed
  181d605

  Copy full SHA for 181d605

• Merge pull request publiclab#247 from jywarren/recaptcha

  Show description for dd5f6bf
  jywarren

  authored
  dd5f6bf

  Copy full SHA for dd5f6bf

• Merge pull request publiclab#242 from publiclab/dep_update

  Show description for 4b26fbb
  jywarren

  authored
  4b26fbb

  Copy full SHA for 4b26fbb

• Merge pull request publiclab#244 from Himanshu40/patch-1

  Show description for 8b47537
  jywarren

  authored
  8b47537

  Copy full SHA for 8b47537

Commits on Jan 22, 2018

• updated paperclip

  jywarren

  committed
  4b970ab

  Copy full SHA for 4b970ab

Commits on Jan 23, 2018

• Merge pull request publiclab#249 from jywarren/gemfile

  Show description for 61e8035
  jywarren

  authored
  61e8035

  Copy full SHA for 61e8035

Commits on Feb 28, 2018

• issue publiclab#253 flag as spam

  

  Susan Lippa

  committed
  865c420

  Copy full SHA for 865c420

Commits on Mar 1, 2018

• Merge pull request publiclab#254 from slippa91/issue#252

  Show description for 97473ed
  jywarren

  authored
  97473ed

  Copy full SHA for 97473ed

Commits on May 3, 2018

• integrate image-sequencer

  jywarren

  authored
  b505e8b

  Copy full SHA for b505e8b

• Merge pull request publiclab#259 from publiclab/image-sequencer

  Show description for 6f16e52
  jywarren

  authored
  6f16e52

  Copy full SHA for 6f16e52

• Update knitter2.html.erb

  jywarren

  authored
  fdc273e

  Copy full SHA for fdc273e

• Update bower.json

  jywarren

  authored
  dccefc5

  Copy full SHA for dccefc5

• Merge pull request publiclab#260 from publiclab/image-sequencer-include

  Show description for f766d0a
  jywarren

  authored
  f766d0a

  Copy full SHA for f766d0a

• Update show.html.erb

  jywarren

  authored
  97faffa

  Copy full SHA for 97faffa

• Update show.html.erb

  jywarren

  authored
  9634922

  Copy full SHA for 9634922

• Update show.html.erb

  jywarren

  authored
  c35e244

  Copy full SHA for c35e244

Commits on May 7, 2018

• Update bower.json

  jywarren

  authored
  2631ddb

  Copy full SHA for 2631ddb

• modded button and prompt

  jywarren

  committed
  bf9b5da

  Copy full SHA for bf9b5da

• Merge pull request publiclab#261 from jywarren/ndvi-btn

  Show description for 3e28652
  jywarren

  authored
  3e28652

  Copy full SHA for 3e28652

Commits on May 24, 2018

• Update _list.html.erb

  jywarren

  authored
  7c6210c

  Copy full SHA for 7c6210c

• Merge pull request publiclab#265 from publiclab/anon-flagging

  Show description for ad22d8c
  jywarren

  authored
  ad22d8c

  Copy full SHA for ad22d8c

Commits on May 25, 2018

• API request handled for region-action

  sagarpreet-chadha

  authored
  791a406

  Copy full SHA for 791a406

Commits on May 29, 2018

• Merge pull request publiclab#266 from sagarpreet-chadha/patch-1

  Show description for 5b93f6a
  jywarren

  authored
  5b93f6a

  Copy full SHA for 5b93f6a

Commits on Jun 17, 2018

• more efficient spam redirect URL

  jywarren

  authored
  ef39dcc

  Copy full SHA for ef39dcc

• Merge pull request publiclab#267 from publiclab/spam-redirect

  Show description for 4d0ce99
  jywarren

  authored
  4d0ce99

  Copy full SHA for 4d0ce99

• Update Map.js

  jywarren

  authored
  17e8afb

  Copy full SHA for 17e8afb

Commits on Jun 27, 2018

• Update _login_form.html.erb

  jywarren

  authored
  e2065cc

  Copy full SHA for e2065cc

Commits on Jul 3, 2018

• Add files via upload

  jywarren

  authored
  f380af4

  Copy full SHA for f380af4

• Update README.md

  jywarren

  authored
  524a149

  Copy full SHA for 524a149

Commits on Jul 7, 2018

• bower updated

  sagarpreet-chadha

  authored
  f9a77fc

  Copy full SHA for f9a77fc

• Map added

  sagarpreet-chadha

  authored
  db542cb

  Copy full SHA for db542cb

• Update index.html.erb

  sagarpreet-chadha

  authored
  499e0d5

  Copy full SHA for 499e0d5

Commits on Jul 10, 2018

• Update _list.html.erb

  jywarren

  authored
  24b2774

  Copy full SHA for 24b2774

• Update index.html.erb

  jywarren

  authored
  62754fb

  Copy full SHA for 62754fb

Commits on Jul 11, 2018

• Update index.html.erb

  sagarpreet-chadha

  authored
  8c73df5

  Copy full SHA for 8c73df5

Commits on Jul 12, 2018

• Changed width to full width .

  sagarpreet-chadha

  authored
  aa9d414

  Copy full SHA for aa9d414

• Merge pull request publiclab#269 from sagarpreet-chadha/patch-2

  Show description for cd1715c
  jywarren

  authored
  cd1715c

  Copy full SHA for cd1715c

Commits on Jul 19, 2018

• Added all layers from leaflet-environmental-layers

  sagarpreet-chadha

  authored
  3b5cf57

  Copy full SHA for 3b5cf57

• Update bower.json

  sagarpreet-chadha

  authored
  7f9b7af

  Copy full SHA for 7f9b7af

Commits on Jul 26, 2018

• Merge pull request publiclab#270 from sagarpreet-chadha/patch-3

  Show description for 51fb2b5
  jywarren

  authored
  51fb2b5

  Copy full SHA for 51fb2b5

Commits on Aug 1, 2018

• Default Mapknitter Markers added

  sagarpreet-chadha

  authored
  851a330

  Copy full SHA for 851a330

• Merge pull request publiclab#272 from sagarpreet-chadha/patch-4

  Show description for d3f6124
  jywarren

  authored
  d3f6124

  Copy full SHA for d3f6124

• Version updated for LEL .

  sagarpreet-chadha

  authored
  2e022ed

  Copy full SHA for 2e022ed

Commits on Aug 2, 2018

• Full screen support added

  sagarpreet-chadha

  authored
  0c0ff36

  Copy full SHA for 0c0ff36

• Merge pull request publiclab#275 from sagarpreet-chadha/patch-6

  Show description for 1936029
  jywarren

  authored
  1936029

  Copy full SHA for 1936029

Commits on Oct 10, 2018

• Update bower.json

  jywarren

  authored
  5f39f41

  Copy full SHA for 5f39f41

• Merge pull request publiclab#273 from sagarpreet-chadha/patch-5

  Show description for 6d8d8b5
  jywarren

  authored
  6d8d8b5

  Copy full SHA for 6d8d8b5

Commits on Oct 12, 2018

• Create first timers issue template.md

  faithngetich

  authored
  9c4d1ed

  Copy full SHA for 9c4d1ed

• Create config.yml

  faithngetich

  authored
  98417ec

  Copy full SHA for 98417ec

Commits on Oct 24, 2018

• spam links in moderation feeds

  jywarren

  committed
  9e96c6d

  Copy full SHA for 9e96c6d

• Merge pull request publiclab#281 from jywarren/spam-rss

  Show description for 8fc44e7
  jywarren

  authored
  8fc44e7

  Copy full SHA for 8fc44e7

• Add mapknitter to the help wanted link

  Show description for 638b74d
  

  jywarren

  and

  faithngetich

  authored
  638b74d

  Copy full SHA for 638b74d

• Replace the community link with the code.public link

  Show description for 8b05c7e
  

  jywarren

  and

  faithngetich

  authored
  8b05c7e

  Copy full SHA for 8b05c7e

• Update the first time only link to code.public

  Show description for a084fb0
  

  jywarren

  and

  faithngetich

  authored
  a084fb0

  Copy full SHA for a084fb0

• Use the correct link to indicate where the code will be published

  Show description for df552a4
  

  jywarren

  and

  faithngetich

  authored
  df552a4

  Copy full SHA for df552a4

• Merge pull request publiclab#278 from faithngetich/patch-1

  Show description for 6ccc94c
  jywarren

  authored
  6ccc94c

  Copy full SHA for 6ccc94c

• Merge pull request publiclab#279 from faithngetich/patch-2

  Show description for 37a7b39
  jywarren

  authored
  37a7b39

  Copy full SHA for 37a7b39

Commits on Nov 17, 2018

• Update index.html.erb

  sagarpreet-chadha

  authored
  4b98a61

  Copy full SHA for 4b98a61

• Update bower.json

  sagarpreet-chadha

  authored
  5e601d5

  Copy full SHA for 5e601d5

Commits on Nov 19, 2018

• Update bower.json

  sagarpreet-chadha

  authored
  8a14927

  Copy full SHA for 8a14927

Commits on Nov 24, 2018

• Update bower.json

  sagarpreet-chadha

  authored
  257f649

  Copy full SHA for 257f649

Commits on Nov 26, 2018

• Merge pull request publiclab#283 from sagarpreet-chadha/patch-7

  Show description for a0adafc
  jywarren

  authored
  a0adafc

  Copy full SHA for a0adafc

Commits on Jan 2, 2019

• Peg GoogleMutant layer to v0.7.0

  Show description for 9f4cdfb
  jywarren

  authored
  9f4cdfb

  Copy full SHA for 9f4cdfb

Commits on Jan 6, 2019

• [Security] Bump nokogiri from 1.8.1 to 1.9.1

  Show description for 8263c65
  dependabot-support

  committed
  8263c65

  Copy full SHA for 8263c65

Commits on Jan 10, 2019

• Merge pull request publiclab#291 from publiclab/dependabot/bundler/nokogiri-1.9.1

  Show description for 645d3fd
  jywarren

  authored
  645d3fd

  Copy full SHA for 645d3fd

• Bump will_paginate from 3.0.7 to 3.1.6

  Show description for ddb76d8
  dependabot-support

  committed
  ddb76d8

  Copy full SHA for ddb76d8

Commits on Jan 29, 2019

• Merge pull request publiclab#295 from publiclab/dependabot/bundler/will_paginate-3.1.6

  Show description for 32e96ff
  jywarren

  authored
  32e96ff

  Copy full SHA for 32e96ff

Commits on Jan 30, 2019

• Cleanup (publiclab#313)

  Show description for af35520
  jywarren

  authored
  af35520

  Copy full SHA for af35520

Commits on Jan 31, 2019

• Bump rake from 10.5.0 to 12.3.2 (publiclab#286)

  Show description for 20d887f
  

  dependabot[bot]

  authored and

  jywarren

  committed
  20d887f

  Copy full SHA for 20d887f

Commits on Feb 7, 2019

• [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289)

  Show description for 03d610a
  

  dependabot[bot]

  authored and

  jywarren

  committed
  03d610a

  Copy full SHA for 03d610a

• Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321)

  Show description for 0dbc76c
  

  dependabot[bot]

  authored and

  jywarren

  committed
  0dbc76c

  Copy full SHA for 0dbc76c

Commits on Feb 8, 2019

• Unit test warpable code (publiclab#331)

  Show description for 153f668
  jywarren

  authored
  153f668

  Copy full SHA for 153f668

• Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332)

  Show description for bc61a7e
  

  dependabot[bot]

  authored and

  jywarren

  committed
  bc61a7e

  Copy full SHA for bc61a7e

• Show only maps with at least one image in main listing

  jywarren

  committed
  26d458d

  Copy full SHA for 26d458d

• Update Leaflet.DistortableImage version

  jywarren

  committed
  ddf5892

  Copy full SHA for ddf5892

• basic map unit tests (publiclab#334)

  Show description for 76a898f
  jywarren

  authored
  76a898f

  Copy full SHA for 76a898f

Commits on Feb 9, 2019

• Updates to customize rails / ruby and mySQL version compatibility (publiclab#323)

  Show description for de15628
  

  sashadev-sky

  authored and

  jywarren

  committed
  de15628

  Copy full SHA for de15628

Commits on Feb 15, 2019

• update readme.md (publiclab#335)

  Show description for bf0b340
  

  HarshCic

  authored and

  jywarren

  committed
  bf0b340

  Copy full SHA for bf0b340

Commits on Feb 20, 2019

• Ruby upgrade to 2.4.4 (publiclab#320)

  Show description for a9c3bf7
  

  grvsachdeva

  authored and

  jywarren

  committed
  a9c3bf7

  Copy full SHA for a9c3bf7

Commits on Feb 21, 2019

• Fix map of maps (publiclab#354)

  

  kaustubh-nair

  authored and

  jywarren

  committed
  f0e95cf

  Copy full SHA for f0e95cf

• add image urls to maps json (publiclab#352)

  Show description for 84185c7
  

  kaustubh-nair

  authored and

  jywarren

  committed
  84185c7

  Copy full SHA for 84185c7

Commits on Feb 27, 2019

• Shortening docker image in ~30%

  alaxalves

  committed
  a0aed1a

  Copy full SHA for a0aed1a

• Caching bundle, gathering env variables and using newer sintax

  alaxalves

  committed
  bad2af5

  Copy full SHA for bad2af5

• Creating startup script and env file

  alaxalves

  committed
  a43d22b

  Copy full SHA for a43d22b

• Improving travis CI configuration

  alaxalves

  committed
  c59753b

  Copy full SHA for c59753b

Commits on Mar 4, 2019

• Switch to Yarn from Bower

  Show description for c04c5dd
  

  alaxalves

  and

  kaustubh-nair

  committed
  c04c5dd

  Copy full SHA for c04c5dd

Commits on Mar 5, 2019

• Loading assets in production env

  alaxalves

  committed
  cff2d9c

  Copy full SHA for cff2d9c

• Allow uglifier to interpret ES6, removing yarn-error.log

  alaxalves

  committed
  0a02c1a

  Copy full SHA for 0a02c1a

Commits on Mar 7, 2019

• updating to rails4.2.8

  alaxalves

  committed
  cdbf878

  Copy full SHA for cdbf878