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
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
Devin Howard
2b036bfb4e
all Ctrl shortcuts now also work with Meta (Cmd on OSX)
2016-10-07 14:03:48 +08:00
Connor Turland
97d2868fad
dont pan while using arrow keys during creation fixes #721 ( #733 )
2016-10-06 10:49:49 -04:00
Connor Turland
658f102a4e
fixes #720 double topic create when pinned ( #732 )
2016-10-06 10:37:01 -04:00
Connor Turland
85dcad928f
enable pulling in of references to maps through typeahead ( #636 )
2016-10-06 09:12:01 -04:00
Connor Turland
a79d6a824c
dont do async: false ( #731 )
...
* dont do async: false
* account for case where callback isn't provided
2016-10-06 09:07:46 -04:00
Devin Howard
518773d6e1
pop up a lightbox using React to help you export
2016-10-06 16:22:21 +08:00
Devin Howard
33bcfc1505
move Maps into a folder
2016-10-06 16:20:27 +08:00
Devin Howard
b4d1250959
share normalizeKey between TSV, CSV, and JSON
2016-10-06 12:03:23 +08:00
Devin Howard
c0a220abc9
allow synapses to be imported by topic name as well as id
2016-10-06 11:52:05 +08:00
Connor Turland
0cfbe41d95
don't prevent all right clicking
2016-10-05 22:22:38 -04:00
Connor Turland
c256d0891b
dont conflict message sending with topic creation
2016-10-05 22:17:04 -04:00
Connor Turland
6d6a5099e9
Enable access to Most Used and Recently Used metacodes in lists and carousel ( #708 )
...
* used and recent
* enable most used and recent in all metacode select situations
* selected changed to active at some point
* switch recent and most used positions
* remove index doc page
2016-10-05 10:45:39 -04:00
Devin Howard
12417d8cd3
update JIT eslint style
2016-10-05 01:46:51 +08:00
Devin Howard
113a5a2530
fix a bunch of bug risk eslint warnings
2016-10-04 23:38:32 +08:00
Connor Turland
da3795a2c2
new map improvements ( #710 )
...
* prehighlight the text for editing when taken to a new map
* style
2016-10-02 22:49:45 -04:00
Devin Howard
6d2efefbbc
Merge pull request #709 from metamaps/bug/backbone
...
backbone router fix
2016-10-03 08:28:36 +08:00
Devin Howard
87228a9631
delete old gems and upgrade aws/paperclip ( #676 )
...
* remove old gems from gemfile, upgrade aws/paperclip
* update paperclip config
* upload screenshots as a blob instead of base64 to maps controller
2016-10-02 18:29:35 -04:00
Connor Turland
0f740e751a
topics wasn't in backbone routes
2016-10-02 17:37:14 -04:00
