glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1948 commits 40 branches 27 tags 58 MiB
Commit graph

1948 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Best ac60370d6f Merge pull request #678 from metamaps/prevent-context-menu 
Prevent default context menu from opening when topics/synapses are right-clicked
 2016-09-28 05:27:03 -04:00
Robert Best 40b7e95b68 Update index.js 
Prevents the default chrome context menu from appearing overtop the Metamaps context menu
 2016-09-28 04:35:41 -04:00
Connor Turland 8f0b350a2d Fix underscore bug (#674) 
* Update package.json

* Update ChatView.js
 2016-09-26 20:39:33 -04:00
Connor Turland c60e103d97 Update _switchmetacodes.html.erb 2016-09-26 20:28:06 -04:00
Devin Howard 7150b9fcce Merge pull request #673 from metamaps/fix/eslint-updates 
Figured out eslint-3 + some small eslint fixes
 2016-09-26 18:18:31 +08:00
Devin Howard bc8ce0fee4 topic view bug fix 2016-09-26 14:04:31 +08:00
Devin Howard 12cb675bb5 switch to using the eslint-standard plugin again 2016-09-26 13:44:23 +08:00
Devin Howard c9a79468f4 switch to eslint-3 2016-09-26 13:40:02 +08:00
Devin Howard ebaae084ae simple eslint fixes 2016-09-26 13:37:42 +08:00
Devin Howard e646585a7a Merge pull request #672 from metamaps/feature/eslint-config 
fix eslint config for code climate
 2016-09-26 10:50:30 +08:00
Devin Howard 0e17ec11ec fix eslint config for code climate 
this is MOSTLY the same as feross/standard
 2016-09-26 10:47:45 +08:00
Devin Howard 5649798e4b Merge pull request #668 from metamaps/fix/hide-addTopic-message-on-double-click 
show/hide add a topic instructions more consistently
 2016-09-25 23:51:00 +08:00
Devin Howard c20e503785 show/hide add a topic instructions more consistently 2016-09-25 23:48:14 +08:00
Devin Howard 17870e7a4c Merge pull request #669 from metamaps/fix/remove-invalid-links 
show link remover for invalid links too
 2016-09-25 23:47:30 +08:00
Devin Howard b49cb7766a Merge pull request #652 from metamaps/feature/explore-controller 
refactor map controller
 2016-09-25 23:47:22 +08:00
Devin Howard fb563c6eed Merge pull request #648 from metamaps/feature/load-url-title-hack 
hack to load link titles when pulling a url into a map
 2016-09-25 23:47:10 +08:00
Devin Howard 03ba3a89f1 main controller renders by name 2016-09-25 23:37:08 +08:00
Devin Howard 05495b0224 move explore views to their own folder 2016-09-25 23:35:35 +08:00
Devin Howard 18d8929bf1 use .or to fix all sorts of @map.mappings bugs 2016-09-25 23:35:26 +08:00
Devin Howard 50f98aebea explore controller spec 2016-09-25 23:25:38 +08:00
Devin Howard dad048eb20 rubocop 2016-09-25 23:25:38 +08:00
Devin Howard c76de5b1d5 refactor map model a bit and fix bugs 2016-09-25 23:25:38 +08:00
Devin Howard 3f9077b380 clean up 2016-09-25 23:25:38 +08:00
Devin Howard b722d2d3b0 fix map controller create spec 2016-09-25 23:25:38 +08:00
Devin Howard 5e180ac10e set up explore controller routes and rename methods 2016-09-25 23:25:38 +08:00
Devin Howard 686d80e274 move more logic into map model 2016-09-25 23:25:37 +08:00
Devin Howard 7275beb163 put CRUD at top of maps controller, and alphabetize other actions below 2016-09-25 23:25:37 +08:00
Devin Howard 40bd9ed95a refactor maps controller a bit 2016-09-25 23:25:37 +08:00
Devin Howard 1ab8703008 move explore maps methods into their own controller 2016-09-25 23:25:37 +08:00
Devin Howard eed5ff76ef add rate limiting headers 2016-09-25 23:23:52 +08:00
Devin Howard 959aa693f3 ok, i guess this is ready 2016-09-25 23:22:20 +08:00
Devin Howard 7f8110b6be configure rack attack to allow 5r/s for the load_url_title route 2016-09-25 23:22:18 +08:00
Devin Howard ceb2699760 install rack-attack 2016-09-25 22:54:40 +08:00
Devin Howard cc2e3b9358 hack to get the <title> tag when importing a url, without CORS issues 2016-09-25 22:50:16 +08:00
Devin Howard 8c16c60554 show link remover for invalid links too 2016-09-25 22:44:07 +08:00
Devin Howard cc986368be Merge pull request #667 from metamaps/feature/update-package.json 
update package.json and save a bit of bundle size
 2016-09-25 22:25:31 +08:00
Devin Howard dd78c0c379 Merge pull request #665 from metamaps/fix/topic-to-map-transition 
hide circles when transitioning from topic view to map view
 2016-09-25 22:25:19 +08:00
Devin Howard 0df17c4aa0 update deps in package.json 2016-09-25 21:53:40 +08:00
Devin Howard 2ade375c20 babel-plugin-lodash to slim down bundle size by 300 KB 2016-09-25 21:53:26 +08:00
Devin Howard 11d13445fb fix authorizeToEdit call 2016-09-25 20:19:38 +08:00
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