Commit Graph

511 Commits

Author SHA1 Message Date
Marcin Kulik
ad9542d124 Store files in tmp in specs 2012-03-04 21:54:31 +01:00
Marcin Kulik
383db80bfd Schema change 2012-03-04 21:33:44 +01:00
Marcin Kulik
ebf0383e99 Fix comment routes 2012-03-04 21:26:22 +01:00
Marcin Kulik
edb4bb3b97 NOT NULL for comment columns 2012-03-04 21:15:27 +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
66db199aab Display asciicast author and creation time 2012-03-04 20:59:53 +01:00
Marcin Kulik
9e59b19c16 Claiming asciicasts 2012-03-04 20:30:26 +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
Micha Wrobel
5ad02c8610 Remove wrong route 2012-03-04 16:48:24 +01:00
Micha Wrobel
a2d1b1a15f Simplify comments_index.js 2012-03-04 16:13:01 +01:00
Micha Wrobel
ea62987c06 Fix typo 2012-03-04 15:54:25 +01:00
Micha Wrobel
5d52be2bae Add Forbiden Exception and refactor existing actions 2012-03-04 15:26:05 +01:00
Marcin Kulik
b7807c3f0d Better styles + pagination 2012-03-04 15:18:09 +01:00
Micha Wrobel
4f47f0a7fc Add specs for destroy 2012-03-04 14:37:30 +01:00
Micha Wrobel
e7567848d3 Url is defined after initialization 2012-03-04 13:54:42 +01:00
Micha Wrobel
712410a3e7 Remove not used leavings 2012-03-04 13:51:53 +01:00
Micha Wrobel
706460e71b Show time ago in comments 2012-03-04 13:50:57 +01:00
Micha Wrobel
293e67ed86 No should in specs 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
9a190cf474 Don't show comment form if user not logged in 2012-03-04 13:50:56 +01:00
Micha Wrobel
d296d69aa3 Add information about current_user 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
Micha Wrobel
9094b8b0b6 Override as_json to include more data 2012-03-04 13:50:17 +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
e66ad8b5ed Add comments association 2012-03-04 13:50:16 +01:00
Micha Wrobel
eb4d131fc5 Add handerlbars_assets gem 2012-03-04 13:50:16 +01:00
Micha Wrobel
0c62dc51b3 Don't include model name in json response 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
cc6fd9eb2a Remove posibility to update comment 2012-03-04 13:50:16 +01:00
Micha Wrobel
70cf1bdc3b Add comment resource 2012-03-04 13:50:16 +01:00
Marcin Kulik
58092ae50e Let's have separate page for login buttons
This way we can link to login page from comments section
if user is not authenticated
2012-03-04 11:33:11 +01:00
Marcin Kulik
c260307028 Bring back bzip2-ruby 2012-03-04 00:26:22 +01:00
Marcin Kulik
285f9934ab Google analytics 2012-03-04 00:23:36 +01:00
Marcin Kulik
f3c80398cb Clicking on term view toggles playback 2012-03-04 00:10:14 +01:00
Marcin Kulik
755efc09d1 Format time as mm:ss 2012-03-03 23:58:45 +01:00
Marcin Kulik
aa3c28701d Pausing + time display 2012-03-03 23:50:18 +01:00
Marcin Kulik
5e05b0d1cb Fix carriageReturn use 2012-03-03 19:45:52 +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
Marcin Kulik
a16c10009a Initially set brush with setBrush 2012-03-03 15:42:21 +01:00
Marcin Kulik
dec4d3dc31 Handle more standard esc sequences 2012-03-03 15:36:18 +01:00
Marcin Kulik
5a54654dc5 Handle special charset setting 2012-03-03 15:33:50 +01:00
Marcin Kulik
22b4da210c Charsets support 2012-03-03 15:15:38 +01:00
Marcin Kulik
9480d9c1bb Improve top nav 2012-03-03 08:53:14 +01:00
Marcin Kulik
9263bc37d3 avatar_img helper 2012-03-03 08:52:10 +01:00
Marcin Kulik
8cbfe6844b Fix typo 2012-03-02 22:36:26 +01:00
Marcin Kulik
30f6236b79 Fix OauthHelper.get_avatar_url 2012-03-02 22:33:37 +01:00