Commit graph

110 commits

Author SHA1 Message Date
Connor Turland 7ee96bf6c6 Into master: two finger pan/zoom, map and topic follows (for internal testing) on the UI, map activity emails (#1084)
* fix topic spec

* fix synapse/mapping spec

* brakeman csrf warning suppressed :|

* follows for maps in the ui for internal testing only still (#1072)

* follows for maps in the ui for testers

* require user for these actions

* match how map follow works

* include ability to unfollow from email

* fixup templates

* add unfollow_from_email to the policies

* Update _cheatsheet.html.erb

Clean up text, clarify, and bring in line with current functionality

* topicsRegex and synapsesRegex should allow commas (#1073)

* even better import csv regexes

* prevent double prompt on file drop import

* topic card in react (#1031)

* its coming along

* links bar

* scssify a bunch

* metacode image working a bit better

* metacode selector in react topic card

* riek editing for name field on topic card

* riek submit on enter

* factor out Title and Links from Topic Card component, but not the listeners

* create working Desc editor

* styling is much better now

* textarea min height for desc

* disallow images in topic card markdown

* shift enter is linebreak, enter is save

* attachments split out, but it's pretty buggy

* move listeners into Links.js

* slightly wider metacodeTitle

* fix positioning on metacode selector

* fix metacode selection

* move metacode and permissions into subcomponents

* fixes

* prevent editing on desc/title if not authorized to edit

* fix topic card draggability

* fix embedly

* fix md test

* remove the removed link card manually with jquery

* fix test syntax

* eslint

* more eslin

* reuse authorizedToEdit

* convert metacode sets to a json object for react

* add the html in react whoop

* fix metacode styling

* sort wasn't working

* finishing metacode select

* readd the above link input border

* fix syntax

* multiline title editable textarea

* more portable metacode selector component

* factor out #metacodeOptions into one react component with a callback :D:D:D

* render metacodeOptions in right click menu with react

* render metacodeOptions in right click menu with react

* fix up right click menu's metacode editing

* fix topic card title character counter

* ignore metamaps secret bundle in ag

* simplify Attachments props

* factor out embedly card into its own component; it seems to help

* link resetter

* fix edit icon on title in topic card

* move mapCount and synapseCount hover/click logic to react

* fix up the showMore control

* metacode selection tweaks

* tweak links bar spacing in topic card

* rubocop

* remove TODOs

* more badass permissions selector

* close permission selector when you click outside

* fix overeager metacode selector

* more modular attachments component

* fix bug in Desc.js

* fix right click styling

* permission changes are different than edit rights

* bad module ref

* ensure maxLength on topic titles

* hellz yeah (#1074)

* fix drop from two touches to one

* don't commit activity service

* ability to select/unselect all metacodes in custom set with keyboard shortcut (fix #390) (#1078)

* ability to select/unselect all metacodes in custom set with keyboard shortcut

* select all button

* nicer all/none buttons

* set up react testing (#1080)

* install mocha-webpack. also switch hark to npm version instead of github version

* well, mocha-webpack runs

* add jsdom for tests

* upgrade to webpack 2

* fix npm run test errors

* ImportDialogBox component tests

* Fixes bug where pressing delete key while editing text will suggest... (#1083)

* Fixes bug where pressing delete key while editing text will suggest the deletion of selected map entities

* Changed the DEL key to remove entities instead of delete them

* temporarily disable code climate duplication engine

* add topic following for internal testing

* daily map activity emails (#1081)

* data prepared, task setup

* add the basics of the email template

* cover granular permissions

* unfollow this map

* break out permissions tests better

* rename so test runs
2017-03-06 22:49:46 -05:00
Connor Turland dde097ea75 all the good changes (#1065) 2017-02-09 16:53:19 -05:00
Connor Turland 0441850504 Secret.convo (#1059)
* set up for using secret css/js

* testing

* add stuff

* final tweak for secret convos

* looks like its all working

* realized this change is just good all around

* minor touch ups

* only us for now

* no longer validate presence of xloc/yloc

* fix syntax issue
2017-02-05 14:30:23 -05:00
Connor Turland 8330ef9679 treat cable sub/unsub as joined/left map. fixes #1035 (#1047) 2017-01-25 15:32:13 -08:00
Devin Howard d11278b63b map rdf export (fixes #1015) (#1036)
* simple rdf export of maps

* register ttl mime type

* owl

* mm

* fix up export service

* implement base url thing whoo

* add more rdf fields

* fix rdf syntax errors

* hide unused fields in rdf

* some code climate fixes

* update ontology a bit more

* syntax fix

* typo
2017-01-22 16:42:04 -05:00
Connor Turland 68f0e91259 track forks (#994)
* track forks

* update api and docs

* fix tests
2016-12-18 16:17:51 -05:00
Devin Howard 8e958ec9a8 invite to edit notifications marked as read in system once map is visited 2016-12-16 16:23:30 -05:00
Devin Howard a32f98bde2 to_json should be as_json or there's bugs (#870)
* to_json should be as_json or there's bugs

* revert explore controller, it's better without

* revert search controller and some topic methods
2016-10-29 18:28:29 +08:00
Devin Howard fb6c8a74a7 scoping on topic json properties (#813) 2016-10-23 22:11:38 +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 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 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 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 a86101dda0 remove excel export 2016-09-27 21:10:14 +08:00
Devin Howard b722d2d3b0 fix map controller create spec 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 1ab8703008 move explore maps methods into their own controller 2016-09-25 23:25: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 0ace202ace automatic rubocop updates 2016-09-24 11:00:46 +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 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
Connor Turland 19dabe81cc Enable users to star maps, and to see their starred collection (#615)
* enable starring

* users should be able to star others maps

* proper star icon

* starred maps display as starred without refreshing

* oops

* make phrasing clearer
2016-08-31 16:58:49 -04:00
Connor Turland 57181e208f layout tweaks (#607)
* new map creation pops to new window

* hide the search on logged out homepage

* add { }

* just writing the same code better

* remove that old code
2016-08-16 08:03:06 -04: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 b72536853f fix activemaps_path url bug (#559)
* fix activemaps_path url bug

* annoying doc updates

* skip policy scope if redirecting an explore page

* lol that would have been dumb
2016-06-20 08:32:39 +08:00
Connor Turland c08868a5c1 user presence event (#552) 2016-04-26 08:08:12 -04:00
Connor Turland 8c51108a0c enable shared private and public maps (#530)
* enable shared private and public maps

* change the list

* yeehaw add collaborators

* I believe this fixes the error connor brought up

* when topic or synapse is no longer on a map, don't defer

* needs to be before?

* just do it in the controller

* make recommendation they sign in and retry

* better email

* config for mailer previews

* improve wording

* shouldn't have included that

* switch to green

* don't execute if there's no map

* wasn't including the right people in some circumstances

* Finish breaking out JS files (#551)

* metamaps.Realtime refactor

* Metamaps.Util

* Metamaps.Visualize

* Metamaps.SynapseCard

* Metamaps.TopicCard

* Metamaps.Create.js

* Remove erb extension from Metamaps.Map.js

* Metmaps.Account and Metamaps.GlobalUI remove extension

* Metamaps.JIT no more erb extension

* move Backbone.init; standard-format on Metamaps.js.erb

* factor out canvas support check function

* some llittle template bugs

* remove featured from signed in explore maps bar

* don't let it overflow off the page
2016-04-24 11:50:35 -04:00
Devin Howard 837e4bde1b fix map forking (fix #540) 2016-04-20 09:00:45 +08:00
Connor Turland 7bb7f345f1 added an event for conversations starting (#547)
* added an event for conversations starting

* switch to post
2016-04-14 14:35:28 -04:00
Devin Howard ae9f4a51a2 fix a few embarassing errors - export is working 2016-03-26 15:53:14 +08:00
Devin Howard d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland f58185fd40 Merge branch 'feature/pundit' into develop 2016-03-12 21:26:06 +11:00
Connor Turland a295c61322 json response was broken 2016-03-12 12:58:13 +11:00
Connor Turland d8c328468e changess for pundit 2016-03-12 11:45:39 +11:00
Devin Howard eb56755068 implement five policies into their controllers 2016-03-11 22:10:31 +08:00
Connor Turland 616dc9ed0e messages weren't being displayed in order 2016-03-01 12:55:00 +13:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard ef5d85c2bf before_filter => before_action 2016-02-28 17:48:35 +08:00
Devin Howard 36c5ddab1f before_filter => before_action 2016-02-28 17:48:18 +08:00
Devin Howard cbb6b648be implement main_policy (headless). also remove all @current references 2016-02-28 16:53:59 +08:00
Devin Howard bc7db85c8c update map index views 2016-02-28 13:14:34 +08:00
Devin Howard 8ef847bd6d factor maps#index into 4 separate functions 2016-02-28 12:30:41 +08:00
Devin Howard 43bdda61de maps controller spec passes, 3 pending 2016-02-09 11:48:07 +08:00
Devin Howard 005250f330 typo 2016-02-09 11:26:42 +08:00
Devin Howard 0b98e446ca fiddle with maps_controller code style 2016-02-09 11:20:04 +08:00
Devin Howard 987cd7f5a0 Merge branch 'feature/xls.export' into release/v2.8 2016-02-08 09:58:09 +08:00
Devin Howard 0ae8ea0ca5 implement csv/xls export 2016-02-07 13:12:18 +08:00