Commit graph

110 commits

Author SHA1 Message Date
Connor Turland 9b2193ad8c show autofollow on client and mute on unfollow 2017-09-03 15:18:57 -04:00
Devin Howard 95901e17e8 fix travis (#1071)
* fix topic spec

* fix synapse/mapping spec

* brakeman csrf warning suppressed :|
2017-02-12 12:53:04 -05:00
Connor Turland b0deafc53e Follows and some new notifications (#1063)
* all the good changes

* follows

* dont send duplicates

* remove follow_type for now

* dont add all the extra stuff we're not implementing yet

* refactor

* lots of fixes

* Delete activity.html.erb

* Delete activity.text.erb

* Update 20170209215819_create_follows.rb

* Update schema.rb

* Update mapping.rb

* Update mailboxer.rb
2017-02-11 00:20:42 -05:00
Connor Turland dde097ea75 all the good changes (#1065) 2017-02-09 16:53:19 -05:00
Connor Turland c60f7f4525 add Story, which is on metamaps, total is now 48 2017-01-28 01:04:23 -05:00
Connor Turland 8df2cd8732 fix metacode names 2017-01-28 01:01:20 -05:00
Devin Howard 696ff396b0 file attachments in db (re: #124) (#1043)
* file attachments in db

* rubocop

* factor out a bunch of file types

* thumb and medium image styles"

* syntax error in concern

* markdown is also plaintext

* rubocop
2017-01-24 15:10:40 -05:00
Connor Turland 68f0e91259 track forks (#994)
* track forks

* update api and docs

* fix tests
2016-12-18 16:17:51 -05:00
Connor Turland fb12c7e202 Track everything we need to reconstruct maps (#984)
* feature/more.events

* keep mapping.user as the creator

* cleanup cruft and include slack notifs

* capture topic and synapse updates, store the old values

* avoid the mapping gets deleted problem

* include an indicator of which values changed

* style cleanup

* remove the hack in favor of a legit way

* updated schema file
2016-12-16 16:51:52 -05:00
Devin Howard 85408a14d3 Initial notification centre using mailboxer 2016-12-16 16:20:53 -05:00
Devin Howard c03d6dd5f6 remove in_trash from schema to match production 2016-11-13 17:21:42 -05:00
Connor Turland 0f85abfda2 add channel to webhooks (#915) 2016-11-05 09:34:50 -07:00
Connor Turland 9299ca5f2c dont do translate with arrow keys till we can block conflicts 2016-10-19 17:47:10 +00:00
Devin Howard e46aa54ba3 schema update 2016-10-17 10:39:46 +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 743c9b3af9 node{1,2}_id => topic{1,2}_id migration and code changes 2016-09-28 10:35:14 +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
Devin Howard 77e8716588 Merge branch 'master' into develop 2016-08-07 17:23:57 +08:00
Devin Howard 194a4dc975 add production schema file 2016-08-04 16:53:09 +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
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
Connor Turland a82b0048d8 don't need sequenced 2016-03-27 00:14:22 -07:00
Connor Turland 5317711b57 Merge branch 'develop' into oauth.provider 2016-03-23 18:00:59 -07:00
Connor Turland e6ac4b1dcb make metamaps an oauth provider 2016-03-19 13:28:55 +11:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland 77d69dd2a3 turns out we do need delayed_job 2016-03-13 11:56:18 +11:00
Connor Turland fe578ca3b2 add migrations 2016-03-13 11:24:00 +11:00
Connor Turland d863d1c15b remove traces of delayed_job 2016-03-13 10:42:55 +11:00
Connor Turland 11e57c1b37 rebase onto develop which now has API and pundit 2016-03-13 10:36:38 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard 40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed 2016-02-25 14:49:48 +08:00
Devin Howard 295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION 2016-02-23 14:58:20 +08:00
Devin Howard 821966c5db update schema.rb 2016-02-05 18:11:35 +08:00
Devin Howard 8a74118cb1 Merge branch 'develop' into feature/realtime.video 2016-01-25 11:23:32 +08:00
Devin Howard 79431f8515 fix user seeds 2016-01-25 11:23:10 +08:00
Connor Turland 5d838303a8 broken gemfile.lock and pass recent migrations 2016-01-22 16:14:35 +13:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard 8a8ac92a8f data safety 2016-01-20 10:18:44 +08:00
Devin Howard 0e7690f2af fix metacode asset path update db migration 2016-01-20 10:18:22 +08:00
Devin Howard 4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard 75d9339010 make mapping polymorphism migration handle mapping problems 2016-01-06 10:23:01 +08:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard ae1117338a set up devise authentication more srsly. Still doesn't pass the test though haha 2015-12-16 22:16:02 +08:00
Connor Turland 92ddbbaf4f remove metacode asset path migration 2015-12-11 18:10:53 -05:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard 1597665be5 merge develop with rails4 stuff 2015-12-07 13:58:42 +08:00
Devin Howard 67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Devin Howard d99ed6b627 migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made 2015-12-03 16:57:28 -05:00