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

207 commits

Author SHA1 Message Date
Connor Turland d1680c1895 disable permanent deletion of topics and synapses, except... 
when the topic or synapse no longer appears on any maps, and this can currently only be performed over the api
 2016-12-14 14:17:55 -05:00
Devin Howard 1ba339b3be subset of synapse creation changes (#970) 
* esc cancels topic and synapse creation now

* close topic/synapse creation on right click

* backspace and delete don't close synapse creation anymore

* hitting tab saves the synapse you're creating
 2016-12-11 17:15:09 -05:00
Devin Howard 6129a27ecf hit Ctrl+A a second time to select all synapses, too (#968) 2016-12-11 16:21:36 -05:00
Devin Howard d51e3f3b52 update npm deps, EXCEPT socket.io and backbone (#950) 
* update npm dependencies (with some exceptions)

* update autolinker, remove underscore
 2016-12-11 16:09:12 -05:00
Connor Turland a133702be2 Some topics and synapses were hidden from users erroneously (#944) 
* ensure topics and synapses have their permission match the map they're deferring to

* update permission of topics and synapses as map perm changes, when defer_to_map

* try enabling count threshold on rubocop

* remove unused mk_permission functions

* change *_count methods to use delegate to save lines in map.rb model

* rubocop topic.rb
 2016-12-06 16:46:46 -05:00
Devin Howard 3f161c1076 make topic titles have width of 25 chars (#933) 2016-11-29 11:00:14 -05:00
Devin Howard 4da3a9d55f hide mobile menu if browser is resized to full size (#937) 2016-11-28 13:53:29 -05:00
Devin Howard 90c5bc26fc Active.Mapper was being initialized twice, causing errors (#934) 2016-11-27 21:12:05 -05:00
Devin Howard 5d8ff3efce realtime shouldn't poll forever if the dev server isn't up (#931) 2016-11-24 14:40:14 -05:00
Devin Howard ce2d462578 fix bugs on develop branch 2016-11-09 20:44:00 -05:00
Devin Howard 5851d57eef Merge branch 'master' into develop 2016-11-09 09:29:30 -05:00
Connor Turland e1441acde0 synapse wasn't updating calculated_permission 2016-11-08 19:50:08 +00:00
Devin Howard a176cdf231 eslint frontend folder (#923) 2016-11-07 15:25:08 -05:00
Devin Howard 2f4fe525ce Fix a bunch of errors and style issues 2016-11-07 14:55:20 -05:00
Devin Howard 518782e1c7 remove Metamaps.Erb 2016-11-07 14:55:20 -05:00
Devin Howard 7c9b6a2205 try to move all rails data into Metamaps.ServerData 
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
 2016-11-07 14:55:20 -05:00
Devin Howard 8026969799 start storing data in ServerData 2016-11-07 14:55:17 -05:00
Devin Howard 4b500a4428 move Metamaps.Loading into node modules 2016-11-07 14:40:43 -05:00
Devin Howard 0778179ba7 eslint 2016-11-07 14:40:43 -05:00
Devin Howard bfd23c6d32 split Backbone.js into a bunch of different files. Still more work to do to modularize it 2016-11-07 14:40:43 -05:00
Devin Howard 9cb3074245 rename Metamaps.Backbone to Metamaps.DataModel 2016-11-07 14:40:43 -05:00
Connor Turland 887c3f7570 fixes #903 and #831 (#911) 2016-11-04 15:02:56 -07:00
Connor Turland 667f5653a7 topic descriptions from old data can be nil 2016-11-04 21:03:11 +00:00
Connor Turland 9ad4684825 firefox needs e.pageX not e.x (#906) 2016-11-02 19:20:06 -07:00
Devin Howard 644df6fcdc fix pasting urls (#901) 2016-11-01 16:01:34 +08:00
Connor Turland ed3e4780d2 bug when topic was in more than 5 maps fixes #891 (#894) 2016-10-31 17:10:44 -04:00
Connor Turland 151e96f803 Metamaps.Realtime.synapseRemoved is not a function (#880) 2016-10-29 12:10:13 -04:00
Connor Turland 6cc827d11c wasn't updating calculated_permission when updating permission (#869) 2016-10-28 18:26:40 -04:00
Devin Howard de16420796 fix logCanvasAttributes error (#863) 2016-10-28 15:20:39 +08:00
Devin Howard 4f3d12d7a5 fix import promises (#858) 2016-10-27 14:03:18 +08:00
Devin Howard 7b4a072fd8 attempt to fix import problems (#852) 2016-10-26 20:34:22 +08:00
Devin Howard b13587456d fix coordsToPixels calls even more 2016-10-26 19:11:40 +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 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
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 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 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 4f9b9460ad don't block all right clicks 2016-10-23 11:12:43 -04:00
Devin Howard 154257d062 fix Ctrl+A (#814) 2016-10-23 18:02:59 +08:00
Connor Turland 9600983311 remove Connor thinking out loud comment 2016-10-22 11:07:50 -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
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