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
|
9e59b19c16
|
Claiming asciicasts
|
2012-03-04 20:30:26 +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 |
|
Micha Wrobel
|
33651dbe95
|
Add uid sequence
|
2012-03-04 13:50:16 +01:00 |
|
Micha Wrobel
|
70cf1bdc3b
|
Add comment resource
|
2012-03-04 13:50:16 +01:00 |
|
Micha Wrobel
|
d4f127508f
|
Add nickname column to users
|
2012-02-26 20:11:09 +01:00 |
|
Micha Wrobel
|
0768209393
|
Set not validated attributes to nil
|
2012-02-26 19:33:25 +01:00 |
|
Micha Wrobel
|
0190c3f049
|
Add avatar_url column, modify migration file
|
2012-02-26 17:55:19 +01:00 |
|
Micha Wrobel
|
f59841abaf
|
Add user model, and .create_with_omniauth method
|
2012-02-25 17:43:10 +01:00 |
|
Marcin Kulik
|
c5de80788a
|
Asciicast model
|
2011-11-23 22:31:00 +01:00 |
|