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

2012 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Devin Howard
7ec9feff80 Merge pull request #702 from metamaps/feature/quiet-assets 
quiet assets again
 2016-10-02 11:01:17 +08:00
Devin Howard
b3c7e12d9a assets.debug was why assets were loud 2016-10-02 10:53:35 +08:00
Devin Howard
bc139608c2 Search.focus() is the new Search.open() 2016-10-02 10:09:55 +08:00
Devin Howard
05c1e4c60d Merge pull request #699 from metamaps/feature/arrow-keys-pan 
arrow key panning - fixes #239
 2016-10-02 00:13:16 +08:00
Devin Howard
ca981898d4 arrow key panning - fixes #239 2016-10-02 00:09:55 +08:00
Devin Howard
77d353464b Merge pull request #698 from metamaps/feature/random-updates 
more random js & import updates
 2016-10-01 23:26:58 +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
99d07d2d65 Merge pull request #695 from metamaps/fix/topic-bugs 
fix topic controller bugs
 2016-10-01 12:38:56 +08:00
Devin Howard
fdf03ac83a source maps! 
(I think)
 2016-10-01 12:32:40 +08:00
Devin Howard
1562d8fcfe topics imported with a link get Reference metacode 2016-10-01 12:14:38 +08:00
Devin Howard
e5e8a3dcbb Merge pull request #697 from metamaps/feature/random-updates 
import fixes + random config updates
 2016-10-01 11:36:57 +08:00
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