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

2229 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Howard a176cdf231 eslint frontend folder (#923) 2016-11-07 15:25:08 -05:00
Devin Howard 9df974a037 strip whitespace from search terms (#919) 2016-11-07 14:58:53 -05:00
Devin Howard bd4072f81c Merge pull request #707 from metamaps/feature/split-out-backbone 
finish removing global Metamaps references from frontend code
 2016-11-07 14:58:20 -05:00
Devin Howard 6a2646c9cd fix mailer specs (#921) 2016-11-07 14:56:35 -05:00
Devin Howard 2f4fe525ce Fix a bunch of errors and style issues 2016-11-07 14:55:20 -05:00
Devin Howard 518782e1c7 remove Metamaps.Erb 2016-11-07 14:55:20 -05:00
Devin Howard 7c9b6a2205 try to move all rails data into Metamaps.ServerData 
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
 2016-11-07 14:55:20 -05:00
Devin Howard 8026969799 start storing data in ServerData 2016-11-07 14:55:17 -05:00
Devin Howard 4b500a4428 move Metamaps.Loading into node modules 2016-11-07 14:40:43 -05:00
Devin Howard 0778179ba7 eslint 2016-11-07 14:40:43 -05:00
Devin Howard bfd23c6d32 split Backbone.js into a bunch of different files. Still more work to do to modularize it 2016-11-07 14:40:43 -05:00
Devin Howard 9cb3074245 rename Metamaps.Backbone to Metamaps.DataModel 2016-11-07 14:40:43 -05:00
Devin Howard e4d193572f fix mailer specs 2016-11-07 14:40:25 -05:00
Connor Turland 0f85abfda2 add channel to webhooks (#915) 2016-11-05 09:34:50 -07:00
Connor Turland 887c3f7570 fixes #903 and #831 (#911) 2016-11-04 15:02:56 -07:00
Connor Turland 667f5653a7 topic descriptions from old data can be nil 2016-11-04 21:03:11 +00:00
Connor Turland 48b93b2269 change grant to allow. fixes #909 (#910) 2016-11-04 13:22:06 -07:00
Connor Turland 9ad4684825 firefox needs e.pageX not e.x (#906) 2016-11-02 19:20:06 -07:00
Devin Howard f516e1e73d fix up deploy docs 2016-11-01 16:31:36 +08:00
Devin Howard 2588636837 tag v3.0.1 - bugfixes for 3.0 2016-11-01 16:06:05 +08:00
Devin Howard 644df6fcdc fix pasting urls (#901) 2016-11-01 16:01:34 +08:00
Devin Howard c10a4f4837 fix exception notification backtrace (#898) 2016-11-01 10:05:45 +08:00
Devin Howard 304722b528 fix api docs (#897) 
* fix api docs

* more rake => rails
 2016-11-01 09:52:10 +08:00
Devin Howard a9c67e70d4 move webhook and event serializers back (#899) 2016-11-01 09:46:44 +08:00
Connor Turland ed3e4780d2 bug when topic was in more than 5 maps fixes #891 (#894) 2016-10-31 17:10:44 -04:00
Connor Turland b013499c76 misnamed variable errors out maps search (#893) 2016-10-31 16:41:37 -04:00
Devin Howard 5270c5a611 Merge branch 'develop' for v3.0 2016-10-31 19:51:02 +08:00
Devin Howard 5cfa8ffdc7 bump version to 3.0 2016-10-31 19:48:07 +08:00
Devin Howard 814c1acc0f a few markdown style updates (#885) 
* markdown block padding

* a few more markdown style updates
 2016-10-31 15:38:16 +08:00
Devin Howard 62e2acdd52 add about lightbox again (#884) 
* add about lightbox again

* fix about lightbox style
 2016-10-31 15:38:09 +08:00
Connor Turland 151e96f803 Metamaps.Realtime.synapseRemoved is not a function (#880) 2016-10-29 12:10:13 -04:00
Devin Howard bc1f212c93 fix tab/shift-tab for metacode selection (#879) 2016-10-30 00:08:51 +08:00
Devin Howard b9190233b1 enable sucker punch for heroku (#878) 2016-10-29 23:38:17 +08:00
Devin Howard 5e0e44b436 supercharge the schemas (#874) 
* fix map schema - woot it works

* update other schemas to include embeddable attrs

* update current user schema/examples
 2016-10-29 22:58:31 +08:00
Devin Howard 1fbfd56d57 filter maps by user_id in api (#872) 
* filter maps by user_id in api

* test user_id map filter

* update starred maps example to make starred true lol

* add user id to map schema/examples
 2016-10-29 22:07:27 +08: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
Connor Turland 6cc827d11c wasn't updating calculated_permission when updating permission (#869) 2016-10-28 18:26:40 -04:00
Devin Howard de16420796 fix logCanvasAttributes error (#863) 2016-10-28 15:20:39 +08:00
Devin Howard e49e5c258a make synapse permissions depend on topic1 and topic2 (#839) 
* deep change to synapse policy - is this ok?

* make synapse policy resilient to nil topic1/topic2/map

* use a transaction to handle authorization vs invalid record in synapse controller

* more synapse controller tests

* inline documentation

* fix policy(Synapse).create?
 2016-10-28 11:03:59 +08:00
Devin Howard 4dc32d7d2e fix metacodes page scrolling (#862) 
* fix metacodes page scrolling

use scheme from
http://brandonhilkert.com/blog/page-specific-javascript-in-rails/

* switch overflow:hidden to be on explicit controllers
 2016-10-28 10:55:04 +08:00
Devin Howard 9d821c920b reorder API authentication precedence to be: token, oauth, cookie (#860) 
* reorder authentication to be: token, then oauth, then cookie

* all APIs but tokens are accessible anonymously (so add mappings to the list)

* fix mapping order
 2016-10-28 10:51:58 +08:00
Devin Howard 6b1220b533 overflow-y: hidden on body to prevent openLightbox from showing a scrollbar (#859) 2016-10-27 18:40:42 -04:00
Devin Howard 4f3d12d7a5 fix import promises (#858) 2016-10-27 14:03:18 +08:00
Devin Howard 7b4a072fd8 attempt to fix import problems (#852) 2016-10-26 20:34:22 +08:00
Devin Howard 175a3ee73e policy_scope on has_many relationships in serializers (#840) 
* token overrides current user in api

* policy scope has_many relationships

* fix hard coded topics - whoops

* handle policy_scope returning nil in application serializer
 2016-10-26 19:56:30 +08:00
Devin Howard b13587456d fix coordsToPixels calls even more 2016-10-26 19:11:40 +08:00
Devin Howard f023a18069 fix pixel stuff for real? (#851) 
* fix getPastelColor function (I think)

* fix pixelsToCoords and coordsToPixels function calls

* update signature of coord/pixel functions in Util.spec.js
 2016-10-26 19:04:00 +08:00
Devin Howard e640048386 fix topic card title word break css (#844) 2016-10-26 17:01:05 +08:00
Devin Howard 98725b3ee4 fix getPastelColor function (I think) (#850) 
* fix getPastelColor function (I think)

* fix pixelsToCoords and coordsToPixels function calls

* update signature of coord/pixel functions in Util.spec.js
 2016-10-26 14:26:48 +08:00
Devin Howard 8a95262f2c allow anonymous users to GET api routes (#842) 
* make map methods use ActiveRecord relations so they don't error on pundit

* test for logged out maps GET api

* open up GET routes on maps/topics/synapses and update api docs
 2016-10-26 08:37:23 +08:00