Commit graph

1908 commits

Author SHA1 Message Date
Devin Howard 7734272737 hide circles when transitioning from topic view to map view
fixes #389
2016-09-25 20:10:18 +08:00
Devin Howard 43fafb8e6f Merge pull request #663 from metamaps/fix/git-versioning
fix git versioning
2016-09-25 19:48:48 +08:00
Devin Howard 5819447828 fix git versioning 2016-09-25 19:35:37 +08:00
Devin Howard 997a4b7329 Merge pull request #662 from metamaps/fix/no-add-topic-message-if-logged-out
hide double click to add topic message if can't edit map
2016-09-25 18:50:57 +08:00
Devin Howard 35d6dbd0b4 hide double click to add topic message if can't edit map 2016-09-25 15:04:14 +08:00
Devin Howard 1810faacbe Merge pull request #660 from metamaps/feature/csv
enable csv import using csv-parse module
2016-09-25 14:27:48 +08:00
Devin Howard 40f89b1c61 enable csv import using csv-parse module 2016-09-25 12:49:57 +08:00
Devin Howard 82b7c7e5ac Merge pull request #659 from metamaps/feature/js-fiddling
simplify js
2016-09-24 23:35:50 +08:00
Devin Howard 0a0ff2fdab remove fetch api - we don't want no polyfills, and already have jQuery 2016-09-24 23:28:11 +08:00
Devin Howard 045bd3fd73 Metamaps.Filter bug and use _.omit instead of util function 2016-09-24 23:23:12 +08:00
Devin Howard 79aa7717ed exact versions in package.json 2016-09-24 23:21:29 +08:00
Devin Howard 0bb7b1523d Metamaps.ReactComponents isn't needed anymore 2016-09-24 14:40:40 +08:00
Devin Howard 03eacde753 Merge pull request #656 from metamaps/feature/tech-debt
rubocop style updates
2016-09-24 13:59:27 +08:00
Devin Howard a164dccc94 fix errors!! 2016-09-24 13:55:52 +08:00
Devin Howard 20bd959c69 fix models that rubocop broke >:( 2016-09-24 13:02:53 +08:00
Devin Howard b0fac7648a Merge pull request #650 from metamaps/fix/map-serialization-bug
fix @maps serialization bug
2016-09-24 12:32:38 +08:00
Devin Howard f8c11f234d more rubocop updates 2016-09-24 12:27:34 +08:00
Devin Howard 5fab6de48a fiddle with metacodes controller 2016-09-24 11:00:53 +08:00
Devin Howard 0ace202ace automatic rubocop updates 2016-09-24 11:00:46 +08:00
Robert Best 0a62eb3299 Merge pull request #655 from metamaps/feature/fix-map-titles
Feature/fix map titles
2016-09-23 16:48:44 -04:00
Robert Best afa0cc96b9 Update index.js 2016-09-23 16:06:28 -04:00
Robert Best f41ece6f1c Update index.js 2016-09-23 15:47:37 -04:00
Robert Best b8ae2c4b6a Update Router.js 2016-09-23 15:45:11 -04:00
Devin Howard c76657ecb4 fix restful controller style issuse 2016-09-23 18:54:05 +08:00
Devin Howard 8255653d24 disable duplication checking in code climate for now 2016-09-23 18:51:34 +08:00
Devin Howard 04a3027368 code climate linked to travis 2016-09-23 18:43:54 +08:00
Devin Howard cbd9395142 Merge pull request #651 from metamaps/feature/update
update gems
2016-09-23 18:37:14 +08:00
Devin Howard bb5ba4861d [WIP] code climate config file (#654)
code climate config file
2016-09-23 18:36:47 +08:00
Devin Howard 4afab70414 Merge pull request #653 from metamaps/fix/travis
safer git dating
2016-09-23 17:57:02 +08:00
Devin Howard a7338f8960 safer git dating 2016-09-23 17:49:26 +08:00
Devin Howard 117b7910bf test 2016-09-23 17:40:30 +08:00
Devin Howard ce1ad3e24b update gems 2016-09-23 15:28:31 +08:00
Devin Howard df84bd9e1d fix @maps serialization bug
if @maps is empty, it returns {"maps":[]}, instead of [] like we expect
on the frontend.

This commit fixes this issue
2016-09-23 14:40:26 +08:00
Devin Howard eef8a281cb Merge pull request #649 from metamaps/feature/Metamaps-in-frontend
move Metamaps code to webpack
2016-09-23 14:22:46 +08:00
Devin Howard 6f91ce5ff5 fix a few more errors 2016-09-23 14:12:27 +08:00
Devin Howard e65a5e2d1c whoops, reenable travis npm test 2016-09-23 12:00:47 +08:00
Devin Howard bda740491c moved JIT to npm. tests pass. whoop whoop 2016-09-23 11:59:23 +08:00
Connor Turland 700119cc9e opts can be undefined and throw error 2016-09-22 23:04:46 -04:00
Devin Howard 07e4ac3865 attempt to get npm testing working; fail 2016-09-23 10:37:59 +08:00
Connor Turland 499593fc82 fixing references 2016-09-22 21:40:49 -04:00
Connor Turland f59a5775ae tweaks to import/exports 2016-09-22 20:16:18 -04:00
Devin Howard 73e7c38873 syntax fixes 2016-09-23 08:05:26 +08:00
Devin Howard 30fc943833 clean up backbone file imports 2016-09-23 00:20:05 +08:00
Devin Howard a996734c79 remove Backbone from window 2016-09-23 00:16:15 +08:00
Devin Howard 30894a313f move views to their own frontend folder 2016-09-23 00:07:30 +08:00
Devin Howard fe3012136d import _ 2016-09-22 23:51:33 +08:00
Devin Howard 59b471ac62 break Map into three files 2016-09-22 23:51:28 +08:00
Devin Howard 120c2c0b67 finish most except Backbone 2016-09-22 18:36:22 +08:00
Devin Howard 0065b201c7 make more code modular 2016-09-22 17:36:47 +08:00
Devin Howard 8ed2b3ffc1 remove Constants.js 2016-09-22 17:14:34 +08:00