Commit Graph

4 Commits

Author SHA1 Message Date
Marcin Kulik
0e535b4d43 Integration tests for player page 2012-11-19 00:19:42 +01:00
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
2012-03-04 21:14:35 +01:00
Marcin Kulik
1ba9067551 User tokens for assigning asciicasts to users 2012-03-04 18:14:58 +01:00
Micha Wrobel
62849d150e Make asciicast factory valid 2012-03-04 13:50:17 +01:00