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
|
66db199aab
|
Display asciicast author and creation time
|
2012-03-04 20:59:53 +01:00 |
|
Micha Wrobel
|
a2d1b1a15f
|
Simplify comments_index.js
|
2012-03-04 16:13:01 +01:00 |
|
Marcin Kulik
|
b7807c3f0d
|
Better styles + pagination
|
2012-03-04 15:18:09 +01:00 |
|
Micha Wrobel
|
712410a3e7
|
Remove not used leavings
|
2012-03-04 13:51:53 +01:00 |
|
Micha Wrobel
|
e7f5f57424
|
Some refactoring, and make possible to remove own comments
|
2012-03-04 13:50:56 +01:00 |
|
Micha Wrobel
|
5201b3f768
|
Initial implementation of comments - in progress
|
2012-03-04 13:50:56 +01:00 |
|
Marcin Kulik
|
b3e8fbb7df
|
Load asciicast data via ajax
|
2012-03-03 18:38:11 +01:00 |
|
Marcin Kulik
|
145e66ca18
|
Refactoring time!!
|
2012-02-04 20:09:44 +01:00 |
|
Marcin Kulik
|
00f2ee5a41
|
Display asciicast title in heading
|
2012-01-15 15:11:37 +01:00 |
|
Marcin Kulik
|
140cc1c0fc
|
Asciicasts#show (available at /:id)
|
2011-11-27 13:54:10 +01:00 |
|