Devin Howard
dcd3cc6e78
fix some errors with controllers/serializers
2016-07-01 15:25:04 +08:00
Devin Howard
b72536853f
fix activemaps_path url bug ( #559 )
...
* fix activemaps_path url bug
* annoying doc updates
* skip policy scope if redirecting an explore page
* lol that would have been dumb
2016-06-20 08:32:39 +08:00
Devin Howard
6e1797183e
brakeman ( #556 )
...
* update rails to 4.2.5.1
* fix brakeman gem warning
* make brakeman happier and add it to travis
* install brakeman gem for static security analysis
* fix brakeman call in travis
2016-06-16 15:44:08 +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
Devin Howard
44ae6730a6
fix user search error
2016-04-21 00:30:11 -04:00
Devin Howard
837e4bde1b
fix map forking ( fix #540 )
2016-04-20 09:00:45 +08: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
a2fe1399e4
fix invite link
2016-03-29 22:34:47 +08:00
Connor Turland
8fa856451d
request invite page was broken
2016-03-27 12:04:28 -07:00
Devin Howard
ae9f4a51a2
fix a few embarassing errors - export is working
2016-03-26 15:53:14 +08: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
b36d5df6cb
this may make it work
2016-03-24 23:33:26 -07:00
Connor Turland
c6f1e3cc4a
breaking the mapping_policy
2016-03-24 23:29:08 -07:00
Connor Turland
415c9b8ac3
final touchups on oauth
2016-03-24 21:26:07 -07:00
Connor Turland
540b35c757
Merge branch 'feature/no-cancancan' into develop
2016-03-24 20:47:35 -07:00
Connor Turland
42eea78bc4
Merge branch 'fix/typo' into develop
2016-03-24 20:47:23 -07:00
Devin Howard
530a16cadb
instantiate_resource
2016-03-25 10:26:32 +08:00
Devin Howard
34d3a80db1
use new pundit-enabled snorlax
2016-03-25 10:07:57 +08:00
Connor Turland
14dfe3c926
styling for doorkeeper and api functional
2016-03-24 17:16:27 -07: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
8bd032472d
topic related things weren't working at all
2016-03-14 21:36:34 +11:00
Connor Turland
604087c592
Merge branch 'develop' into feature/realtime.video
2016-03-14 10:45:16 +11:00
Connor Turland
11e57c1b37
rebase onto develop which now has API and pundit
2016-03-13 10:36:38 +11:00
Connor Turland
efe13dc7c0
Merge branch 'develop' into feature/api
2016-03-12 21:30:27 +11:00
Connor Turland
f58185fd40
Merge branch 'feature/pundit' into develop
2016-03-12 21:26:06 +11:00
Connor Turland
446619c451
omg not having this was breaking things
2016-03-12 13:20:15 +11:00
Connor Turland
8b8db40c67
Merge branch 'feature/pundit' into feature/api
2016-03-12 12:59:42 +11:00
Connor Turland
a295c61322
json response was broken
2016-03-12 12:58:13 +11:00
Connor Turland
e4ac5b0134
Merge branch 'feature/pundit' into feature/api
2016-03-12 12:40:11 +11:00
Connor Turland
bf4fbbeb06
fix tokens
2016-03-12 12:26:23 +11:00
Devin Howard
bb03b49d80
update main controller (searching) to use policies
2016-03-12 09:09:41 +08:00
Connor Turland
521aa6b5d0
function no longer exists
2016-03-12 11:58:26 +11:00
Connor Turland
a78312f90c
Merge branch 'feature/pundit' into feature/api.pundit
2016-03-12 11:49:41 +11:00
Connor Turland
d0aecc0b31
pundit: make it work
2016-03-12 11:47:24 +11:00
Connor Turland
dc6ccd2022
pundit: fixing up topics and synapses
2016-03-12 11:47:05 +11:00
Connor Turland
1cf3182e75
pundit: exclude topic action
2016-03-12 11:46:52 +11:00
Connor Turland
5f3f5212c5
pundit: syntax error
2016-03-12 11:46:18 +11:00
Connor Turland
d8c328468e
changess for pundit
2016-03-12 11:45:39 +11:00
Connor Turland
cb79f2deae
pundit: make it work
2016-03-12 11:16:46 +11:00
Connor Turland
bef21341c6
pundit: fixing up topics and synapses
2016-03-12 11:10:30 +11:00
Connor Turland
09a7b336bf
pundit: exclude topic action
2016-03-12 10:13:22 +11:00
Connor Turland
0095a8daf4
pundit: syntax error
2016-03-12 10:06:00 +11:00
Connor Turland
fc1a7fd23d
api: adjust serializers
2016-03-12 10:05:42 +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
e6017c4129
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
2016-03-12 07:19:19 +11:00
Devin Howard
eb56755068
implement five policies into their controllers
2016-03-11 22:10:31 +08:00
