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

2122 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Connor Turland
8f0b350a2d Fix underscore bug (#674) 
* Update package.json

* Update ChatView.js
 2016-09-26 20:39:33 -04:00
Connor Turland
c60e103d97 Update _switchmetacodes.html.erb 2016-09-26 20:28:06 -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
12cb675bb5 switch to using the eslint-standard plugin again 2016-09-26 13:44:23 +08:00
Devin Howard
c9a79468f4 switch to eslint-3 2016-09-26 13:40:02 +08:00
Devin Howard
ebaae084ae simple eslint fixes 2016-09-26 13:37:42 +08:00
Devin Howard
e646585a7a Merge pull request #672 from metamaps/feature/eslint-config 
fix eslint config for code climate
 2016-09-26 10:50:30 +08:00
Devin Howard
0e17ec11ec fix eslint config for code climate 
this is MOSTLY the same as feross/standard
 2016-09-26 10:47:45 +08:00
Devin Howard
5649798e4b Merge pull request #668 from metamaps/fix/hide-addTopic-message-on-double-click 
show/hide add a topic instructions more consistently
 2016-09-25 23:51:00 +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
b49cb7766a Merge pull request #652 from metamaps/feature/explore-controller 
refactor map controller
 2016-09-25 23:47:22 +08:00
Devin Howard
fb563c6eed Merge pull request #648 from metamaps/feature/load-url-title-hack 
hack to load link titles when pulling a url into a map
 2016-09-25 23:47:10 +08:00
Devin Howard
03ba3a89f1 main controller renders by name 2016-09-25 23:37:08 +08:00
Devin Howard
05495b0224 move explore views to their own folder 2016-09-25 23:35:35 +08:00
Devin Howard
18d8929bf1 use .or to fix all sorts of @map.mappings bugs 2016-09-25 23:35:26 +08:00
Devin Howard
50f98aebea explore controller spec 2016-09-25 23:25:38 +08:00
Devin Howard
dad048eb20 rubocop 2016-09-25 23:25:38 +08:00
Devin Howard
c76de5b1d5 refactor map model a bit and fix bugs 2016-09-25 23:25:38 +08:00
Devin Howard
3f9077b380 clean up 2016-09-25 23:25:38 +08:00
Devin Howard
b722d2d3b0 fix map controller create spec 2016-09-25 23:25:38 +08:00
Devin Howard
5e180ac10e set up explore controller routes and rename methods 2016-09-25 23:25:38 +08:00
Devin Howard
686d80e274 move more logic into map model 2016-09-25 23:25:37 +08:00