Devin Howard
e9e6b1dc09
tweak chat emoji ( #1019 )
2017-01-09 14:55:21 -05:00
Devin Howard
cb95e027c4
Add emoji to chat ( #1013 )
...
* add emoji picker unstyled
* rename junto.css.erb => junto.scss.erb
* junto scss-ified
* add emoji mart css
* emoji are replaced in the text area
* remove unicode emoji from messages before sending to db
* add emoji back into messages on display
* bigger font size on chat messages
* tweak styling
* codeclimate (eslint)
2017-01-09 13:14:20 -05:00
Connor Turland
8e50efb3c1
render messages nicer
2017-01-04 18:12:07 -05:00
Connor Turland
3868910dde
Stream map related events from rails server via actioncable instead of nodejs ( #1010 )
...
* actioncable needs puma not webrick
* add framework
* remove the old way
* send events from server to client
* get all events working
* clean up receivable
* map is polymorphic on message
* add the moved event
* make todo comments clear
* verify before streaming from map channel
* rubocop fixes
* wasn't set up correctly for nodejs realtime
2017-01-03 16:12:58 -05: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
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
Connor Turland
f8556c30a5
resize every time it renders
2016-10-21 19:10:28 -04:00
Connor Turland
be8efa6025
add card features ( #793 )
2016-10-21 17:42:21 -04:00
Robert Best
f68deea202
changed all logical operators to be more strict
2016-10-21 20:59:16 +00:00
Robert Best
b61cdb04fc
Fixed the glitchyness, and made it suitable to merge with develop
2016-10-21 20:47:14 +00:00
Robert Best
5c67fcbff7
this time I actually addressed the conflicts
2016-10-21 20:38:17 +00:00
Robert Best
2eeb0a671f
Fixed cherry pick conflicts
2016-10-21 20:26:42 +00:00
Connor Turland
fb427a11f0
[WIP] keep client fresh with junto info globally ( #791 )
...
* push state to client
* junto status is live on map cards XD
* little fixes
* eslint stuff
* remove object rest spread
* i think this makes realtime work without needing babel-node
2016-10-21 09:29:04 -04:00
Connor Turland
7a09a1c620
last commit broke stuff
2016-10-20 18:27:14 -04:00
Connor Turland
103ed5cbd7
max at 4, use fewer if not enough maps
2016-10-20 18:10:28 -04:00
Connor Turland
52c340b8f5
center the explore maps div! ( #787 )
...
* ooh baby
* will add displayStyle again later if we actually build it
2016-10-19 14:40:42 -04:00
Connor Turland
9299ca5f2c
dont do translate with arrow keys till we can block conflicts
2016-10-19 17:47:10 +00:00
Devin Howard
2529e0d44f
copy share invite link to clipboard automatically where possible
2016-10-19 11:07:20 +08:00
Connor Turland
139837e997
restructure realtime server for clarity ( #780 )
...
* restructure realtime server for clarity
* better indenting on signal.js
* don't need it because socketioconnection is being imported now
2016-10-18 20:29:21 -04:00
Connor Turland
d8cd536a95
too much logging
2016-10-18 14:10:41 -04:00
Connor Turland
29913cd10b
fix for heroku
2016-10-18 14:08:10 -04:00
Connor Turland
d004e98ada
holy insanity realtime refactor ( #779 )
...
* all the refactoring
* make it all work
2016-10-18 12:34:19 -04:00
Connor Turland
d2e097fd05
add webrtc logging
2016-10-17 22:59:28 -04:00
Connor Turland
fe0da255dd
[WIP] display whether a map is live on every map card ( #775 )
...
* tidy up
* checkwhethertosave was no longer correct
2016-10-17 22:27:15 -04:00
Devin Howard
6c9d464a9f
Global => All Maps ( #774 )
2016-10-17 10:53:33 -04:00
Connor Turland
517cfcb913
remove static lib files in favor of npm ones ( #773 )
...
* remove static lib files in favor of npm ones
* update howler to work correctly
* patch npm modules to not use window
2016-10-17 10:39:08 -04:00
Connor Turland
332bb2ec08
Map Card changes ( #769 )
...
* map card rewrite underway
* star count
* css fix
2016-10-16 23:46:55 -04:00
Connor Turland
4602ded8a4
access requests ( #762 )
...
* start on access requests
* set up access requests further
* set default values for approved and answered
2016-10-16 20:22:00 -04:00
Devin Howard
8180a8cc71
fix file upload box
2016-10-14 14:45:17 +08:00
Devin Howard
fc2849824f
fix js syntax error
2016-10-13 16:48:46 +08:00
Devin Howard
b2a4acc99d
make default category explicit in import.js
2016-10-13 14:24:08 +08:00
Devin Howard
858ca66d69
eslint updates
2016-10-10 17:22:22 +08:00
Devin Howard
6e6d33abbe
fix screenshot no file error
2016-10-10 12:12:42 +08:00
Devin Howard
8b1d85c3ca
actually the smart option is dumb
2016-10-09 10:24:13 +08:00
Devin Howard
ba9e26bc05
enable xss filtering and smart quote replacement in markdown
2016-10-09 10:20:17 +08:00
Devin Howard
9ac24f7468
Merge pull request #744 from metamaps/feature/markdown-in-topic-cards
...
markdown in topic card description field
2016-10-08 16:58:32 +08:00
Devin Howard
fe1c57b458
further updates - make Enter update bip fields whaaat
2016-10-08 16:55:46 +08:00
Devin Howard
0764133d11
Merge pull request #661 from metamaps/feature/file-upload-component
...
set up a dialog box to help with import/export
2016-10-08 12:34:28 +08:00
Devin Howard
7eacda2ae7
code style
2016-10-08 09:35:05 +08:00
Devin Howard
0085ce71e6
upgrade to best in place 3.0.0 alpha
2016-10-08 09:24:16 +08:00
Devin Howard
fc044294f1
add markdown to topic cards
2016-10-08 09:23:57 +08:00
Devin Howard
42bb2cd86a
look and feel updates
2016-10-08 00:16:37 +08:00
Robert Best
b6da38e29e
Update Listeners.js
...
Simplified based on Connor's suggestion about usage of variables.
2016-10-07 02:36:41 -04:00