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

89 commits

Author SHA1 Message Date
Connor Turland
a2f3194b4b access maps that are live 2016-09-30 22:21:30 +08:00
Devin Howard
b396b94477 re-enable Ctrl+/ search box focus shortcut 2016-09-30 11:55:43 +08:00
Devin Howard
e916ea32dc Merge pull request #690 from metamaps/feature/globalui-lint 
eslint updates for GlobalUI.js
 2016-09-30 11:54:40 +08:00
Devin Howard
816d5adf94 remove old code from GlobalUI.Search 2016-09-30 11:52:01 +08:00
Robert Best
44a183ed7b I changed how zoom by mouse-wheel works so that it zooms based on where your mouse pointer is 2016-09-29 21:32:55 +00:00
Devin Howard
e4e6043ded split GlobalUI into files 2016-09-30 00:20:16 +08:00
Devin Howard
24caafba74 move GlobalUI into a folder 2016-09-30 00:08:45 +08:00
Devin Howard
3b8199aac6 eslint updates for GlobalUI.js 2016-09-30 00:08:04 +08:00
Devin Howard
2f0b0f39e5 Merge pull request #688 from metamaps/fix/searchsynapses-undefined-topic 
fix error when searching for synapse with undefined topic1id
 2016-09-29 23:56:16 +08:00
Devin Howard
1d4d7f07e2 fix error when searching for synapse with undefined topic1id 2016-09-29 18:38:54 +08:00
Devin Howard
9af3f04f4d Merge pull request #685 from metamaps/feature/chatview-lint 
update ChatView.js eslint style
 2016-09-29 15:21:15 +08:00
Connor Turland
1bbc72fff0 was destroying and not reinitializing 2016-09-28 22:36:53 -04:00
Devin Howard
bca85337cc add template strings + outdent to chatview 2016-09-29 09:33:13 +08:00
Devin Howard
e858a2a773 update ChatView.js eslint style 2016-09-29 09:24:17 +08:00
Robert Best
e8746ee7d9 Update Create.js 2016-09-28 15:32:49 -04:00
Robert Best
a37f60060c Update JIT.js 2016-09-28 15:31:08 -04:00
Robert Best
4e506ad290 Update JIT.js 2016-09-28 15:18:44 -04:00
Robert Best
67c4912c62 Update index.js 2016-09-28 13:37:08 -04:00
Robert Best
10a2782f85 Update JIT.js 2016-09-28 13:03:44 -04:00
Robert Best
2c3b387e42 Update index.js 2016-09-28 13:00:32 -04:00
Devin Howard
a8b698b11c Merge pull request #677 from metamaps/feature/node1-topic1-migration 
node{1,2}_id => topic{1,2}_id migration and code changes
 2016-09-28 22:26:50 +08:00
Robert Best
40b7e95b68 Update index.js 
Prevents the default chrome context menu from appearing overtop the Metamaps context menu
 2016-09-28 04:35:41 -04:00
Devin Howard
743c9b3af9 node{1,2}_id => topic{1,2}_id migration and code changes 2016-09-28 10:35:14 +08:00
Connor Turland
8f0b350a2d Fix underscore bug (#674) 
* Update package.json

* Update ChatView.js
 2016-09-26 20:39:33 -04:00
Devin Howard
7150b9fcce Merge pull request #673 from metamaps/fix/eslint-updates 
Figured out eslint-3 + some small eslint fixes
 2016-09-26 18:18:31 +08:00
Devin Howard
bc8ce0fee4 topic view bug fix 2016-09-26 14:04:31 +08:00
Devin Howard
ebaae084ae simple eslint fixes 2016-09-26 13:37:42 +08:00
Devin Howard
c20e503785 show/hide add a topic instructions more consistently 2016-09-25 23:48:14 +08:00
Devin Howard
17870e7a4c Merge pull request #669 from metamaps/fix/remove-invalid-links 
show link remover for invalid links too
 2016-09-25 23:47:30 +08:00
Devin Howard
cc2e3b9358 hack to get the <title> tag when importing a url, without CORS issues 2016-09-25 22:50:16 +08:00
Devin Howard
8c16c60554 show link remover for invalid links too 2016-09-25 22:44:07 +08:00
Devin Howard
dd78c0c379 Merge pull request #665 from metamaps/fix/topic-to-map-transition 
hide circles when transitioning from topic view to map view
 2016-09-25 22:25:19 +08:00
Devin Howard
11d13445fb fix authorizeToEdit call 2016-09-25 20:19:38 +08:00
Devin Howard
7734272737 hide circles when transitioning from topic view to map view 
fixes #389
 2016-09-25 20:10:18 +08:00
Devin Howard
43fafb8e6f Merge pull request #663 from metamaps/fix/git-versioning 
fix git versioning
 2016-09-25 19:48:48 +08:00
Devin Howard
5819447828 fix git versioning 2016-09-25 19:35:37 +08:00
Devin Howard
35d6dbd0b4 hide double click to add topic message if can't edit map 2016-09-25 15:04:14 +08:00
Devin Howard
40f89b1c61 enable csv import using csv-parse module 2016-09-25 12:49:57 +08:00
Devin Howard
0a0ff2fdab remove fetch api - we don't want no polyfills, and already have jQuery 2016-09-24 23:28:11 +08:00
Devin Howard
045bd3fd73 Metamaps.Filter bug and use _.omit instead of util function 2016-09-24 23:23:12 +08:00
Devin Howard
0bb7b1523d Metamaps.ReactComponents isn't needed anymore 2016-09-24 14:40:40 +08:00
Robert Best
afa0cc96b9 Update index.js 2016-09-23 16:06:28 -04:00
Robert Best
f41ece6f1c Update index.js 2016-09-23 15:47:37 -04:00
Robert Best
b8ae2c4b6a Update Router.js 2016-09-23 15:45:11 -04:00
Devin Howard
6f91ce5ff5 fix a few more errors 2016-09-23 14:12:27 +08:00
Devin Howard
bda740491c moved JIT to npm. tests pass. whoop whoop 2016-09-23 11:59:23 +08:00
Connor Turland
700119cc9e opts can be undefined and throw error 2016-09-22 23:04:46 -04:00
Devin Howard
07e4ac3865 attempt to get npm testing working; fail 2016-09-23 10:37:59 +08:00
Connor Turland
499593fc82 fixing references 2016-09-22 21:40:49 -04:00
Connor Turland
f59a5775ae tweaks to import/exports 2016-09-22 20:16:18 -04:00