Commit graph

3 commits

Author SHA1 Message Date
Sacha Greif
50fc3eb11a Merge branch 'namespace' of https://github.com/TelescopeJS/Telescope into namespace
# Conflicts:
#	lib/users.js
#	packages/telescope-base/lib/base.js
#	packages/telescope-base/package.js
#	packages/telescope-lib
2015-04-20 13:57:37 +09:00
Anthony Mayer
df7c892e58 Fixing nav tests and cleanup.
Turning velocity back on and adding relevant packages to .meteor/versions
2015-01-07 08:22:58 +01:00
Anthony Mayer
f9d9891fba Getting rid of redundant permissions functions
Switched everything over to use can.* functions from telescope-lib instead of using can* functions from lib/permissions.js, deleted lib/permissions.js, added some tests for permissions, and some other random cleanup like deleting unused code.

Conflicts:
	client/views/comments/comment_form.js
2015-01-07 08:22:46 +01:00