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
|
0de5784e68
|
User#add_user_token
|
2012-03-04 20:29:19 +01:00 |
|
Marcin Kulik
|
9f51211bc1
|
Asciicast.assign_user
|
2012-03-04 20:28:30 +01:00 |
|
Marcin Kulik
|
1ba9067551
|
User tokens for assigning asciicasts to users
|
2012-03-04 18:14:58 +01:00 |
|
Marcin Kulik
|
b7807c3f0d
|
Better styles + pagination
|
2012-03-04 15:18:09 +01:00 |
|
Micha Wrobel
|
706460e71b
|
Show time ago in comments
|
2012-03-04 13:50:57 +01:00 |
|
Micha Wrobel
|
e7f5f57424
|
Some refactoring, and make possible to remove own comments
|
2012-03-04 13:50:56 +01:00 |
|
Micha Wrobel
|
9094b8b0b6
|
Override as_json to include more data
|
2012-03-04 13:50:17 +01:00 |
|
Micha Wrobel
|
e66ad8b5ed
|
Add comments association
|
2012-03-04 13:50:16 +01:00 |
|
Micha Wrobel
|
877a59b365
|
Protect from mass assignment
|
2012-03-04 13:50:16 +01:00 |
|
Micha Wrobel
|
70cf1bdc3b
|
Add comment resource
|
2012-03-04 13:50:16 +01:00 |
|
Marcin Kulik
|
1062aa3d01
|
Decompress bzip data in the browser
|
2012-03-03 19:43:38 +01:00 |
|
Marcin Kulik
|
b3e8fbb7df
|
Load asciicast data via ajax
|
2012-03-03 18:38:11 +01:00 |
|
Micha Wrobel
|
d4f127508f
|
Add nickname column to users
|
2012-02-26 20:11:09 +01:00 |
|
Micha Wrobel
|
0190c3f049
|
Add avatar_url column, modify migration file
|
2012-02-26 17:55:19 +01:00 |
|
Micha Wrobel
|
c374f43f5e
|
fix key name, and remove unsupported email
|
2012-02-25 23:42:44 +01:00 |
|
Micha Wrobel
|
f59841abaf
|
Add user model, and .create_with_omniauth method
|
2012-02-25 17:43:10 +01:00 |
|
Marcin Kulik
|
268d4b1660
|
Asciicast#meta=
|
2012-01-14 21:26:07 +01:00 |
|
Marcin Kulik
|
99a47393ab
|
Validate presence of stdout/stdout_timing
|
2011-11-23 23:22:14 +01:00 |
|
Marcin Kulik
|
73b2c07e1b
|
stdin/stdout as mounted Carrierwave uploader
|
2011-11-23 22:44:00 +01:00 |
|
Marcin Kulik
|
f35902ad31
|
rm .gitkeep
|
2011-11-23 22:32:24 +01:00 |
|
Marcin Kulik
|
c5de80788a
|
Asciicast model
|
2011-11-23 22:31:00 +01:00 |
|
Marcin Kulik
|
89a29aadd2
|
Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7
|
2011-11-21 22:36:42 +01:00 |
|