Torkel Ödegaard 6a2a6afc1d Merge branch 'develop' into apikey_hashed ...

Conflicts:
	pkg/api/apikey.go
	pkg/services/sqlstore/migrations.go

2015-02-26 15:48:54 +01:00

..

api

Merge branch 'develop' into apikey_hashed

2015-02-26 15:48:54 +01:00

bus

Worked on event system, needs a little more work

2015-02-04 15:37:26 +01:00

cmd

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

components

Began work on hashing api keys

2015-02-09 13:30:04 +01:00

events

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

log

CLI: Use colorized console output

2015-02-15 13:36:10 -07:00

middleware

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

models

Merge branch 'develop' into apikey_hashed

2015-02-26 15:48:54 +01:00

services

Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517

2015-02-26 15:43:48 +01:00

setting

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

social

Changed go package path

2015-02-05 10:37:13 +01:00

util

Worked on login remember cookie, and redirect after login

2015-01-27 12:05:23 +01:00