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

1465 commits

Author SHA1 Message Date
Connor Turland fb427a11f0 [WIP] keep client fresh with junto info globally (#791) 
* push state to client

* junto status is live on map cards XD

* little fixes

* eslint stuff

* remove object rest spread

* i think this makes realtime work without needing babel-node
 2016-10-21 09:29:04 -04:00
Connor Turland 52c340b8f5 center the explore maps div! (#787) 
* ooh baby

* will add displayStyle again later if we actually build it
 2016-10-19 14:40:42 -04:00
Devin Howard 261ed49977 replace uservoice with docs.metamaps.cc + Hylo (#777) 
* replace uservoice with docs.metamaps.cc + Hylo

* re-add the feedback tab as link to hylo
 2016-10-19 13:39:57 -04:00
Devin Howard 7f1c04015e fix topic autocomplete controller action 2016-10-19 22:10:38 +08:00
Devin Howard bb6566a45e clean up and fix devise code 2016-10-19 12:40:52 +08:00
Connor Turland 139837e997 restructure realtime server for clarity (#780) 
* restructure realtime server for clarity

* better indenting on signal.js

* don't need it because socketioconnection is being imported now
 2016-10-18 20:29:21 -04:00
Devin Howard 6c9d464a9f Global => All Maps (#774) 2016-10-17 10:53:33 -04:00
Connor Turland 517cfcb913 remove static lib files in favor of npm ones (#773) 
* remove static lib files in favor of npm ones

* update howler to work correctly

* patch npm modules to not use window
 2016-10-17 10:39:08 -04:00
Devin Howard 0ee1b3284a fix check-canvas-support require 2016-10-17 13:47:42 +08:00
Devin Howard b976c13db2 Merge pull request #770 from metamaps/feature/remove-canvas-function 
remove check-canvas-support.js
 2016-10-17 13:40:34 +08:00
Connor Turland c0955d7c5e multiple policy issues (#771) 
* multiple policy errors

* make some things more explicit
 2016-10-17 01:20:48 -04:00
Connor Turland 332bb2ec08 Map Card changes (#769) 
* map card rewrite underway

* star count

* css fix
 2016-10-16 23:46:55 -04:00
Devin Howard 179849b639 remove check-canvas-support.js 2016-10-17 11:42:11 +08:00
Connor Turland 4602ded8a4 access requests (#762) 
* start on access requests

* set up access requests further

* set default values for approved and answered
 2016-10-16 20:22:00 -04:00
Devin Howard 6f3c74b7f1 token policy fix 2016-10-13 15:21:27 +08:00
Devin Howard 7eae8deacb revamp HTML template a bit for api docs (#757) 
* my_tokens endpoint moved to normal index

* remove secured_by from metacodes/users

* ch ch ch changes

* mess with template

* fix securedBy

* convenience open

* gross authentication notes at the top of every endpoint

* better ordering

* move login tutorials into security tab

* oauth tutorial

* getting closer

* remove unneeded Endpoints header

* ok looks OK
 2016-10-12 13:54:43 -04:00
Devin Howard 9ac24f7468 Merge pull request #744 from metamaps/feature/markdown-in-topic-cards 
markdown in topic card description field
 2016-10-08 16:58:32 +08:00
Devin Howard fe1c57b458 further updates - make Enter update bip fields whaaat 2016-10-08 16:55:46 +08:00
Devin Howard 9d85dab975 Merge pull request #747 from metamaps/fix/unauth-error 
redirect to root_path if you get a 403
 2016-10-08 14:16:13 +08:00
Devin Howard ab76b77bdd Merge pull request #748 from metamaps/feature/api-json-404 
return 404s for all unmatched api routes
 2016-10-08 14:16:00 +08:00
Devin Howard 9513087bbd remove unnecessary api v1 code 2016-10-08 14:12:54 +08:00
Devin Howard 2c64b67abd return 404s for all unmatched api routes 2016-10-08 13:58:19 +08:00
Devin Howard 0764133d11 Merge pull request #661 from metamaps/feature/file-upload-component 
set up a dialog box to help with import/export
 2016-10-08 12:34:28 +08:00
Devin Howard 129e3db946 redirect to root_path if you get a 403 2016-10-08 12:26:08 +08:00
Devin Howard f775629371 showCard .desc css for ul and a tags 2016-10-08 09:24:17 +08:00
Devin Howard 0085ce71e6 upgrade to best in place 3.0.0 alpha 2016-10-08 09:24:16 +08:00
Devin Howard fc044294f1 add markdown to topic cards 2016-10-08 09:23:57 +08:00
Devin Howard 20da1ef39f fiddle with import icon 2016-10-08 00:21:04 +08:00
Devin Howard 42bb2cd86a look and feel updates 2016-10-08 00:16:37 +08:00
Connor Turland 86a6e92bc3 dont show private maps in global collection (#734) 
* dont show private maps in global collection

* Update explore_controller.rb

* Update main_controller.rb
 2016-10-06 23:45:17 -04:00
Connor Turland b52523e7be one more maps in maps error 2016-10-06 10:32:06 -04:00
Connor Turland e72ae5df94 another issue from the maps in maps branch 2016-10-06 09:33:10 -04:00
Connor Turland a56c4eb110 missing comma 2016-10-06 09:27:18 -04:00
Connor Turland 85dcad928f enable pulling in of references to maps through typeahead (#636) 2016-10-06 09:12:01 -04:00
Devin Howard 38c323a18a global lightbox css changes 2016-10-06 16:22:22 +08:00
Devin Howard 518773d6e1 pop up a lightbox using React to help you export 2016-10-06 16:22:21 +08:00
Devin Howard eb4073c228 word wrap on chat message text. Fixes #726 2016-10-06 11:18:55 +08:00
Connor Turland 98fae4b721 fixes #711 toast button styling 2016-10-05 22:28:37 -04:00
Connor Turland 6d6a5099e9 Enable access to Most Used and Recently Used metacodes in lists and carousel (#708) 
* used and recent

* enable most used and recent in all metacode select situations

* selected changed to active at some point

* switch recent and most used positions

* remove index doc page
 2016-10-05 10:45:39 -04:00
Devin Howard d193c9a53c add starred to maps API (#719) 
* add starred to maps API and endpoint to create/delete

* add token to requests without token param

* add minor version number to api version

* metacode/user use uri in schema

* make code climate happier
 2016-10-05 10:36:03 -04:00
Devin Howard df29e48d8c rubocop + allow unauthed users to see all users 2016-10-04 22:51:21 +08:00
Devin Howard 2eae89a6b7 users and metacodes api endpoints 2016-10-04 22:28:10 +08:00
Devin Howard 8afef1bc4a make tokens description field optional 2016-10-04 16:08:07 +08:00
Devin Howard 3d7a2ef5b1 make raml traits work and be accurate/useful 2016-10-04 15:22:24 +08:00
Connor Turland da3795a2c2 new map improvements (#710) 
* prehighlight the text for editing when taken to a new map

* style
 2016-10-02 22:49:45 -04:00
Devin Howard 7d0b56da19 Merge pull request #689 from metamaps/feature/user-in-slack-notification 
Custom formatter for slack exception notifications
 2016-10-03 08:26:13 +08:00
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 afa4422608 Custom formatter for slack exception notifications 2016-10-02 17:07:45 +08:00
Devin Howard bc139608c2 Search.focus() is the new Search.open() 2016-10-02 10:09:55 +08:00
Devin Howard 7156fab3e2 fix topic controller bugs 2016-09-30 14:42:07 +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
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