Commit graph

93 commits

Author SHA1 Message Date
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
Devin Howard
96f5e6ac35 add asset_path calls 2015-12-03 16:57:26 -05:00
Devin Howard
d3080906b1 add db migration to remove asset paths from metacodes 2015-12-03 16:57:26 -05:00
Devin Howard
d52caac1d6 add indexes to schema 2015-12-03 16:57:26 -05:00
Devin Howard
3f5404b043 add missing indexes for speed 2015-12-03 16:57:25 -05:00
Devin Howard
53d77a0e5b fix migration for heroku 2015-12-03 16:57:25 -05:00
Devin Howard
5dc53543f7 migrate to polymorphic mappings - DB MIGRATION 2015-12-03 16:57:24 -05:00
Devin Howard
fa017a8559 sandi metz function simplification 2015-11-06 17:08:42 +08:00
Devin Howard
ddce6ad95c migrate metacodes that started with /assets/icons to use amazonaws urls. Remove last migration I made 2015-10-28 14:24:52 +08:00
Devin Howard
5c813beafe merge 2015-10-27 18:20:12 +08:00
Devin Howard
fcd866c05e add asset_path calls 2015-10-25 16:50:07 +08:00
Devin Howard
9de4492f04 add db migration to remove asset paths from metacodes 2015-10-25 16:37:45 +08:00
Devin Howard
e572389c49 add indexes to schema 2015-10-23 23:22:54 +08:00
Devin Howard
e078b59503 add missing indexes for speed 2015-10-23 22:38:42 +08:00
Devin Howard
582ef63635 fix migration for heroku 2015-10-23 22:32:09 +08:00
Devin Howard
053f035d31 move fixtures to seeds.rb 2015-10-12 11:22:55 +08:00
Devin Howard
69f4b8c645 migrate to polymorphic mappings - DB MIGRATION 2015-10-02 16:22:16 +08:00
Connor Turland
a9e488d9cb NOTE: rake db:migrate required. added generation column to users 2014-11-21 16:50:42 -05:00