Commit Graph

3 Commits (bc4f129849ebe6fcb0162935c4b088a6cd5459a1)

Author SHA1 Message Date
Marcin Kulik c4f40322ed Merge branch 'master' into comments
* master:
  Display asciicast author and creation time
  Claiming asciicasts
  User#add_user_token
  Asciicast.assign_user
  User tokens for assigning asciicasts to users
  Better styles + pagination

Conflicts:
	app/models/asciicast.rb
	db/schema.rb
	spec/factories/asciicasts.rb
	spec/factories/users.rb
13 years ago
Marcin Kulik 1ba9067551 User tokens for assigning asciicasts to users 13 years ago
Micha Wrobel 62849d150e Make asciicast factory valid 13 years ago