Connor Turland
e72c437964
Merge f49a674566 into 47d0faadf2
2017-02-25 21:04:43 +00:00
Devin Howard
47d0faadf2
prevent double prompt on file drop import
2017-02-25 13:04:00 -08:00
Devin Howard
9800cc27c6
even better import csv regexes
2017-02-25 12:15:45 -08:00
Devin Howard
7840e09e5f
topicsRegex and synapsesRegex should allow commas ( #1073 )
2017-02-25 12:05:56 -08:00
Connor Turland
013e3c7f21
follows for maps in the ui for internal testing only still ( #1072 )
...
* follows for maps in the ui for testers
* require user for these actions
* match how map follow works
2017-02-15 23:01:53 -05:00
Connor Turland
2d0d0403b1
little fixes for deploy
2017-02-11 19:50:59 +00:00
Connor Turland
a647d80efa
third try to fix this little bug
2017-02-10 12:02:05 -05:00
Connor Turland
559ad230ce
actually this fixes it
2017-02-10 11:52:58 -05:00
Connor Turland
26dfcbf823
edge case where realtime server is passing empty object
2017-02-10 11:45:05 -05:00
Connor Turland
9c65d2df09
for special conversation url
2017-02-05 07:05:25 +00:00
Connor Turland
a84815aaed
tiny merge with develop
2017-02-05 06:39:55 +00:00
Connor Turland
72fd2717b6
Merge branch 'develop' into feature/convo.algo
2017-02-05 05:26:58 +00:00
Connor Turland
2423608fd3
actually optimize the island layout
2017-02-05 04:08:36 +00:00
Connor Turland
0929380e91
divide up the islands to the north and south
2017-02-05 03:34:59 +00:00
Connor Turland
6e347dc33a
fixup synapse creation
2017-02-05 03:26:18 +00:00
Connor Turland
96f66a2f8c
fix up topic creator
2017-02-04 04:27:08 +00:00
Connor Turland
74dd20f02e
got topic and synapse creation working
2017-02-04 04:13:59 +00:00
Connor Turland
04036882ab
do the bounds and translate
2017-02-03 20:58:49 +00:00
Connor Turland
fd54eb718a
its workking
2017-02-03 19:58:15 +00:00
Robert Best
00ecb0f6bb
Make DEL key delete selected items (With confirmation still :P ) ( #1058 )
...
* add del key
* made DEL key into delete shortcut
2017-02-03 14:23:04 -05:00
Connor Turland
ba230e1eed
only find parents for parents and children for children
2017-02-01 21:30:48 +00:00
Connor Turland
274b86532a
its vorkingg....
2017-02-01 18:08:02 +00:00
Connor Turland
6ed9796e05
no more matter
2017-02-01 17:49:16 +00:00
Connor Turland
08d2cbb00d
running algo each time an edge is added
2017-02-01 17:47:45 +00:00
Devin Howard
45a15da896
fix error in loading url titles
2017-02-01 12:37:50 -05:00
Devin Howard
a96c8ae75c
fix bug
2017-01-31 23:44:10 -05:00
Devin Howard
53bc4ee1c8
fix mapper page ( #1050 )
2017-01-28 15:44:38 -05:00
Connor Turland
6e913efbae
track pageloads with google analytics. fixes #1012 ( #1048 )
...
* track pageloads with google analytics. fixes #1012
* Update Router.js
2017-01-25 20:57:34 -08:00
Connor Turland
8330ef9679
treat cable sub/unsub as joined/left map. fixes #1035 ( #1047 )
2017-01-25 15:32:13 -08:00
Devin Howard
2fd972ddce
ajax queue ( fixes #853 ) ( #1037 )
...
* jquery.ajaxq
* install jquery.ajaxq from npm
* patch ajaxq into Backbone code
* use ajaxq library with more github stars
* eslint
2017-01-22 13:50:34 -05:00
Devin Howard
1229e92feb
fix bug in Debug.js
2017-01-21 13:34:39 -05:00
Devin Howard
ba3d5f07dd
try to fix metamaps.debug
2017-01-21 13:09:26 -05:00
Devin Howard
af2c6ebef1
split screenshot function/button into two parts ( #1027 )
...
* split screenshot function into 4 separate helpers
* screenshot download button in import dialog box
* thumbnail button inside map info box
* import blue button styling
* fight with styling to make the button at least appear
* add more text
* fix tooltip display
* automatically start downloading the screenshot
* eslint
* revamp GlobalUI.notifyUser
* fix object destructuring syntax
* fix
2017-01-19 14:50:08 -05:00
Connor Turland
e7a52dc14e
bugs
2017-01-12 14:11:01 -05:00
Connor Turland
b2b5090b28
still make it work for logged out users
2017-01-12 12:31:08 -05:00
Connor Turland
38c01c4e8f
fix the carousel
2017-01-12 12:19:54 -05:00
Connor Turland
b13ac98c9f
chat iss working
2017-01-12 04:55:57 -05:00
Connor Turland
4a17d00123
stuff with metacodes working well again
2017-01-12 04:00:52 -05:00
Connor Turland
9c13f5a281
metacode selector working nicely
2017-01-12 00:04:49 -05:00
Connor Turland
616a489ae4
Merge branch 'feature/better.select' into feature/particles
2017-01-11 23:18:26 -05:00
Connor Turland
816815d1b5
awesome
2017-01-11 23:17:57 -05:00
Devin Howard
42d671c05b
stop replacing shortcodes/emoticon in the live NewMessage textarea ( #1026 )
2017-01-11 13:56:44 -05:00
Devin Howard
08109ee5de
remove instructions from ImportDialogBox ( #1022 )
...
* remove instructions from ImportDialogBox
* link back to docs.metamaps.cc for import instructions
2017-01-11 13:50:37 -05:00
Connor Turland
0952c0f3c9
Bug/name.overflow ( #1025 )
...
* creator name was pushing 'view only' off card
* Update MapCard.js
2017-01-11 13:36:07 -05:00
Devin Howard
25b4d388de
eslint commands and apply some style fixes ( #1021 )
...
* auto eslint and add commands for eslint
* eslint the entire frontend folder
2017-01-11 12:52:34 -05:00
Devin Howard
8b738f3d28
emoticons turned on by default
2017-01-10 22:05:04 -05:00
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
3ff102b228
initial particle test
2017-01-05 00:05:18 -05:00
Connor Turland
8e50efb3c1
render messages nicer
2017-01-04 18:12:07 -05:00
