Connor Turland
|
8bd032472d
|
topic related things weren't working at all
|
2016-03-14 21:36:34 +11:00 |
|
Connor Turland
|
f24def8be6
|
fix up javascript errors
|
2016-03-14 21:36:16 +11:00 |
|
Connor Turland
|
10a5a099e7
|
Merge pull request #489 from metamaps/feature/fix-tests
fix tests
|
2016-03-14 18:17:25 +11:00 |
|
Devin Howard
|
5cb5eac9d6
|
Merge pull request #488 from metamaps/feature/no-cancan
no cancan
|
2016-03-14 14:44:35 +08:00 |
|
Devin Howard
|
a05c7dc5fe
|
avoid pundit error if no map specified with a mapping
|
2016-03-14 14:37:01 +08:00 |
|
Devin Howard
|
d11f3923dd
|
remove unused has_viewable_synapses function
|
2016-03-14 14:34:36 +08:00 |
|
Devin Howard
|
32326ff4af
|
update map/topic delete action test
|
2016-03-14 11:47:01 +08:00 |
|
Devin Howard
|
7716462c8f
|
fix topics controller test
|
2016-03-14 11:47:01 +08:00 |
|
Devin Howard
|
ee0ca3ba35
|
Merge pull request #487 from metamaps/feature/pundit
policy specs & remove old permission tests
|
2016-03-14 11:46:09 +08:00 |
|
Devin Howard
|
f7201e048e
|
pending mapping policy
|
2016-03-14 11:15:10 +08:00 |
|
Devin Howard
|
3823c708fd
|
update mapping policy
|
2016-03-14 11:09:27 +08:00 |
|
Devin Howard
|
c5009952f3
|
remove permissions tests
|
2016-03-14 11:03:30 +08:00 |
|
Devin Howard
|
dbb8052a17
|
trifecta of policy tests
|
2016-03-14 11:01:29 +08:00 |
|
Devin Howard
|
88c070cbbd
|
no cancan
|
2016-03-14 10:55:26 +08:00 |
|
Connor Turland
|
8664cc0bd9
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 11:11:11 +11:00 |
|
Connor Turland
|
579c36ec75
|
ensure the search box opens
|
2016-03-14 11:10:18 +11:00 |
|
Connor Turland
|
6715ba7e7f
|
not a function
|
2016-03-14 11:03:11 +11:00 |
|
Connor Turland
|
604087c592
|
Merge branch 'develop' into feature/realtime.video
|
2016-03-14 10:45:16 +11:00 |
|
Connor Turland
|
6f5258cbb7
|
needed a policy for tokens
|
2016-03-14 08:19:26 +11:00 |
|
Connor Turland
|
b40fedda1a
|
Merge pull request #483 from harlantwood/travis
Run tests on Travis CI; show build status badge
|
2016-03-14 07:54:20 +11:00 |
|
Connor Turland
|
e0b2991596
|
Merge pull request #484 from harlantwood/token-entropy
more token entropy
|
2016-03-14 07:51:37 +11:00 |
|
Harlan T Wood
|
f3eb558971
|
fix test regex
|
2016-03-13 13:28:07 -07:00 |
|
Harlan T Wood
|
3fbb3d1dc9
|
more token entropy
|
2016-03-13 00:56:10 -08:00 |
|
Harlan T Wood
|
74cf9ba717
|
Run tests on Travis CI; show build status badge
|
2016-03-12 19:40:56 -08:00 |
|
Connor Turland
|
4f76d3914d
|
Merge pull request #418 from metamaps/feature/slack
first 2 slack events
|
2016-03-13 12:00:17 +11: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
|
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
|
5fbf7ac34d
|
hide metamaps_mobile in gitignore
|
2016-03-13 03:16:31 +11:00 |
|
Connor Turland
|
b236f4c689
|
handle not logged in scenarios
|
2016-03-13 02:41:32 +11:00 |
|
Connor Turland
|
7ff24fb3b6
|
Merge pull request #481 from metamaps/feature/api
quietly release a token based metamaps api just for maps, topics, synapses, and mappings
|
2016-03-13 02:29:44 +11:00 |
|
Connor Turland
|
3aec00e07c
|
just don't include mappable for now
|
2016-03-13 02:28:39 +11:00 |
|
Connor Turland
|
f072e39c4c
|
pundit: sometimes no user
|
2016-03-13 02:27:05 +11:00 |
|
Connor Turland
|
ada29c6832
|
cleanup
|
2016-03-12 21:35:56 +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 |
|
Devin Howard
|
7e7ef173e5
|
map policy spec
|
2016-03-12 09:27:31 +08: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
|
7f86810f62
|
remove things again not needed
|
2016-03-12 11:53:12 +11:00 |
|
Connor Turland
|
a78312f90c
|
Merge branch 'feature/pundit' into feature/api.pundit
|
2016-03-12 11:49:41 +11:00 |
|
Connor Turland
|
bc505a1361
|
pundit: now updating maps actually works
|
2016-03-12 11:47:40 +11:00 |
|
Connor Turland
|
5d179ae5ec
|
pundit: policy didn't exist
|
2016-03-12 11:47:32 +11:00 |
|