Commit graph

1363 commits

Author SHA1 Message Date
Devin Howard 9699b41159 make requestinvite controller method explicit 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 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 c60e103d97 Update _switchmetacodes.html.erb 2016-09-26 20:28:06 -04: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 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
Devin Howard 7275beb163 put CRUD at top of maps controller, and alphabetize other actions below 2016-09-25 23:25:37 +08:00
Devin Howard 40bd9ed95a refactor maps controller a bit 2016-09-25 23:25:37 +08:00
Devin Howard 1ab8703008 move explore maps methods into their own controller 2016-09-25 23:25:37 +08:00
Devin Howard 959aa693f3 ok, i guess this is ready 2016-09-25 23:22:20 +08:00
Devin Howard cc2e3b9358 hack to get the <title> tag when importing a url, without CORS issues 2016-09-25 22:50:16 +08:00
Devin Howard 5819447828 fix git versioning 2016-09-25 19:35:37 +08:00
Devin Howard 03eacde753 Merge pull request #656 from metamaps/feature/tech-debt
rubocop style updates
2016-09-24 13:59:27 +08:00
Devin Howard a164dccc94 fix errors!! 2016-09-24 13:55:52 +08:00
Devin Howard 20bd959c69 fix models that rubocop broke >:( 2016-09-24 13:02:53 +08:00
Devin Howard b0fac7648a Merge pull request #650 from metamaps/fix/map-serialization-bug
fix @maps serialization bug
2016-09-24 12:32:38 +08:00
Devin Howard f8c11f234d more rubocop updates 2016-09-24 12:27:34 +08:00
Devin Howard 5fab6de48a fiddle with metacodes controller 2016-09-24 11:00:53 +08:00
Devin Howard 0ace202ace automatic rubocop updates 2016-09-24 11:00:46 +08:00
Devin Howard c76657ecb4 fix restful controller style issuse 2016-09-23 18:54:05 +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 bda740491c moved JIT to npm. tests pass. whoop whoop 2016-09-23 11:59:23 +08:00
Devin Howard 07e4ac3865 attempt to get npm testing working; fail 2016-09-23 10:37:59 +08:00
Connor Turland f59a5775ae tweaks to import/exports 2016-09-22 20:16:18 -04:00
Devin Howard 30894a313f move views to their own frontend folder 2016-09-23 00:07:30 +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 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
Devin Howard 9515152315 move auto layout function into its own file 2016-09-21 10:10:08 +08:00