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

246 commits

Author SHA1 Message Date
Devin Howard 40bd9ed95a refactor maps controller a bit 2016-09-25 23:25:37 +08:00
Devin Howard 20bd959c69 fix models that rubocop broke >:( 2016-09-24 13:02:53 +08:00
Devin Howard 0ace202ace automatic rubocop updates 2016-09-24 11:00:46 +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 9070bfc836 use a subset of the simplest metacodes for new users (#633) 
* use a subset of the simplest ones for new users

* Update user_preference.rb

* Update user_preference.rb
 2016-09-09 20:36:49 -04:00
Devin Howard 3e38fba215 remove relatives1 and relatives2 2016-09-05 11:55:19 +08:00
Devin Howard e761e1693c use Topic.relatives scope to get all relatives 2016-09-05 11:52:35 +08:00
Connor Turland 7de89cfa0f shouldn't reference relatives that are connected in private ways 2016-09-02 12:37:01 -04:00
Connor Turland 549c086af4 styleee (#620) 2016-08-31 18:57:19 -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 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 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
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
Connor Turland a82b0048d8 don't need sequenced 2016-03-27 00:14:22 -07:00
Devin Howard d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Devin Howard ea677f8a6b DRY up csv/xls rendering, put it into model 2016-03-25 16:48:14 +08:00
Devin Howard 8f532708ce update xls/csv format to better serialize topics and synapses 2016-03-25 16:47:35 +08:00
Devin Howard 61262aaec2 implement csv/xls export 2016-03-25 16:47:35 +08:00
Devin Howard 6c055ea3b9 add missing synapses_csv function (fixes #504) 2016-03-25 16:36:05 +08:00
Connor Turland c4890274f2 switch messages to use pundit 2016-03-23 16:29:26 -07:00
Connor Turland 1ee33b843f Merge branch 'develop' into feature/realtime.video 2016-03-14 21:40:25 +11:00
Connor Turland 3e24a088da Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2016-03-14 21:36:57 +11:00
Connor Turland 8bd032472d topic related things weren't working at all 2016-03-14 21:36:34 +11:00
Devin Howard d11f3923dd remove unused has_viewable_synapses function 2016-03-14 14:34:36 +08:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Harlan T Wood 3fbb3d1dc9 more token entropy 2016-03-13 00:56:10 -08:00
Connor Turland 72b2e8f8f2 doesn't look good for now, take it out, add it later 2016-03-13 11:58:09 +11:00
Connor Turland 77d69dd2a3 turns out we do need delayed_job 2016-03-13 11:56:18 +11:00
Connor Turland 11e57c1b37 rebase onto develop which now has API and pundit 2016-03-13 10:36:38 +11:00
Connor Turland 7f86810f62 remove things again not needed 2016-03-12 11:53:12 +11:00
Connor Turland bef21341c6 pundit: fixing up topics and synapses 2016-03-12 11:10:30 +11:00
Connor Turland 450db5eb8d changes for pundit 2016-03-12 09:37:32 +11:00
Connor Turland 669b337d04 changes for api 2016-03-12 09:37:18 +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 b385efafa9 don't need xloc or yloc for Synapse mappings 2016-02-21 17:25:39 +08:00
Devin Howard f9bcd33344 update synapses specs; all specs pass again. all models/controllers tested 2016-02-09 14:25:39 +08:00
Devin Howard 7f50db1ae9 ok metacode spec done 2016-02-09 13:30:49 +08:00
Devin Howard 43bdda61de maps controller spec passes, 3 pending 2016-02-09 11:48:07 +08:00
Devin Howard e460899ea3 testing simplecov and rcov stuff 2016-02-08 11:19:39 +08:00
Devin Howard cc99ed001d fix mapping_controller_spec.rb 2016-02-08 11:19:38 +08:00
Devin Howard fa3a725df9 mapping spec 2016-02-08 11:19:37 +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
Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video 2016-02-05 16:27:43 +08:00
Devin Howard f2cbde50ca dos2unix on the whole repo 2016-02-05 11:43:15 +08:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard 4469b29ec2 in user model 2016-01-07 15:32:19 +08:00
Devin Howard bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard 888edae6f6 finish remove asset_path_icon whoops 2015-12-20 22:28:05 +08:00
Devin Howard 96ec672779 Merge branch 'develop' into feature/rspec-tests 2015-12-20 22:24:39 +08:00
Devin Howard df485002b1 remove redundant asset_path_icon function 2015-12-20 22:22:01 +08:00
Devin Howard c4be57e525 topic and synapse validate permission 2015-12-18 09:25:54 +08:00
Devin Howard 006acac6b5 remove redundant authorize_to_view function 2015-12-17 23:20:19 +08:00
Devin Howard d5f66487b7 update map spec - add authorize_to_delete. TODO: add other map authorize specs 2015-12-17 09:44:48 +08:00
Devin Howard 9e4a7b821f cleanup topic model a bit 2015-12-17 09:34:49 +08:00
Devin Howard 696bac17e6 map spec 2015-12-17 09:16:02 +08:00
Devin Howard 2525a6fb65 add permission service, refactor map model a bit, add validations 2015-12-17 09:10:52 +08:00
Devin Howard bfd4e4f228 add permission service, add validations to map.rb 2015-12-17 09:03:51 +08: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
Devin Howard b2aa2074a7 update generation calcuation code, incl. fix user signup bug 2015-12-15 12:33:22 +08:00
Connor Turland 3c9d722945 accept or reject video offers 2015-12-11 17:29:17 -05:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard b037c84f15 fix small error in user model 
need to use the parent's generation to calculate generation!
 2015-12-07 11:44:08 +08:00
Devin Howard 7336c262e3 fix up user model json output function 2015-12-03 16:58:21 -05:00
Devin Howard 4139c2c84a syntax error 2015-12-03 16:57:30 -05:00
Devin Howard 67d4a2aa34 sandi metz function simplification 2015-12-03 16:57:30 -05:00
Devin Howard 3674aefb04 remove secrets.yml stuff because it doesn't work with heroku 2015-12-03 16:57:29 -05:00
Devin Howard ede4e7a509 fix references to Rails.application.secrets 2015-12-03 16:57:28 -05:00
Devin Howard 570fa931b7 use secrets.yml to allow overriding config variables 2015-12-03 16:57:28 -05:00
Connor Turland d8da2d93fd updated files to use amazon assets 2015-12-03 16:57:28 -05:00
Devin Howard 2cbf1cad7f fix 2015-12-03 16:57:28 -05:00
Devin Howard 4b6e33f983 does this fix missing-map.png? 2015-12-03 16:57:28 -05:00
Devin Howard 204544dc22 metacode asset_path calls 2015-12-03 16:57:28 -05:00
Devin Howard 4245703084 see if we can make missing-map.png show up 2015-12-03 16:57:27 -05:00
Devin Howard 89424dcd7f try to fix custom metacode icon path 2015-12-03 16:57:27 -05:00
Devin Howard f63a242256 whoops again 2015-12-03 16:57:27 -05:00
Devin Howard 684dcd8d33 only run metacode.icon through asset_path if the path doesn't start with http 2015-12-03 16:57:27 -05:00
Devin Howard bdb5623a02 woot fix metacodes 2015-12-03 16:57:27 -05:00
Devin Howard 52b37e7ac6 asset_path in css erb files 2015-12-03 16:57:26 -05:00
Devin Howard b9ac614057 asset_path doesn't work in models 2015-12-03 16:57:26 -05:00
Devin Howard cef83e1f3d asset_path 2015-12-03 16:57:26 -05:00
Devin Howard 5dc53543f7 migrate to polymorphic mappings - DB MIGRATION 2015-12-03 16:57:24 -05:00
Devin Howard e5c83a2a0c dependent destroy models for topics/maps/synapses on mappings 2015-12-03 16:57:23 -05:00
Devin Howard 2369c9ce5e select metacodes with one query instead of n queries, move logic to application_helper 2015-12-03 16:57:23 -05:00
Devin Howard 7d738b7abf fix map/mapping associations that I broke 2015-12-03 16:57:22 -05:00
Devin Howard 32311e3610 fix has_many relationships in map & mapping models for rails 4 2015-12-03 16:57:22 -05:00
Devin Howard 371851cb89 remove attr_accessible 2015-12-03 16:57:22 -05:00
Devin Howard 3aaf501b03 fix up user model json output function 2015-11-28 21:51:28 +08:00
Devin Howard fe0d38ec67 syntax error 2015-11-07 01:34:08 +08:00
Devin Howard fa017a8559 sandi metz function simplification 2015-11-06 17:08:42 +08:00
Devin Howard 6487202e6f remove secrets.yml stuff because it doesn't work with heroku 2015-10-30 14:30:24 +08:00
Devin Howard e2a8e0331d fix references to Rails.application.secrets 2015-10-30 14:18:50 +08:00
Devin Howard 8e1ae0a1fc use secrets.yml to allow overriding config variables 2015-10-29 16:23:41 +08:00
Connor Turland 6e79b58e16 updated files to use amazon assets 2015-10-27 21:46:07 -07:00
Devin Howard eea2bf30df fix 2015-10-27 18:16:35 +08:00