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.

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

Rails4 #188

Merged
merged 143 commits into from
Apr 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
efd787d
Contribute Dockerfile for working within a container
icarito May 12, 2016
5cb85e4
Initial change made.
Pk13055 Jan 16, 2017
c44b644
Merge pull request #223 from icarito/master
jywarren Jan 16, 2017
e490048
.travis.yml
jywarren Jan 16, 2017
f5e71a7
slight adjustment to docker-compose.yml
jywarren Jan 16, 2017
e5e86c7
path fix
jywarren Jan 16, 2017
11296e5
bower.json
jywarren Jan 16, 2017
afa6af5
bower.json openlayers
jywarren Jan 16, 2017
69f5471
bower.json openlayers tweak 2
jywarren Jan 16, 2017
2651f44
added rake
jywarren Jan 17, 2017
8226dc0
Gemfile version tweak
jywarren Jan 17, 2017
5da1320
updated gemfile and Gemfile.lock
jywarren Jan 17, 2017
162b95a
bundle exec
jywarren Jan 17, 2017
8025b9b
testing map map for only non-anonymous
jywarren Feb 14, 2017
c5393ae
echoing gem list to debug
jywarren Feb 15, 2017
4856043
rvm
jywarren Feb 15, 2017
d67c077
additional travis.yml tweaks
jywarren Feb 15, 2017
1d53cfb
Update .travis.yml
jywarren Feb 17, 2017
ab7bdf5
Allow bundler to use system gems.
icarito Feb 17, 2017
c1873b0
Added mysql2 adapter dependency, tweaked database.yml and travis.yml
icarito Feb 17, 2017
4b810f0
Added mysql2 adapter, longer wait for db
icarito Feb 17, 2017
b9dc546
Update _list.html.erb
jywarren Jul 5, 2017
64f05b3
Update _list.html.erb
jywarren Jul 5, 2017
d7f61c0
Update maps_controller.rb
jywarren Jul 5, 2017
af6721b
Update feeds_controller.rb
jywarren Jul 5, 2017
013cad2
Update Gemfile
jywarren Jul 5, 2017
26f0bc1
Update Gemfile
jywarren Jul 5, 2017
20eb710
Update .travis.yml
jywarren Jul 5, 2017
d1e801b
Update database.yml.example
jywarren Jul 5, 2017
a72a0c4
recaptcha tweaks
jywarren Jul 5, 2017
a415054
Merge pull request #235 from publiclab/travis-yml
jywarren Jul 5, 2017
5c372b0
Merge pull request #234 from jywarren/map-map-non-anon
jywarren Jul 5, 2017
b865c2e
Merge pull request #231 from Pk13055/logged-in-maps
jywarren Jul 5, 2017
3ddf7ae
Merge branch 'archiving' of https://github.com/publiclab/mapknitter i…
jywarren Jul 5, 2017
27e8a31
Merge pull request #238 from publiclab/archiving
jywarren Jul 5, 2017
ae34b39
Update _list.html.erb
jywarren Jul 6, 2017
eced918
Update routes.rb
jywarren Jul 6, 2017
0badbde
Merge pull request #239 from publiclab/spam-mgmt
jywarren Jul 6, 2017
2ec02dd
Update maps_controller.rb
jywarren Jul 6, 2017
7977982
Merge pull request #240 from publiclab/spam-fix-2
jywarren Jul 6, 2017
48260ab
Update clean.builder
jywarren Jul 7, 2017
9cfb312
Merge pull request #241 from publiclab/feed-images
jywarren Jul 7, 2017
7d06f7a
Update clean.builder
jywarren Jul 7, 2017
20521ec
leaflet v1.0
jywarren Jan 4, 2018
4d0a5d6
dockerfile fix
jywarren Jan 4, 2018
dc5fb66
updating to Leaflet 1.0, GoogleMutant tile layer, other tweaks
jywarren Jan 5, 2018
46872e2
js tweaks
jywarren Jan 5, 2018
23ea8a8
update gemfile recaptcha version
jywarren Jan 5, 2018
405a1a7
Gemfile.lock
jywarren Jan 5, 2018
88bd8bd
unrelated tweaks
jywarren Jan 5, 2018
a048ebe
Update Readme.md
H1manshu21 Jan 6, 2018
e28933a
recaptcha fixes
jywarren Jan 12, 2018
da920d1
Merge pull request #243 from jywarren/leaflet-1.0
jywarren Jan 12, 2018
4f8408f
fixes
jywarren Jan 12, 2018
181d605
Upgrade dependencies.
plotsbot Jan 4, 2018
dd5f6bf
Merge pull request #247 from jywarren/recaptcha
jywarren Jan 12, 2018
4b26fbb
Merge pull request #242 from publiclab/dep_update
jywarren Jan 12, 2018
8b47537
Merge pull request #244 from Himanshu40/patch-1
jywarren Jan 12, 2018
4b970ab
updated paperclip
jywarren Jan 22, 2018
61e8035
Merge pull request #249 from jywarren/gemfile
jywarren Jan 23, 2018
865c420
issue #253 flag as spam
Feb 28, 2018
97473ed
Merge pull request #254 from slippa91/issue#252
jywarren Mar 1, 2018
b505e8b
integrate image-sequencer
jywarren May 3, 2018
6f16e52
Merge pull request #259 from publiclab/image-sequencer
jywarren May 3, 2018
fdc273e
Update knitter2.html.erb
jywarren May 3, 2018
dccefc5
Update bower.json
jywarren May 3, 2018
f766d0a
Merge pull request #260 from publiclab/image-sequencer-include
jywarren May 3, 2018
97faffa
Update show.html.erb
jywarren May 3, 2018
9634922
Update show.html.erb
jywarren May 3, 2018
c35e244
Update show.html.erb
jywarren May 3, 2018
2631ddb
Update bower.json
jywarren May 7, 2018
bf9b5da
modded button and prompt
jywarren May 7, 2018
3e28652
Merge pull request #261 from jywarren/ndvi-btn
jywarren May 7, 2018
7c6210c
Update _list.html.erb
jywarren May 24, 2018
ad22d8c
Merge pull request #265 from publiclab/anon-flagging
jywarren May 24, 2018
791a406
API request handled for region-action
sagarpreet-chadha May 25, 2018
5b93f6a
Merge pull request #266 from sagarpreet-chadha/patch-1
jywarren May 29, 2018
ef39dcc
more efficient spam redirect URL
jywarren Jun 17, 2018
4d0ce99
Merge pull request #267 from publiclab/spam-redirect
jywarren Jun 17, 2018
17e8afb
Update Map.js
jywarren Jun 17, 2018
e2065cc
Update _login_form.html.erb
jywarren Jun 27, 2018
f380af4
Add files via upload
jywarren Jul 3, 2018
524a149
Update README.md
jywarren Jul 3, 2018
f9a77fc
bower updated
sagarpreet-chadha Jul 7, 2018
db542cb
Map added
sagarpreet-chadha Jul 7, 2018
499e0d5
Update index.html.erb
sagarpreet-chadha Jul 7, 2018
24b2774
Update _list.html.erb
jywarren Jul 10, 2018
62754fb
Update index.html.erb
jywarren Jul 10, 2018
8c73df5
Update index.html.erb
sagarpreet-chadha Jul 11, 2018
aa9d414
Changed width to full width .
sagarpreet-chadha Jul 12, 2018
cd1715c
Merge pull request #269 from sagarpreet-chadha/patch-2
jywarren Jul 12, 2018
3b5cf57
Added all layers from leaflet-environmental-layers
sagarpreet-chadha Jul 19, 2018
7f9b7af
Update bower.json
sagarpreet-chadha Jul 19, 2018
51fb2b5
Merge pull request #270 from sagarpreet-chadha/patch-3
jywarren Jul 26, 2018
851a330
Default Mapknitter Markers added
sagarpreet-chadha Aug 1, 2018
d3f6124
Merge pull request #272 from sagarpreet-chadha/patch-4
jywarren Aug 1, 2018
2e022ed
Version updated for LEL .
sagarpreet-chadha Aug 1, 2018
0c0ff36
Full screen support added
sagarpreet-chadha Aug 2, 2018
1936029
Merge pull request #275 from sagarpreet-chadha/patch-6
jywarren Aug 2, 2018
5f39f41
Update bower.json
jywarren Oct 10, 2018
6d8d8b5
Merge pull request #273 from sagarpreet-chadha/patch-5
jywarren Oct 10, 2018
9c4d1ed
Create first timers issue template.md
faithngetich Oct 12, 2018
98417ec
Create config.yml
faithngetich Oct 12, 2018
9e96c6d
spam links in moderation feeds
jywarren Oct 24, 2018
8fc44e7
Merge pull request #281 from jywarren/spam-rss
jywarren Oct 24, 2018
638b74d
Add mapknitter to the help wanted link
jywarren Oct 24, 2018
8b05c7e
Replace the community link with the code.public link
jywarren Oct 24, 2018
a084fb0
Update the first time only link to code.public
jywarren Oct 24, 2018
df552a4
Use the correct link to indicate where the code will be published
jywarren Oct 24, 2018
6ccc94c
Merge pull request #278 from faithngetich/patch-1
jywarren Oct 24, 2018
37a7b39
Merge pull request #279 from faithngetich/patch-2
jywarren Oct 24, 2018
4b98a61
Update index.html.erb
sagarpreet-chadha Nov 17, 2018
5e601d5
Update bower.json
sagarpreet-chadha Nov 17, 2018
8a14927
Update bower.json
sagarpreet-chadha Nov 19, 2018
257f649
Update bower.json
sagarpreet-chadha Nov 24, 2018
a0adafc
Merge pull request #283 from sagarpreet-chadha/patch-7
jywarren Nov 26, 2018
9f4cdfb
Peg GoogleMutant layer to v0.7.0
jywarren Jan 2, 2019
8263c65
[Security] Bump nokogiri from 1.8.1 to 1.9.1
dependabot-support Jan 6, 2019
645d3fd
Merge pull request #291 from publiclab/dependabot/bundler/nokogiri-1.9.1
jywarren Jan 10, 2019
ddb76d8
Bump will_paginate from 3.0.7 to 3.1.6
dependabot-support Jan 10, 2019
32e96ff
Merge pull request #295 from publiclab/dependabot/bundler/will_pagina…
jywarren Jan 29, 2019
af35520
Cleanup (#313)
jywarren Jan 30, 2019
20d887f
Bump rake from 10.5.0 to 12.3.2 (#286)
dependabot[bot] Jan 31, 2019
03d610a
[Security] Bump i18n from 0.7.0 to 0.9.5 (#289)
dependabot[bot] Feb 7, 2019
0dbc76c
Bump rdiscount from 2.1.7.1 to 2.2.0.1 (#321)
dependabot[bot] Feb 7, 2019
153f668
Unit test warpable code (#331)
jywarren Feb 8, 2019
bc61a7e
Bump recaptcha from 4.6.3 to 4.9.0 (#332)
dependabot[bot] Feb 8, 2019
26d458d
Show only maps with at least one image in main listing
jywarren Jan 16, 2019
ddf5892
Update Leaflet.DistortableImage version
jywarren Feb 8, 2019
76a898f
basic map unit tests (#334)
jywarren Feb 8, 2019
de15628
Updates to customize rails / ruby and mySQL version compatibility (#…
sashadev-sky Feb 9, 2019
bf0b340
update readme.md (#335)
HarshCic Feb 15, 2019
a9c3bf7
Ruby upgrade to 2.4.4 (#320)
grvsachdeva Feb 20, 2019
f0e95cf
Fix map of maps (#354)
kaustubh-nair Feb 21, 2019
84185c7
add image urls to maps json (#352)
kaustubh-nair Feb 21, 2019
a0aed1a
Shortening docker image in ~30%
alaxalves Feb 27, 2019
bad2af5
Caching bundle, gathering env variables and using newer sintax
alaxalves Feb 27, 2019
a43d22b
Creating startup script and env file
alaxalves Feb 27, 2019
c59753b
Improving travis CI configuration
alaxalves Feb 27, 2019
c04c5dd
Switch to Yarn from Bower
alaxalves Mar 4, 2019
cff2d9c
Loading assets in production env
alaxalves Mar 5, 2019
0a02c1a
Allow uglifier to interpret ES6, removing yarn-error.log
alaxalves Mar 5, 2019
cdbf878
updating to rails4.2.8
alaxalves Mar 7, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

3 changes: 0 additions & 3 deletions .bundle/config

This file was deleted.

25 changes: 25 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Configuration for welcome - https://github.com/behaviorbot/welcome

# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome

# Comment to be posted to on first time issues
newIssueWelcomeComment: |
Thanks for opening your first issue here! Please follow the issue template to help us help you 👍🎉😄
If you have screenshots to share demonstrating the issue, that's really helpful! 📸 You can [make a gif](https://www.cockos.com/licecap/) too!
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome

# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: |
Thanks for opening this pull request! `Dangerbot` will test out your code and reply in a bit with some pointers and requests.
There may be some errors, **but don't worry!** We're here to help! 👍🎉😄
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge

# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: |
Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://mapknitter.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: [Public Lab's coding community!](https://code.publiclab.org)

# It is recommended to include as many gifs and emojis as possible
47 changes: 47 additions & 0 deletions .github/first-timers-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Hi, this is a [first-timers-only issue](https://code.publiclab.org#r=all). This means we've worked to make it more legible to folks who either **haven't contributed to our codebase before, or even folks who haven't contributed to open source before**.

If that's you, we're interested in helping you take the first step and can answer questions and help you out as you do. Note that we're especially interested in contributions from people from groups underrepresented in free and open source software!

We know that the process of creating a pull request is the biggest barrier for new contributors. This issue is for you 💝

If you have contributed before, **consider leaving this one for someone new**, and looking through our general [help wanted](https://github.com/publiclab/mapknitter/labels/help-wanted) issues. Thanks!

### 🤔 What you will need to know.

Nothing. This issue is meant to welcome you to Open Source :) We are happy to walk you through the process.

### 📋 Step by Step

- [ ] 🙋 **Claim this issue**: Comment below. If someone else has claimed it, ask if they've opened a pull request already and if they're stuck -- maybe you can help them solve a problem or move it along!

- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below.

[See this page](https://code.publiclab.org/#r=all) for some help in taking your first steps!

Below is a "diff" showing in red (and a `-`) which lines to remove, and in green (and a `+`) which lines to add:

```diff
$DIFF
```


- [ ] 💾 **Commit** your changes

- [ ] 🔀 **Start a Pull Request**. There are two ways how you can start a pull request:

1. If you are familiar with the terminal or would like to learn it, [here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github) on how to send a pull request using the terminal.

2. You can also [edit files directly in your browser](https://help.github.com/articles/editing-files-in-your-repository/) and open a pull request from there.

- [ ] 🏁 **Done** Ask in comments for a review :)


### 🤔❓ Questions?

Leave a comment below!

### Is someone else already working on this?

We encourage you to link to this issue by mentioning the issue # in your pull request, so we can see if someone's already started on it. **If someone seem stuck, offer them some help!** Otherwise, [take a look at some other issues you can help with](https://publiclab.github.io/community-toolbox/#r=all). Thanks!

(This issue was created by [First-Timers-Bot](https://github.com/hoodiehq/first-timers-bot).)
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ public/lib
node_modules
todo.txt
.sass-cache
yarn-error.log
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
sudo: required
services:
- docker

install:
- cp config/database.yml.example config/database.yml
- cp config/config.yml.example config/config.yml
- cp db/schema.rb.example db/schema.rb
- docker-compose up -d --build
- docker-compose exec web bundle install
- docker-compose exec web /bin/bash -lc "rake db:setup || rake db:migrate"

script:
- docker-compose exec web rake test
3 changes: 3 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--install.modules-folder "./public/lib"
ignore-engines true
ignore-scripts true
26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Dockerfile # Mapknitter
# https://github.com/publiclab/mapknitter/
# This image deploys Mapknitter!

FROM ruby:2.4.4-stretch

# Set correct environment variables.
ENV HOME /root

# Install dependencies
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update -qq && apt-get install -y default-libmysqlclient-dev \
ruby-rmagick libfreeimage3 \
libfreeimage-dev ruby-dev \
gdal-bin python-gdal curl \
libcurl4-openssl-dev libssl-dev \
zip nodejs ##ALSO TRIED: ruby-pg

RUN npm install -g yarn

WORKDIR /app
COPY Gemfile /app/Gemfile
COPY Gemfile.lock /app/Gemfile.lock
COPY start.sh /app/start.sh

CMD [ "sh", "start.sh" ]
27 changes: 27 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Dockerfile # Mapknitter
# https://github.com/publiclab/mapknitter/

FROM ruby:2.3-slim
MAINTAINER Sebastian Silva "sebastian@fuentelibre.org"

LABEL This image deploys Mapknitter!

# Set correct environment variables.
RUN mkdir -p /app
ENV HOME /root

# Install dependencies
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get update -qq && apt-get install -y bundler default-libmysqlclient-dev ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev gdal-bin python-gdal curl libcurl4-openssl-dev libssl-dev zip nodejs ##ALSO TRIED: ruby-pg
RUN npm install -g bower

# Install bundle of gems
WORKDIR /tmp
ADD Gemfile /tmp/Gemfile
ADD Gemfile.lock /tmp/Gemfile.lock
RUN bundle install

# Add the Rails app
WORKDIR /app
ADD . /app
RUN bower install --allow-root
23 changes: 15 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
source "https://rubygems.org"

ruby "2.1.2"
gem "rails", "~>3.2"
ruby "2.4.4"
gem "rails", "4.2.8"
gem 'rake', '~> 12.3.2'

gem "will_paginate", "3.0.7"
gem "will_paginate", "3.1.6"
gem "will_paginate-bootstrap"
gem "friendly_id"

# dependencies
group :dependencies do
gem "mysql", "2.9.1"
gem "mysql2"
gem 'mysql2', '~> 0.3.20'
gem "geokit-rails", "1.1.4"
gem "image_science", "1.2.6"
gem "recaptcha", "0.3.6", :require => "recaptcha/rails"
gem "recaptcha", :require => "recaptcha/rails"
gem "oa-openid", "0.3.2"
gem "ruby-openid", "~>2.5"
gem "open_id_authentication"
gem "RubyInline"
gem "paperclip", "~>4.2.0"
gem "paperclip", "~>4.2.2"
gem 'jquery-rails'
gem 'turbolinks'
gem 'rails-ujs'

# if you use amazon s3 for warpable image storage
gem 'aws-sdk', '~> 1.5.7'
Expand All @@ -27,7 +30,7 @@ group :dependencies do
gem 'right_aws'

# compiling markdown to html
gem "rdiscount", "2.1.7.1"
gem "rdiscount", "2.2.0.1"

# asset pipelining
gem "sprockets"#, "2.12.1"
Expand All @@ -37,6 +40,10 @@ group :dependencies do

end

group :test do
gem 'test-unit'
end

group :development do
gem "jshintrb"
gem "therubyracer"
Expand Down
Loading