Commit graph

2189 commits

Author SHA1 Message Date
Robert Best
0a62eb3299 Merge pull request #655 from metamaps/feature/fix-map-titles
Feature/fix map titles
2016-09-23 16:48:44 -04: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
c76657ecb4 fix restful controller style issuse 2016-09-23 18:54:05 +08:00
Devin Howard
8255653d24 disable duplication checking in code climate for now 2016-09-23 18:51:34 +08:00
Devin Howard
04a3027368 code climate linked to travis 2016-09-23 18:43:54 +08:00
Devin Howard
cbd9395142 Merge pull request #651 from metamaps/feature/update
update gems
2016-09-23 18:37:14 +08:00
Devin Howard
bb5ba4861d [WIP] code climate config file (#654)
code climate config file
2016-09-23 18:36:47 +08:00
Devin Howard
4afab70414 Merge pull request #653 from metamaps/fix/travis
safer git dating
2016-09-23 17:57:02 +08:00
Devin Howard
a7338f8960 safer git dating 2016-09-23 17:49:26 +08:00
Devin Howard
117b7910bf test 2016-09-23 17:40:30 +08:00
Devin Howard
ce1ad3e24b update gems 2016-09-23 15:28:31 +08:00
Devin Howard
df84bd9e1d fix @maps serialization bug
if @maps is empty, it returns {"maps":[]}, instead of [] like we expect
on the frontend.

This commit fixes this issue
2016-09-23 14:40:26 +08:00
Devin Howard
eef8a281cb Merge pull request #649 from metamaps/feature/Metamaps-in-frontend
move Metamaps code to webpack
2016-09-23 14:22:46 +08:00
Devin Howard
6f91ce5ff5 fix a few more errors 2016-09-23 14:12:27 +08:00
Devin Howard
e65a5e2d1c whoops, reenable travis npm test 2016-09-23 12:00:47 +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
0a109895f7 merge realtime/package.json into top level package.json 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
Devin Howard
b13ebc6716 Merge pull request #640 from metamaps/fix/password-reset-error
fix password reset error
2016-09-22 09:16:25 +08:00
Devin Howard
1370b63311 Merge pull request #639 from metamaps/feature/paste-url
Allow pasting URLs into the map to create a new topic
2016-09-22 09:16:03 +08:00
Connor Turland
2219e0d0dd Update Metamaps.Topic.js 2016-09-21 14:53:17 -04:00
Devin Howard
8b19c9e340 automatic versioning via git (#621) 2016-09-21 13:24:14 -04:00
Devin Howard
3843cab643 rails 5 + api v2 + raml api docs (#593)
* update Gemfile to rails 5 and ruby 2.3.0

* fiddle with javascripts and add sprockets manifest file

* update config directory for rails 5

* fix some errors with controllers/serializers

* fix travis and rspec

* new serializers renamed to serializers

* module Api::V1

* reusable embedding code

* add index/collections/paging. overriding most of snorlax now |:)

* raml api documentation + rspec tests to verify schemas/examples

* add sorting by ?sort and searching by ?q. Add pagination Link headers

* api v1 => v2

* fill out synapse api

* alphabetize map policy

* fix page thing

* fill out maps api

* formParameters => properties, and fiddle with map api

* more raml 1.0 stuff i'm learning about

* deprecate v1 api

* rails 5 uses ApplicationRecord class for app-wide model config

* Update topic spec for api v2

* workaround for user_preference.rb issue

* get ready for token api docs. also TODO is mapping api docs

* spec out mapping api

* map/mapping/synapse spec, plus other bugs

* awesome, token specs/apis are done

* add sanity checks to the api tests

* more cleanup

* devise fix

* fix starred map error
2016-09-21 13:22:40 -04:00
Devin Howard
1efd78ad7b initial attempt at focussing input field when entering multiple topics 2016-09-21 14:27:49 +08:00
Devin Howard
49084b98dd omg import bookmarks 😍 2016-09-21 10:48:47 +08:00
Devin Howard
fac59f346f fix topic init function 2016-09-21 10:24:57 +08:00
Devin Howard
ec96d69876 refactor import view:
-Paste Input wrapper class to abstract away getting input
-Add ability to drop files in PasteInput
-Add ability to drop .webloc files or paste a link to create a new topic with that link in the link and desc fields
2016-09-21 10:11:08 +08:00