Commit graph

2185 commits

Author SHA1 Message Date
Devin Howard
7b4a072fd8 attempt to fix import problems (#852) 2016-10-26 20:34:22 +08:00
Devin Howard
175a3ee73e policy_scope on has_many relationships in serializers (#840)
* token overrides current user in api

* policy scope has_many relationships

* fix hard coded topics - whoops

* handle policy_scope returning nil in application serializer
2016-10-26 19:56:30 +08:00
Devin Howard
b13587456d fix coordsToPixels calls even more 2016-10-26 19:11:40 +08:00
Devin Howard
f023a18069 fix pixel stuff for real? (#851)
* fix getPastelColor function (I think)

* fix pixelsToCoords and coordsToPixels function calls

* update signature of coord/pixel functions in Util.spec.js
2016-10-26 19:04:00 +08:00
Devin Howard
e640048386 fix topic card title word break css (#844) 2016-10-26 17:01:05 +08:00
Devin Howard
98725b3ee4 fix getPastelColor function (I think) (#850)
* fix getPastelColor function (I think)

* fix pixelsToCoords and coordsToPixels function calls

* update signature of coord/pixel functions in Util.spec.js
2016-10-26 14:26:48 +08:00
Devin Howard
8a95262f2c allow anonymous users to GET api routes (#842)
* make map methods use ActiveRecord relations so they don't error on pundit

* test for logged out maps GET api

* open up GET routes on maps/topics/synapses and update api docs
2016-10-26 08:37:23 +08:00
Robert Best
ed89f80f49 Update README.md
some small tweaks to grammar and word choice
2016-10-25 14:24:10 -04:00
Devin Howard
47bca5907e add tests for Metamaps.Util (#825)
* decouple Util from other Metamaps modules

* first few Util tests

* more Util tests

* remove dead code

* eslint
2016-10-25 12:28:51 +08:00
Devin Howard
5163794698 anonymous users are nil, so need to remove the raise (#841) 2016-10-25 12:26:22 +08:00
Robert Best
0b6348e13f This fix closes the topic creation spinner when the map is panned. (Since, sometimes a click turns into a really small pan) (#828) 2016-10-24 11:48:34 -04:00
Connor Turland
ce1205f6d7 one more mapper card style fix 2016-10-24 14:35:23 +00:00
Connor Turland
96d25cc91d mapper profile mobile styling 2016-10-24 14:23:05 +00:00
Connor Turland
a9ef6feebd mapper page bug fix and styling 2016-10-24 13:42:26 +00:00
Connor Turland
98e2de68da oooh was using ineffective media queries for desktop 2016-10-23 16:49:16 -04:00
Connor Turland
4c68fd90ca set useful num for desc truncation on map cards 2016-10-23 16:30:54 -04:00
Connor Turland
cda0c21a0b make it responsive (#820) 2016-10-23 16:12:07 -04:00
Connor Turland
a44edbb17e better transition from map to explore 2016-10-23 11:44:20 -04:00
Connor Turland
aa96d074af dont show import on topic page 2016-10-23 11:21:38 -04:00
Connor Turland
4f9b9460ad don't block all right clicks 2016-10-23 11:12:43 -04:00
Devin Howard
a63cd02bc6 fix develop branch bug 2016-10-23 22:51:16 +08:00
Devin Howard
fb6c8a74a7 scoping on topic json properties (#813) 2016-10-23 22:11:38 +08:00
Devin Howard
5db8e27496 make metacode selector reliable after switching metacode sets (#816) 2016-10-23 22:11:26 +08:00
Devin Howard
87dc20fa50 stop showing map info box on topic view (#815) 2016-10-23 22:07:38 +08:00
Devin Howard
154257d062 fix Ctrl+A (#814) 2016-10-23 18:02:59 +08:00
Connor Turland
497c6ae017 spelling mistake fix 2016-10-22 15:16:55 -04:00
Connor Turland
9600983311 remove Connor thinking out loud comment 2016-10-22 11:07:50 -04:00
Connor Turland
cbcdd912c9 Comments were for non-redux scenario 2016-10-22 11:04:14 -04:00
Connor Turland
1d13da4ab5 Update README.md 2016-10-22 10:59:43 -04:00
Connor Turland
d359eb063a fixed the oauth redirect bug and a bit more (#796) 2016-10-22 16:46:39 +08:00
Connor Turland
4187dbd803 fix it up (#804) 2016-10-22 03:58:19 -04:00
Connor Turland
d549083cce prefer variable height lightbox over scrolling visually 2016-10-22 03:10:33 -04:00
Connor Turland
bc8660c83e remove about lightbox in prep for homepage redo and about page 2016-10-22 03:10:09 -04:00
Robert Best
c0b35280f6 Middle.mouse.click features (Open contained link & copy text to clipboard) (#792)
* changed the code to be based off of the current dev branch

* Update JIT.js

* Update Util.js

* Update JIT.js

A few logical operators were replaced with their stricter counterpart.

* Update JIT.js

* Update index.js

* Update Util.js
2016-10-22 02:58:13 -04:00
Connor Turland
31078c554e just make it 'tutorial' 2016-10-22 02:41:36 -04:00
Robert Best
ea20ba45b3 Merge pull request #738 from metamaps/window.resize.fix
Makes it so that resizing the browser window doesn't change the user's current location on the map
2016-10-22 02:12:54 -04:00
Robert Best
37b989c38e Update Listeners.js 2016-10-22 01:52:43 -04:00
Robert Best
759ec7845b cleaned up the window resize function even further 2016-10-22 05:50:31 +00:00
Robert Best
cfb8f51214 simplified the window resize function by adding a Util function that logs the canvas attributes. 2016-10-22 05:21:32 +00:00
Robert Best
1cd7e22c40 Merge commit '858ca66d69ed9e43f4d3a4ce6be288508cf4efa1' of github.com:metamaps/metamaps into window.resize.fix 2016-10-22 05:00:10 +00:00
Robert Best
ad1889dfc5 Merge branch 'develop' of github.com:metamaps/metamaps into window.resize.fix 2016-10-22 04:54:31 +00:00
Connor Turland
cbc8e6cdd4 the return of the infinite scroll (#795) 2016-10-22 00:15:10 -04:00
Connor Turland
f8556c30a5 resize every time it renders 2016-10-21 19:10:28 -04:00
Connor Turland
8af1e69460 undo last commit, don't need for rails5 2016-10-21 18:25:07 -04:00
Connor Turland
d1e8ecbf3b readd 12factor for debugging on heroku 2016-10-21 18:22:15 -04:00
Connor Turland
8e38469b1f add border radius to mapper list 2016-10-21 18:10:37 -04:00
Connor Turland
abb997c75c some quick fixes for realtime server after devins refactor 2016-10-21 18:04:18 -04:00
Connor Turland
be8efa6025 add card features (#793) 2016-10-21 17:42:21 -04:00
Robert Best
439527c464 Merge pull request #724 from metamaps/feature/edge.shift
Made it so that the map pans when you drag a selection of topics near the edge of the window
2016-10-21 17:03:25 -04:00
Robert Best
f68deea202 changed all logical operators to be more strict 2016-10-21 20:59:16 +00:00