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

315 commits

Author SHA1 Message Date
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
Devin Howard ca981898d4 arrow key panning - fixes #239 2016-10-02 00:09:55 +08:00
Devin Howard 8f230736dc code climate 2016-10-01 13:47:16 +08:00
Devin Howard bb013787b6 make AutoLayout skip over coordinates if there is a mapping at that exact position 2016-10-01 13:34:52 +08:00
Devin Howard 20a32afe3b integrate handleURL into Import 2016-10-01 13:18:50 +08:00
Devin Howard c5564e02fc don't needt o open topic card 2016-10-01 12:47:30 +08:00
Devin Howard 4949f0dbd6 eslint and use AutoLayout 2016-10-01 12:43:30 +08:00
Devin Howard 1562d8fcfe topics imported with a link get Reference metacode 2016-10-01 12:14:38 +08:00
Devin Howard e093ca5a30 more liberally import csv 2016-10-01 11:21:42 +08:00
Devin Howard 01872e740e fix import if there are errors 2016-10-01 11:19:38 +08:00
Devin Howard 0e79f2ae4b fix tsv 2016-09-30 22:33:09 +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
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
Connor Turland b8c8f25c83 fixup applications page 2016-08-16 14:30:10 +00:00
Connor Turland b58f55353a switch so that backbone router is opt-in, not opt-out (#610) 2016-08-16 10:25:07 -04:00
Connor Turland dc60c3f3ed add profile image and fix exploreMaps bar 2016-08-12 05:03:28 +00:00
Connor Turland b4c75649ba all teh mobile things 2016-08-12 04:04:18 +00:00
Connor Turland f71d552504 Merge branch 'develop' into paring.down 2016-08-10 17:09:37 +00:00
Devin Howard 713063e578 fix npm testing script - it will actually break travis now 2016-08-07 20:00:44 +08:00
Devin Howard 00c54b7d66 fix another react bug 2016-08-05 10:54:18 +08:00
Devin Howard 980fca9844 remove spread syntax 2016-08-05 10:54:17 +08:00
Devin Howard 2274155801 split out a separate MapLink component for code reuse 2016-08-04 13:58:59 -04:00
Devin Howard 1774f8c530 object destructure + let/const 2016-08-04 13:58:59 -04:00
Devin Howard 2b2f6e6dc4 add propTypes 2016-08-04 13:58:59 -04:00
Connor Turland ede1dfb91c made the header more generic to serve other functions 2016-08-04 13:58:59 -04:00
Connor Turland 30e9a27663 almost rid of famous completely 2016-08-04 13:58:06 -04:00
Devin Howard 17a9a2d23a fix jquery error and move package.json etc to root dir 2016-08-03 22:40:14 +08:00
Devin Howard 6eff2d91c9 fix backbone jquery 2016-08-03 21:25:44 +08:00
Devin Howard 6997142fd9 finish integrating npm. move underscore/backbone into npm management (#577) 
* finish integrating npm. move underscore/backbone into npm management

* update docs for npm integration

* allow jsx or js extension

* change underscore version
 2016-08-01 15:59:53 -04:00
Devin Howard 5fe03641cb move frontend code into a folder, and setup react build tooling with es6 transforms (#576) 2016-07-31 14:51:06 -04:00