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

67 commits

Author SHA1 Message Date
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
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
Devin Howard
73e7c38873 syntax fixes 2016-09-23 08:05:26 +08:00
Devin Howard
30fc943833 clean up backbone file imports 2016-09-23 00:20:05 +08:00
Devin Howard
a996734c79 remove Backbone from window 2016-09-23 00:16:15 +08:00
Devin Howard
30894a313f move views to their own frontend folder 2016-09-23 00:07:30 +08:00
Devin Howard
fe3012136d import _ 2016-09-22 23:51:33 +08:00
Devin Howard
59b471ac62 break Map into three files 2016-09-22 23:51:28 +08:00
Devin Howard
120c2c0b67 finish most except Backbone 2016-09-22 18:36:22 +08:00
Devin Howard
0065b201c7 make more code modular 2016-09-22 17:36:47 +08:00
Devin Howard
8ed2b3ffc1 remove Constants.js 2016-09-22 17:14:34 +08:00
Devin Howard
9c1543de64 move some variables into JIT 2016-09-22 17:08:53 +08:00
Devin Howard
8f100d99cb start to do stuff that may/may not work 2016-09-22 17:05:28 +08:00
Devin Howard
0562134157 low hanging fruit 
Here is my TODO list:

already done
==> Account.js <==
==> Admin.js <==
==> AutoLayout.js <==
==> Listeners.js <==
==> Mapper.js <==
==> Organize.js <==
==> PasteInput.js <==
==> ReactComponents.js <==
==> Util.js <==

TODO (I think) simple to make modular
==> Backbone.js <==
==> Control.js <==
==> Create.js <==
==> Filter.js <==
==> Import.js <==
==> Mobile.js <==
==> Synapse.js <==
==> SynapseCard.js <==
==> Topic.js <==
==> TopicCard.js <==
==> Views.js <==
==> Visualize.js <==

TODO hard to make modular
==> Constants.js <==
==> Debug.js <==
==> GlobalUI.js <==
==> JIT.js <==
==> Map.js <==
==> Realtime.js <==
==> Router.js <==
 2016-09-22 17:00:36 +08:00
Devin Howard
c0f63abc59 upgrade testing to es6 2016-09-22 17:00:36 +08:00
Devin Howard
d97b5c2977 make Util modular 2016-09-22 17:00:27 +08:00
Devin Howard
7f83f86460 refactor a bit, make a comment about the Constants file 2016-09-22 15:29:55 +08:00
Devin Howard
03446f548a start making the code modular. many files still need global scape 2016-09-22 15:23:14 +08:00
Devin Howard
d02c836805 remove Metamaps from filenames 2016-09-22 14:35:14 +08:00
Devin Howard
a4d31241a8 move Metamaps code into webpack 2016-09-22 14:28:20 +08:00
Connor Turland
549c086af4 styleee (#620) 2016-08-31 18:57:19 -04:00
Connor Turland
19dabe81cc Enable users to star maps, and to see their starred collection (#615) 
* enable starring

* users should be able to star others maps

* proper star icon

* starred maps display as starred without refreshing

* oops

* make phrasing clearer
 2016-08-31 16:58:49 -04:00
Connor Turland
d7759c8c07 Redo all of explore together in React (#617) 
* unify explore in react

* no more need for manual scroll reseting

* we're not opening/closing the search anymore
 2016-08-21 21:02:49 -04:00
Connor Turland
21e2418281 move apps header out of exploreMapsHeader 2016-08-16 15:38:05 +00:00