88 Commits

Author SHA1 Message Date
PeculiarE
0d2e31119d feat: 🎸 methods and db changes to publish single map and batch-publish multiple maps (no interface yet) (#1772)
* feat: 🎸 publish single map and batch-publish multiple maps

* style: 💄 implemented code style suggestions & refactored routes

* refactor: 💡 discarded authors' object and used count instead

* refactor: 💡 made method names more readable
2022-07-01 14:47:14 +03:00
PeculiarE
9a4ea111e2 feat: 🎸 methods and db changes to spam single map and batch-spam multiple maps (no interface yet) (#1762)
* feat: 🎸 spam single map and batch-spam multiple maps

* fix: 🐛 fixed failing system tests and refactored spam functions
2022-06-23 14:43:22 +06:00
Orne Virardi
4b8054365f db/seeds.rb and README.md files modified (#1747) 2022-06-10 09:34:01 +01:00
PeculiarE
a817a4d2df chore: 🤖 add status columns to maps and users tables (#1753)
* chore: 🤖 add status columns to maps and users tables

* style: 💄 remove extra indentation
2022-06-10 04:20:15 -04:00
Sasha Boginsky
92e73e6345 Update ldi dependency (#1395)
* Update LDI dependency, remove spaces from README, update schema.rb version

* Yarn.lock

* Update deprecated test syntax

* Update travis.yml

* Update yarn.lock

* Update schema.rb.example

* Update ldi related code for compatibility with new version

* Update app/assets/javascripts/mapknitter/Map.js

Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>

* Update app/assets/javascripts/mapknitter/Map.js

Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>

* Update app/assets/javascripts/mapknitter/Map.js

Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>

Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
2020-08-25 19:40:29 -04:00
Álax de Carvalho Alves
a381a0cf8f Get Mapknitter running into the Google Cloud v2 (#1273)
* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Fix start command

* Fix travis script

* Tweak travis script

* Add delay

* Revert assets changes

* Return to Mysql5.7

* Tweak travis script

* Fix make redeploy-container command

* Add db migrate and precompile step.

* Add bower install to Makefile

* Clean after docker run. Avoid one bower run.

* Changes to be able to build container in Google Cloud

* Remove spurious symlink

* Copy config examples when making build

* Export env variable name

* Tag cloud image

* Add timeout

* Push to cloud registry

* Fix jenkins build error with docker-compose tty

* Add app to container and .dockerignore all else

* Copy configuration files when deploying to GCE

* Allow copy config to container

* Time extended (for cloud build & push)

* Delete redundant index.html.erb file (#427)

* Setupcoveralls (#438)

* Add coveralls

* Fix gemfile

* Fix env variable

* Add coveralls token

* Update README.md

* Remove legacy image controller code #404 (#417)

Deleted the lines from the selection indicated in the issue.

* Change comment count on comment creation via AJAX #441 (#443)

This closes issue #441 "Change comment count on comment creation via AJAX #441" by incrementing comments-number each time a new comment is added. This would ensure that the counter indicating the number of comments is increased without needing to refresh the page.

* update syntax of active record query(license method) (#439)

Fixes #437

* Docker improve rebased (#450)

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Don't dettach when building container in travis

* Fix start command

* Fix travis script

* Try to resolve travis tests invocation

* Tweak travis script

* Add delay

* Bundle install before db setup

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Fix start command

* Fix travis script

* Tweak travis script

* Add delay

* Revert assets changes

* Return to Mysql5.7

* Tweak travis script

* Fix make redeploy-container command

* Add db migrate and precompile step.

* Add bower install to Makefile

* Clean after docker run. Avoid one bower run.

* updte pr template (#448)

* Bump recaptcha from 4.13.1 to 4.13.2 (#452)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ambethia/recaptcha/compare/v4.13.1...v4.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Restructure rake test task runner (#380)

* add a mysql setup file

* Squash commits

* Update README.md (#456)

* Change run to exec (#457)

* Bump paperclip from 4.2.4 to 4.3.7 (#285)

Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 4.2.4 to 4.3.7.
- [Release notes](https://github.com/thoughtbot/paperclip/releases)
- [Changelog](https://github.com/thoughtbot/paperclip/blob/v4.3.7/NEWS)
- [Commits](https://github.com/thoughtbot/paperclip/compare/v4.2.4...v4.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump test-unit from 3.3.0 to 3.3.1 (#458)

Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.0...3.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump coveralls from 0.7.1 to 0.8.22 (#453)

Bumps [coveralls](https://coveralls.io) from 0.7.1 to 0.8.22.

Signed-off-by: dependabot[bot] <support@dependabot.com>

* gridview aligned (#464)

* Alert improvement and adding byebug gem (#383)

* byebug gem added and alerts in separate file

* adding byebug history to gitignore

* adding timestamp to redirect

* added z-index to render login dropdown above leaflet icon

* fixed image partial rendering when no images (#423)

* fixed image partial rendering when no images.

* toggle no images <p> om upload

* fixed image partial rendering when no images.

* Bump recaptcha from 4.13.2 to 4.14.0 (#471)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.2 to 4.14.0.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ambethia/recaptcha/compare/v4.13.2...v4.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* add a flash error when adding tags and not logged in (#473)

* Upgrade app to Bootstrap 4 (#480)

* Bootstrap 4 small button fixes (#488)

* Add tests for comments and maps (#467)

* Updated query style (#436) (#469)

* Dynamic ports (#462)

* Dynamic port in compose file

* Omit setting container name

* Add initial sql dump entry

* Avoid resetting database on build

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Tweak travis script

* Roll back to using Debian 9 with custom built GDAL (#489)

* Switch back to Debian 9 Stretch

* Simplify docker image

* Bump Ruby to 2.4.6

* Re-add dependency

* Add dependency (zip)

* Try pip install gdal

* Install libgdal-dev

* Revert attept to use pip

* Bump ruby

* Avoid naming containers in compose file

* Avoid overwriting database on redeploy-container

* Allow to load mysql dump

* Include own GDAL packages

* Disable ipv6 to prevent error

* Add missing Amazon S3 yml to Makefile

* Document unstable instance

* Changes to be able to build container in Google Cloud

* Copy config examples when making build

* Add app to container and .dockerignore all else

* Fixed missed merge

* Add db configurability by env vars for containers

* Fix db config

* Copy configs

* Switch keyserver

* Add env vars, tweak make

* Substitute env vars parameters

* Env var control

* Show env vars

* env not ENV

* add DB_SOCKET

* Add recomended parameters

* Not deploy app engine, show cloudsql dir

* Omit list cloudsql dir

* Added correct image tag

* Add database parameters as env vars

* Support $PORT env var

* Using Node 12 and Yarn for Dockerfile.txt as well

* Changing Passenger's port on production env

* Setting local db for travis

* set .env PORT to $PORT

* Remove .env

* Compose environment variableZ fallback

* Revert all files under /app to versions in main

* Revert to main

* Delete unneeded files

* Remove extra files from rebase

* Add bundle install as build step

* Deleted not needed Dockerfile

* Missed RUN in Dockerfile

* Add precompile step

* Hardcode environment at build time

* Adding missing yaml and update bootsnap version

* Omit /app/tmp from volume

* Revert try to get precompile to work

* Clean up patch for merging

* List variables in app.yaml

* Tweak for jenkins

* Add .env for jenkins

* Fix PORT for jenkins/docker-compose

* Address PORT properly

* New form ports

* Enclose docker-compose ports in quotes

* ports yaml should be object not array

* Try different format for ports

* Try docker-compose format

* Redirect script for AppEngine

* Try to revertt to working condition for appengine

* Point PORT in Procfile

* Revert to known good config in appengine

* Tweak assets precompilation

* Restore PORT setting

* Add redirect to map /warps directory to legacy archive

* Add .env for jenkins/docker-compose

* Add hardcoded route to legacy warps

* Remove .env for appengine

* Satisfy appengine docker-compose

* Ignore app.yaml

* Ignore app.yaml secrets

* Satisfy Jenkins wihout hurting appengine hopefully

Co-authored-by: Sebastian Silva <sebastian@fuentelibre.org>
Co-authored-by: rarrunategu1 <parker.rose@ymail.com>
Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
Co-authored-by: Milo MacPhail <40954168+milomacphail@users.noreply.github.com>
Co-authored-by: Sonali Agrawal <sonali9696@gmail.com>
Co-authored-by: Ananya Agrawal <33188930+ananya@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>
Co-authored-by: Kaustubh Nair <kaustubh.nair@iiitb.org>
Co-authored-by: Divya Baid <32747809+divyabaid16@users.noreply.github.com>
Co-authored-by: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>
Co-authored-by: Govind Jeevan <govindjeevan7@gmail.com>
Co-authored-by: Cess <cessmbuguar@gmail.com>
Co-authored-by: Stefanni <stefannibrasil@gmail.com>
Co-authored-by: hc-barker <hc-barker@users.noreply.github.com>
2020-05-05 11:07:12 -04:00
Sebastian Silva
43e47cec4b Found queries without indices (#1166) 2020-01-17 19:26:17 +03:00
Sebastian Silva
1c0a293e22 Update 20191214062147_add_index_for_warpable_map_id.rb (#1156)
Fix that worked to deploy in production [already deployed!]
2019-12-16 07:19:03 +03:00
Sebastian Silva
d8e40d3cb5 Add index to warpables for performance (#1155) 2019-12-14 11:36:13 -05:00
Sasha Boginsky
d79ea41b9a Restore anon edits (#1017)
* h

* h

* updates

* restore anon

* dont remove from sidebar too

* remove comments

* revert unplace update

* fix code climate issues

* Adjust tests to redirect to edit page after map creation

* add tests for anonymous user

* fix modal

* fix map model

* handle login during anon editing

* fix test and rubocop

* revert unneccesary destructable param

* fix up image controller tests

* cleanup tests and update schema.rb.example
2019-09-13 12:21:01 -04:00
Sasha Boginsky
88c6cb4274 Implementgroup (#959)
* h

* h

* updates

* Fix featuregroup

* checkout randomly modified file

* Implementation

* setupToolbar working

* readOnly mode working

* remove googleMutant

* finalize

* group.editing call

* fix puma pidfile path, set it for development

* review rebase

* update schema.rb to fix DB setup and commands like migrate, setup, etc

* delete obsolete config file

* update example file

* readd new line at end of file

* remove left behind comment

* add new line to file

* bump ldi to 0.7.6

* commit data dump

* remove db dump

* update prod

* return puma back to production

* add new migration to avoid potential corruption

* delete extra whitespace

* re-run all edited migrations

* update routes

* remove defaults and set before_validations

* update u to self

* fix ||= space

* reverse order reversal

* bump LDI to 0.7.7

* remove warpable update hook

* try now

* before

* modifications

* update

* remove before_validation hook for map

* update incorrect syntax in tests
2019-09-10 18:14:00 -04:00
Kaustubh Nair
ab4727f085 Fix image placement (#951)
* Fix image placement

* Fix image placement

* Add test for pressing place

* Change button to link

* Check if image is present in layers

* Revert schema change

* remove semicolons
2019-08-20 11:00:14 -04:00
dependabot-preview[bot]
268594a1ea Bump faker from 1.9.6 to 2.1.2 (#945)
* Bump faker from 1.9.6 to 2.1.2

Bumps [faker](https://github.com/faker-ruby/faker) from 1.9.6 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/1.9.6...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Fix syntax for Faker:Number
2019-08-16 10:21:07 -04:00
Álax de Carvalho Alves
27f8941a40 Upgrading to Rails 5.2.3 (#891)
* Configurations update for rails 4.0

* ActiveSupport::Testing::Performance extracted to a gem

* ruby prof required as a dependency

* disable rubocop on bin folder

* http patch

* Comment out to allow testing

* no longer supports plugin loading

* lock to sprockets 2.12

* Active record patches

* remove deprecated test syntax

* fix failing tests

* change new super class

* replace right_aws with right_aws_api

right_aws is no longer maintained, was throwing an error

* lock to rails 4.2.11.1

* change rails version in install script

* remove deprecation warnings

* Change test lib to minitest, add  minitest reporters

* make app work

* active record find patches

* root_in_json include defaulted to false

* confirm option removed in link helper

* cookies serializer changed to hybrid

* Change render :text to :plain

render :text will be deprecated and poses a security risk

* console for dev web

* Check and fix interface functionality

* fix export functionality

* add protected attributes for the warpable model

* fix image upload

* Fix comments and images failing tests

* include mass assignment security in annotations

* render html for update images

* clear mail array before every test

* Fix codeclimate issues

* skip failing test

The test is failing because of different names in model(warpable) and
controller(images) skipping this for now until we decide if we want to
standardize the names

* replace unprotected redirects

* Fix codeclimate issues

* Autofixing rubocop offenses and Problematic test for #578 (#667)

* Autofixing rubocop offenses

* Adding Rubocop to Travis pipelines and development branch

* Fixing maps controller test

* Fixing remaining offenses

* change post test to create since action new is a get action

* remove unprotected redirects

* Fix codeclimate issues

* Add yarn

* Remove error log

* Fix oauth icons

* Modify package.json

* Add yarn install to start.sh

* Add leaflet google

* Remove leaflet-google from package json

* remove passenger error logs

* Fix install script

* Remove flag

* Fix gemfile.lock

* Fix gemfile.lock

* Fix login

* Upgrade Gemfile to Rails 5.0

* require rake'

* Change config files

* Add application record

* Bump mysql

* Local builds for Travis runners (#672)

* Using local mysql for travis

* Fix codeclimate issues

* Refactoring yamls

* Autofixing rubocop offenses and Problematic test for #578 (#667)

* Autofixing rubocop offenses

* Adding Rubocop to Travis pipelines and development branch

* Fixing maps controller test

* Fixing remaining offenses

* Fixing unit tests

* Adding docker build to travis pipelines

* Adding docker build to travis pipelines

* Staging builds in travis

* fix travis.yml

* Upgrading sintax of assets and using required gems

* Using updated version of GDAL and installing required dependencies

* Enabling cache in between builds

* Test yarn for travis

* Conditionalize rake db:setup for travis

* Add semicolon

* Remove comment

* modify database.yml

* Migrate seperately

* Run create only for production

* Locking newer Rails v

* Running update task

* Adding missing bootsnap gem

* Fixing missing database

* Adding missing listen gem

* Fixing schema example version

* Fixing migration versions

* Updating dependencies for Rails 5

* Adding ApplicationMailer abstraction

* Adding required initializers

* Prefer require_relative instead of full path

* Making associations not required by default

* Regenerating schema file

* Hotfixing MassAssigment

* Upgrade web-console, remove mysql adapter override

* Remove attr_accessible

* Add rails-controller-testing gem

* Follow new syntax for tests

* Remove extra web-console from gemfile

* Regenerating lock file

* Fixing rubocop offenses and bundler version

* Using correct Paperclip class as in https://github.com/rails/rails/issues/26404#issuecomment-502129936

* Fix images functional tests

* images controller test typecast to string

* Fix rails logger

* Fix map tests

* Bumping rubocop version

* Autofixing rubocop offenses

* Including performance cop to rubocop

* Refactoring deprecated routing and secret_token

* Fixing routes for feed controller

* Using correct routes for RSS builder

* Fixing missing routes

* Fixing travis bundler and yarn cache

* Fixing bundle path

* Splitting bundle and yarn verifications

* Autofixing rubocop offenses

* Fixing prod host for travis, private class usage and rubocop offenses

* Upgrade to Rails 5.2 (#685)

* Upgrade Gemfile to Rails 5.0

* require rake'

* Change config files

* Add application record

* Bump mysql

* Locking newer Rails v

* Running update task

* Adding missing bootsnap gem

* Fixing missing database

* Adding missing listen gem

* Fixing schema example version

* Fixing migration versions

* Updating dependencies for Rails 5

* Adding ApplicationMailer abstraction

* Adding required initializers

* Prefer require_relative instead of full path

* Making associations not required by default

* Regenerating schema file

* Hotfixing MassAssigment

* Upgrade web-console, remove mysql adapter override

* Remove attr_accessible

* Add rails-controller-testing gem

* Follow new syntax for tests

* Remove extra web-console from gemfile

* Regenerating lock file

* Fixing rubocop offenses and bundler version

* Using correct Paperclip class as in https://github.com/rails/rails/issues/26404#issuecomment-502129936

* Fix images functional tests

* images controller test typecast to string

* Fix rails logger

* Fix map tests

* Bumping rubocop version

* Autofixing rubocop offenses

* Including performance cop to rubocop

* Refactoring deprecated routing and secret_token

* Fixing routes for feed controller

* Using correct routes for RSS builder

* Fixing missing routes

* Fixing travis bundler and yarn cache

* Fixing bundle path

* Splitting bundle and yarn verifications

* Fixing prod host for travis, private class usage and rubocop offenses

* Enforcing params usage on get method

* Using correct folder names to Rails >5 conventions

* Enforcing params wrapping and adding missing front_ui route

* Precompiling assets before serving

* Improving Jenkins startup script

* Using supported docker yaml version by Jenkins

* Adding task to check database existance

* Improving start script

* Improving Makefile's recipes and target

* Adding task to check database existance

* Improving start script

* Improving Makefile's recipes and target

* Improving Makefile's recipes and target

* Patching https://github.com/publiclab/mapknitter/pull/803

* Improving Jenkins setup

* Fix map loading

* h

* Fixing Leaflet-Environmental-Layers map loading

* h

* leaflet

* fix

* change

* updates

* stop precompiling assets

* precompile

* Using correct Yarn, NPM and Node version, avoiding mismatch

* Removing unwanted tags.js invocation

* Improving Makefile recipe

* Using node_modules/ as dependencies folder, since https://github.com/sass/node-sass/issues/2050#issuecomment-317233552

* Upgrading Yarn dependencies

* Removing duplicate rubocop directive

* Removing test/ from codeclimate checks

* Removing fixed FIXME comments

* Removing fixed FIXME comments

* Updating docs in README

* Bumping recaptcha and include methods

* Fixing migration version

* Using strong params in requests

* Using strong params in requests

* Use Rack::Test::UploadedFile instead of ActionDispatch::Http::UploadedFile

* Remove rubocop linter

* Fix codeclimate issues

* Fix minor asset issue

* Remove manual asset references and add them to application js

* Fix asset ordering in application.js

* Configure System tests  (#936)

* Add new system tests and fix minor asset loading

* modify test

* Add chromedriver to travis

* Add sudo

* Add dependencies to dockerfile

* Properly installing chrome and chromedriver

* Fixing Map loading since merges
2019-08-15 15:59:45 -04:00
Divya Baid
b8757c16bc Version tracking of images (#862)
* version-1

* version-2

* code climate fix

* Change count to count_version

* Logged in users can edit the maps

* Test added

* clock button added

* clock button added history button removed

* Change papertrail version to json, set limit to 10

- Clean up revert method

* test image versioning and rollback

* remove version limit

* create temp image folders

* script removed

* Small change

* warpable saved

* Small fix

* version-revert fixed

* Cloned version added on top

* final changes

* final changes - 1

* Removing count_version

* tests improved

* remove byebug
2019-08-04 02:16:11 +05:30
Tobias Ollhoff
6d953f8cd8 Removed assignment of nodes to a warpable from seed file (#838) 2019-07-14 12:39:04 +05:30
Cess
21504ea363 Gallery page and front-page mobile responsive (#762)
* add warpables and users relationship

* make front-ui mobile responsive

* clean and reorganize images

* handle maps with no images

* gallery page

* link to all maps if no location selected

* test warpables and user relationship

* add test/reports to gitignore

* add pagination for mappers
2019-06-28 11:56:50 -04:00
Kaustubh Nair
62eec1ed0b Add tests for controllers (#615)
* add utility test

* Add exports and annotations controller tests'

* Add tests for images

* Fix codeclimate issues

* Single quoted strings, huh :/

* Fix export controller test

* Fix histogram ordering

* Fix codeclimate issues

* Fix image controller tests

* Small fixes

* Add rubocop.yml

* Fix rubocop

* Increase linelength

* Fix rubocop

* Rename tests for better readability

* Rename tests

* Fixing Codeclimate offenses
2019-06-03 12:43:36 -04:00
Sasha Boginsky
3d5d91b812 Functional tests - testing env fix (#643)
* Update testing environments

* remove unnecessary code

* remove unnecessary fixtures
2019-05-28 14:35:23 -04:00
Sasha Boginsky
71b8e317b2 Update seeds.rb (#611)
* Update seeds.rb

* Update seeds.rb

* Update seeds.rb

* README and example config updates

* Fix capitalization

* Syntax

* fix link
2019-05-21 00:40:36 -04:00
Cess
1ba35931e4 Reorganize and consolidate templates (#558)
* add map and images seeds

* add faker for faking and pry for debuggging

* Remove will-paginate-bootstrap

It is no longer maintained
Center pagination bar
Add will-paginate-bootstrap4

* add hidden overflow
2019-05-15 09:44:27 -04:00
rarrunategu1
db0ec0d41c Bump image_science from 1.2.6 to 1.3.0 (#595)
* install_cloud commit

* Updating image_science gem and correcting to single quote format
2019-05-13 15:04:08 -04:00
Sasha Boginsky
eb120589a5 Add remote_url to export model (#552)
* Add remote_url to export model

* rename remote_url col to export_url

* Add httparty ExporterClient to show functionality

* address some codeclimate issues

* Address more code climate issues

* Address final code climate issues

* add attr_accessible
2019-05-07 15:48:55 -04:00
jywarren
e490048fbf .travis.yml
schema example

docker compose

more adjustmentes

new docker-compose
2017-01-16 18:01:30 -05:00
jywarren
6e1002b74f adapted for sqlite3 compatability, share to PublicLab.org tweaks 2015-07-15 14:11:44 -04:00
jywarren
17557cf83e legacy annotation and embed fixes; close #106 2015-02-13 17:51:50 -05:00
jywarren
2b811039b0 slug migration fix for duplicate named maps, additional cleanup for production 2015-01-21 22:10:08 +00:00
jywarren
d886dc2932 merged friendly_id 2015-01-20 18:59:29 -05:00
Viduranga Wijesooriya
1012cf698d added friendly_id to maps
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2015-01-18 14:29:17 +05:30
Viduranga Wijesooriya
4dc879e887 removed duplicate migration
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2015-01-16 00:20:04 +05:30
jywarren
5b3ab2424b fixed routes and csrf meta tag 2015-01-06 19:42:40 -05:00
jywarren
e3417f5814 basic rebase plus bower rework 2015-01-06 17:37:33 -05:00
jywarren
56eff20b4d much of Rails 3.2 upgrade 2015-01-01 16:31:38 -07:00
jywarren
1cff5176b6 migrations and README fixes 2014-11-16 12:57:18 -06:00
jywarren
13fe1b2b1d big integration 2014-11-12 17:02:10 -05:00
jywarren
52cb54292c migrate openid identity_urls 2014-11-04 14:28:03 -05:00
jywarren
79a8d0f317 muchly working on rails 3.2!!!! still need to do openid schtuff 2014-11-04 12:42:41 -05:00
jywarren
e14f81c719 much of Rails 3.2 upgrade 2014-11-04 11:20:29 -05:00
Justin Manley
cd7327ac97 New database schema generated from annotation migrations as well as resourceful route for annotations. 2014-09-03 22:53:19 -04:00
Justin Manley
28a21e9b5f Scaffold model and controllers and add db migrations for annotations. 2014-09-02 22:01:25 -04:00
Justin Manley
21ea6c6cab Move new interface from map2 controller into map controller. Add migrations and model for tags and comments. 2014-08-11 14:25:03 -05:00
jywarren
ed12bf9e97 anonymous annotations flag for some maps 2013-06-05 17:08:11 -04:00
jywarren
66ea5e2c3a extended length of annotation content for video/photo embeds 2013-01-28 14:29:25 -05:00
jywarren
099b56a211 Merge branch 'master' of github.com:jywarren/mapknitter 2013-01-28 14:17:16 -05:00
jywarren
de9be465cf schema update 2013-01-28 14:17:14 -05:00
Jeffrey Warren
c4525d3476 migration for longer annotation content 2013-01-28 14:15:22 -05:00
Jeffrey Warren
9997102f29 fixed ordering of polygon annotations... sadly you may have to redraw yours 2013-01-24 11:14:43 -05:00
Jeffrey Warren
4d6c947217 critical bugfix, thanks to cfastie for reporting 2013-01-13 12:05:50 -05:00
jywarren
eb92a1cfdb new: annotated polygons and a nice new annotation interface; pls report bugs 2013-01-12 20:30:54 -06:00
jywarren
d510bd8752 tagging for maps 2012-07-01 18:30:04 -04:00