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

2096 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Howard e093ca5a30 more liberally import csv 2016-10-01 11:21:42 +08:00
Devin Howard 4328a6205f enable code duplication checks on code climate 2016-10-01 11:20:31 +08:00
Devin Howard 01872e740e fix import if there are errors 2016-10-01 11:19:38 +08:00
Devin Howard 6ae391265e enable source maps 2016-10-01 10:49:34 +08:00
Devin Howard ea18479822 Merge pull request #696 from metamaps/fix/import 
fix tsv import
 2016-09-30 22:38:36 +08:00
Devin Howard 0e79f2ae4b fix tsv 2016-09-30 22:33:09 +08:00
Devin Howard 7156fab3e2 fix topic controller bugs 2016-09-30 14:42:07 +08:00
Devin Howard 97c118a20b Merge pull request #693 from metamaps/feature/re-enable-search 
re-enable Ctrl+/ search box focus shortcut
 2016-09-30 12:02:44 +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 8864dbbdcf Merge pull request #691 from metamaps/feature/better.zoom 
I changed how zoom by mouse-wheel works so that it zooms based on whe…
 2016-09-29 18:26:02 -04: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
Devin Howard ec8dbbb4a7 Merge pull request #687 from metamaps/fix/rack-attack 
disable 5 minute request limit on rack attack
 2016-09-29 15:18:48 +08:00
Devin Howard 26977d06a8 disable 5 minute request limit on rack attack 2016-09-29 13:15:14 +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
Devin Howard ee9a49d7c6 Merge pull request #683 from metamaps/fix/routes 
fix routes.rb
 2016-09-29 08:44:15 +08:00
Devin Howard 88297b4eaa fix routes.rb 2016-09-29 08:40:39 +08:00
Connor Turland 93341719a9 Update main_controller.rb (#682) 2016-09-28 20:22:55 -04:00
Devin Howard db3cf0490f fix develop branch bugs (#679) 
* bugfix - rename SearchController so it works

* remove unneeded respond_with

* fix to_json calls
 2016-09-29 08:02:25 +08:00
Robert Best 9605b24640 Merge pull request #681 from metamaps/better-contextMenu-fix 
Better default context menu suppression fix
 2016-09-28 15:37:46 -04: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 d6a239d6b4 Merge pull request #670 from metamaps/feature/explore-controller-simplify 
[WIP test it] clean up routes and some controllers
 2016-09-28 22:34:34 +08:00
Devin Howard 466b1716a5 more changes to routes.rb 2016-09-28 22:29:53 +08:00
Devin Howard 9699b41159 make requestinvite controller method explicit 2016-09-28 22:29:53 +08:00
Devin Howard c1acaba941 re-order config/routes.rb 2016-09-28 22:29:53 +08:00
Devin Howard 5b9eedc830 pull search routes into their own controller 2016-09-28 22:29:53 +08:00
Devin Howard 5065655436 factor stars into their own controller 2016-09-28 22:27:32 +08:00
Devin Howard 3ee8d41298 maps controller code climate 2016-09-28 22:27:32 +08:00
Devin Howard f75ad41a82 factor out map_scope function 2016-09-28 22:27:32 +08:00
Devin Howard bb87c9c2db simplify explore controller a bit 2016-09-28 22:27:32 +08: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
Devin Howard cc412ac491 Merge pull request #675 from metamaps/feature/no-xls-export 
remove excel export
 2016-09-28 22:25:04 +08:00
Robert Best ac60370d6f Merge pull request #678 from metamaps/prevent-context-menu 
Prevent default context menu from opening when topics/synapses are right-clicked
 2016-09-28 05:27:03 -04: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
Devin Howard a86101dda0 remove excel export 2016-09-27 21:10:14 +08:00