Commit Graph

18 Commits

Author SHA1 Message Date
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
Álax de Carvalho Alves
713e387bdb Adding rubocop sample config (#547)
* Adding rubocop sample config

* Removing double_quotes enforcement

* Using same rubocop yaml as in Plots2

* Autofixing rubocop offenses

* Fixing conditions for CC

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Adding Performance cop and fixing some offenses

* Fixing rubocop offenses and warnings

* Downgrading rubocop version since https://github.com/publiclab/mapknitter/pull/547#issuecomment-497359929
2019-06-01 11:30:56 -04:00
Stefanni
dc96adae1b New front ui (#633)
* Front Page UI: Add hero

* Navbar tweaks and hardcoded about page

* Tweak footer

* Add aerial mapping section

* CSS tweaks

* Start integrating map

* Add About MapKnitter link to footer + nav links

* Update links for kits and about MapKnitter

* Get user's location

* Get user's location or location is set to default

* Get city's name

* showing city area

* Start adding featured mappers section

* Add how to section

* Add CTA for add images

* Use JS Promises for getting user location

* better JS

* some texting tweaks

* Adding maps to front page

* grouping authors nearby ordered by maps count

* Showing featured mappers

* showing users nearby if location shared

* Some refactor + text tweaks

* fixing codeclimate issues
2019-05-24 15:40:20 -04:00
Cess
253ab8b2f0 Refactoring controllers (#546)
* include byebug in test group

* refactor feeds controller

* refactor tags and maps controllers

* refactor images controller

* increase maps controller test coverage
2019-04-23 12:32:25 -04:00
Cess
0a8813cc87 (WIP)Move some controller code to models (#519)
* Remove trailing white spaces and unnecessary blank lines

* Remove basic rubocop offenses

* add few maps  tests

* refactor maps controller

* fix 'line too long' rubocop offense
2019-04-15 20:42:28 -05:00
Sebastian Silva
f4650a73ab Deployment tweaks including Makefile and start script (#418)
* Start script plus Makefile

* Add COMPOSE_HTTP_TIMEOUT

* Omit checking subdomains. This should be done at nginx level.

* Add precompile step to Makefile
2019-03-20 09:59:19 -04:00
Sasha Boginsky
a3bf9f6369 Upgrade to mySQL5.7, Ruby warning reductions, .md file updates (#355)
* delete old rails configurations

* update pr template

* update readme and docker image name

* add a mysql setup file

* update broken recaptcha link

* use File.exist? instead

* bump mysql2

* control mysql2 gem

* add custom rake test functions to provide option to suppress warnings

* small edit to mysql.md

* another one

* add rake task for total tests

* add a require for sass gem

* update deprecated URI.encode

* undo a comment on Rakefile I made

* ensure consistency for rake task names

* migrate rake tasks to new branch

* update readme

* update encoding method
2019-03-11 18:24:01 -04:00
jywarren
51e183ea45 close #88 white edges for EXIF=6, tests passing 2015-04-25 18:10:38 -04:00
jywarren
00c513876b prefix http:// to subdomain redirect 2015-04-17 19:53:47 -04:00
jywarren
4170e7c2b1 tweak to URL for subdomain redirect 2015-04-17 18:41:09 -04:00
jywarren
19139410cf www subdomain redirect fix #165 2015-04-17 18:16:19 -04:00
jywarren
0945d55443 image uploading form working 2015-01-07 20:21:32 -05:00
jywarren
e14f81c719 much of Rails 3.2 upgrade 2014-11-04 11:20:29 -05:00
Jeffrey Warren
5fc668c7a8 openid authentication but no interface yet 2012-05-25 17:50:32 -04:00
jywarren
2a73b90d87 Merge branch 'master' of github.com:jywarren/cartagen 2011-06-30 09:41:58 -04:00
jywarren
db771e7fb9 password log filtering 2011-06-30 09:35:16 -04:00
Jeffrey Warren
a599f96e6c simple passwording, zoom buttons, start on masking 2011-06-30 16:28:55 +03:00
jywarren
ad7463e1f8 persistent tile backdrops, other conveniences 2010-10-14 16:38:32 -04:00