Commit Graph

143 Commits

Author SHA1 Message Date
Marcin Kulik
149e687f38 Bring back missing user->comments assoc 2012-04-09 17:04:58 +02:00
Marcin Kulik
c4b5b16e6f Merge branch 'likes'
* likes:
  Data model for "Like"

Conflicts:
	app/models/user.rb
	db/schema.rb
2012-04-09 17:03:50 +02:00
Marcin Kulik
45dd308186 Display comments count 2012-04-09 16:46:08 +02:00
Marcin Kulik
4a6186f523 Account settings 2012-04-09 15:47:33 +02:00
Marcin Kulik
b6473b8554 user->comments association 2012-04-06 22:58:44 +02:00
Marcin Kulik
49c0d9f324 Move presentation to decorator 2012-04-06 21:51:05 +02:00
Marcin Kulik
0cbd732980 Data model for "Like" 2012-04-06 14:06:40 +02:00
Marcin Kulik
8b504d8fea Use asciicast title in page title 2012-04-05 21:35:21 +02:00
Marcin Kulik
1e2e8bfcc3 Display some environment info 2012-04-04 18:41:17 +02:00
Marcin Kulik
8a9fc6fa89 Editing of title/description 2012-04-03 20:47:59 +02:00
Marcin Kulik
69576f1a0d Display ~username from asciicast if no profile assigned 2012-04-03 19:06:05 +02:00
Marcin Kulik
b68e02212d Featured asciicasts 2012-03-11 15:29:31 +01:00
Marcin Kulik
4b6ed33158 Description field for Asciicast 2012-03-11 14:44:01 +01:00
Marcin Kulik
71f8fed196 Fix line length 2012-03-11 09:23:29 +01:00
Marcin Kulik
61b3890a3d Merge remote-tracking branch 'origin/unique-nickname'
* origin/unique-nickname:
  Keep sensitive signup data in session
  Add users factory back
  rm users factories
  Add view spec for users#new
  Add specs to user#create
  Validate nickname uniquness

Conflicts:
	Gemfile
	Gemfile.lock
2012-03-10 18:30:33 +01:00
Marcin Kulik
3f798ab7aa Check code style with cane and tailor 2012-03-08 15:00:10 +01:00
Micha Wrobel
fc53b71ee2 Validate nickname uniquness 2012-03-06 22:39:16 +01:00
Marcin Kulik
a4014b2012 attr_accessible list for Asciicast (closes #50) 2012-03-06 22:10:58 +01:00
Marcin Kulik
51dfa8474f Profile paths: ~sickill 2012-03-04 23:07:45 +01:00
Marcin Kulik
44d6914991 :dependent => :destroy for Asciicast#comments 2012-03-04 21:55:45 +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
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