Connor Turland
db14e4a524
Merge d1680c1895 into 5c1261892f
2016-12-27 02:19:35 +00:00
Connor Turland
df5cc4e1a8
remove exclamation mark
2016-12-26 17:15:42 -05:00
Connor Turland
7d869d7b63
remove exclamation mark
2016-12-26 17:10:41 -05:00
Connor Turland
73e8f2d4c8
re-implement chat in react ( #997 )
...
* hidously mangle ChatView to start moving it to React
* fix up Realtime/index.js - should be good now?
* in theory this should compile
* ok the MapChat renders using react...
* move Handlers code into react - woot
* try reintegrating backbone
* fix wrapper styling
* chat box opens and closes properly
* make the unread count work
* organize more sanely
* refactor some of the ChatView functions
* removed management of chatview from room
* css can stop handling logic right about now
* makin things work
* don't need room here anymore
* set raw html in message
* make pending work
* removeParticipant when mapper left was broken
* re-enable scrolling, focus, and blur
2016-12-21 03:56:29 -05:00
Connor Turland
68f0e91259
track forks ( #994 )
...
* track forks
* update api and docs
* fix tests
2016-12-18 16:17:51 -05:00
Connor Turland
2d920cf66a
add maps links to nav locations
2016-12-16 16:25:13 -05:00
Connor Turland
87228c27c1
Fix mailboxer + email bugs
2016-12-16 16:24:24 -05:00
Connor Turland
6d8392d2e7
Make mailboxer look good and update email templates
2016-12-16 16:24:01 -05:00
Devin Howard
0960159265
Mailboxer notification pagination
2016-12-16 16:23:49 -05:00
Devin Howard
9debcdde39
Integrate rails mailers with mailboxer
2016-12-16 16:23:17 -05:00
Robert Best
b4ad51e69d
reactify notification icon
2016-12-16 16:21:40 -05:00
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
