Commit graph

76 commits

Author SHA1 Message Date
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
Devin Howard d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Devin Howard 14bdc8546b metacodes#show routes 2016-03-26 10:12:32 +08: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 e6017c4129 Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit 2016-03-12 07:19:19 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Devin Howard 8ef847bd6d factor maps#index into 4 separate functions 2016-02-28 12:30:41 +08:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Connor Turland dcbe24bb7e getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-12-03 16:57:30 -05:00
Devin Howard 50d9866939 fix problem with join route 2015-12-03 16:57:23 -05:00
Devin Howard 61159dc44c remove match method from routes.rb 2015-12-03 16:57:22 -05:00
Connor Turland 1bbaa47b80 getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-11-07 01:33:18 +08:00
Devin Howard 1fbd16ac95 fix problem with join route 2015-09-19 20:46:10 +08:00
Devin Howard 7a73f3bc07 remove match method from routes.rb 2015-09-10 22:06:58 +08:00
Connor Turland d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -05:00
Connor Turland 951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -05:00
Connor Turland 8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland 44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -05:00
Connor Turland ee1ca7853f removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner 2014-11-03 08:46:22 -05:00
Connor Turland cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00
Devin Howard c5601686c2 actually commented sidekiq route 2014-10-07 19:01:41 -04:00
Devin Howard f7f17a2908 added sidekiq gem and a route to /sidekiq (commented) for devel 2014-10-07 19:00:55 -04:00
Connor Turland 629a6a4172 fixed sign in redirects 2014-10-07 17:46:09 -04:00
Connor Turland 6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland 6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Connor Turland e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -04:00
Connor Turland 3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland e702f7023f renamed application to not be ISSAD, now Metamaps 2014-07-30 01:24:20 -04:00
Connor Turland ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland e67a520a24 added EsC key to cancel search 2014-06-11 19:18:59 -04:00
Connor Turland a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland 48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Connor Turland 8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
Connor Turland 5181c91aa7 restyled PAQ and Request pages. 2014-02-09 23:36:23 -05:00
Connor Turland 1c49a805bd removed more old files, styled request invite page 2014-02-07 18:13:51 -05:00
Connor Turland 2045220622 styled lightboxes further, changed FAQ to PAQ 2014-02-07 17:25:02 -05:00
Connor Turland ae46c27bec started styling map forms 2014-02-05 12:37:21 -05:00
Connor Turland 6a63b1fe47 removed assets 2014-02-04 22:03:24 -05:00
Connor Turland fdcee3ae40 synapse autocomplete working 2014-02-04 20:28:06 -05:00
Connor Turland 414e59e280 this is a lot of changes. too many to say here, oops 2014-01-28 22:46:58 -05:00
Connor Turland 41044140b7 added completely new logging in system 2013-07-10 14:02:38 -04:00
Connor Turland f657a61327 added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card 2013-04-26 00:07:29 -04:00
Devin Howard 101f49b9e6 added mapping_controller and routes, but only implemented create 2013-02-28 19:56:27 -05:00