Connor Turland
c308e276e8
Merge branch 'develop' into paring.down
2016-08-10 17:16:33 +00:00
Devin Howard
63b528c8bf
don't import into textarea elements either - fix #579 ( #598 )
2016-08-10 13:14:33 -04:00
Devin Howard
9db5ce551e
inject NODE_ENV into webpack - probably fixes #595 ( #599 )
2016-08-10 13:13:54 -04:00
Connor Turland
f71d552504
Merge branch 'develop' into paring.down
2016-08-10 17:09:37 +00:00
Devin Howard
beb52bc471
fix topic view keyboard shortcuts ( #597 )
...
* fix topic view selection crash on centerAndReveal
* topic view shortcuts switch to Alt
* change delete behaviour to be smarter
* fetchRelatives recursively handles arrays
* update topic url and Metamaps.Active.Topic when you center
* make heroku work 4 realz
2016-08-09 11:53:50 -04:00
Devin Howard
4478ca43b8
Merge pull request #594 from metamaps/feature/fix-heroku
...
multi-buildpack setup for heroku:
2016-08-09 20:35:06 +08:00
Devin Howard
b9247d2692
multi-buildpack setup for heroku:
...
$ heroku buildpacks:set https://github.com/heroku/heroku-buildpack-multi.git
will set it up
2016-08-09 13:49:38 +08:00
Devin Howard
3b24165fd0
Merge pull request #589 from metamaps/feature/topicview-remove-topics
...
enable removal of topics from topic view - fixes #467
2016-08-08 21:46:15 +08:00
Devin Howard
9cedf69432
fetch siblings & center topic keyboard shortcuts - fixes #466 ( #588 )
...
* fetch siblings & center topic keyboard shortcuts - fixes #466
* add keyboard shortcut labels
* update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs
* zoom extents back to Ctrl+E and use e.preventDefault
2016-08-08 21:46:05 +08:00
Devin Howard
3050f1413a
Merge pull request #587 from metamaps/feature/topicview-selection-box
...
fix selection box on radial view - fix #463
2016-08-08 21:43:22 +08:00
Devin Howard
5510cb2e99
enable removal of topics from topic view - fixes #467
2016-08-08 21:40:55 +08:00
Devin Howard
3b65ad923b
only show travis build status badge for develop branch
2016-08-07 21:26:53 +08:00
Devin Howard
713063e578
fix npm testing script - it will actually break travis now
2016-08-07 20:00:44 +08:00
Devin Howard
b66b75615a
remove frontend folder reference from travis
2016-08-07 19:45:11 +08:00
Devin Howard
77e8716588
Merge branch 'master' into develop
2016-08-07 17:23:57 +08:00
Devin Howard
fcc1dbdd11
Merge pull request #592 from metamaps/fix/synapse-import
...
fix: synapse import fails if synapses are missing desc
2016-08-07 17:21:21 +08:00
Devin Howard
23543ac7ad
fix: synapse import fails if synapses are missing desc
2016-08-07 17:18:54 +08:00
Devin Howard
d778016571
fix selection box on radial view - fix #463
2016-08-07 13:17:25 +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
17da8441f4
fixup react setup
2016-08-04 13:58:59 -04:00
Connor Turland
4005b301ac
uncomment commented header lines
2016-08-04 13:58:59 -04:00
Connor Turland
804afc3e1d
remove famous leftovers
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
Connor Turland
aed423214f
started using react instead of famous
2016-08-04 13:57:35 -04:00
Connor Turland
6b2386a545
progress onthe home page
2016-08-04 13:56:39 -04:00
Connor Turland
293e68da05
remove old stuff
2016-08-04 13:56:39 -04:00
Devin Howard
a6951920eb
fix module.exports javascript bug
2016-08-04 17:08:10 +08:00
Devin Howard
69bdb0bf01
hotfix master with mappable_policy.try
2016-08-04 17:04:01 +08:00
Devin Howard
194a4dc975
add production schema file
2016-08-04 16:53:09 +08:00
Devin Howard
52cbd57367
Merge pull request #586 from metamaps/merge/master-into-develop
...
merge master into develop
2016-08-04 10:53:00 +08:00
Devin Howard
6df8da16bc
Merge branch 'master' into develop
2016-08-04 10:51:36 +08:00
Devin Howard
dc725c3b9a
Merge pull request #583 from metamaps/fix/purple-metacodes
...
attempt to fix purple metacodes (#527 )
2016-08-04 10:16:04 +08: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
720f67cee7
move metacode loading earlier, and add a query string to work around amazon aws CORS issues
2016-08-03 08:54:10 +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
e6954eb37a
Merge pull request #574 from metamaps/fix/synapse-search-duplicates
...
fix synapse autocomplete duplicates
2016-08-01 08:56:55 +08:00
Devin Howard
70a4f54399
switch to ruby 2.3.0 ( #572 )
2016-08-01 08:33:45 +08: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
Devin Howard
4161f70d2e
remove duplicates from synapse search
...
there were 2 issues. one is synapses with leading/trailing whitespace. I've run a script on production to strip existing leading/trailing whitespace from synapse descs.
The second issue was that this code wasn't actually modifying the @synapses array, and collectedDesc wasn't doing anything. So this new line will be more effective.
2016-07-31 19:31:31 +08:00
Devin Howard
7d4da81272
Update code style automatically using rubocop gem ( #563 )
...
* install rubocop
* 1961 automatic rubocop fixes
* update rubocop.yml to ignore half of the remaining cops
* rubocop lint warnings
* random other warnings fixed
2016-07-26 08:14:23 +08:00
Devin Howard
17bccd809a
Merge pull request #568 from metamaps/fix/import-export
...
use Wildcard if no metacode
2016-07-26 08:05:00 +08:00
Devin Howard
e5c9af8f95
use Wildcard if no metacode
2016-07-24 13:43:12 +08:00
Devin Howard
27942546b8
fix 2 bugs on develop ( #565 )
...
* fix js bug
* if mappable is nil it causes an error
2016-07-02 16:32:02 +08:00
Devin Howard
872ae90832
submit new map form on Enter - fixes #555 ( #562 )
...
* submit new map form on Enter - fixes #555
* update divs too
2016-07-01 16:48:38 +08:00
