Commit Graph

16 Commits

Author SHA1 Message Date
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
b7807c3f0d Better styles + pagination 2012-03-04 15:18:09 +01:00
Micha Wrobel
eb4d131fc5 Add handerlbars_assets gem 2012-03-04 13:50:16 +01:00
Marcin Kulik
c260307028 Bring back bzip2-ruby 2012-03-04 00:26:22 +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
bf6b74289b Add omniauth authentication: github and twitter 2012-02-25 23:43:17 +01:00
Marcin Kulik
eecd3b3917 Configuration with confstruct 2012-02-20 21:52:21 +01:00
Marcin Kulik
4e5240e24f Switched to jasminrice for coffee specs 2012-02-11 15:37:49 +01:00
Marcin Kulik
c61199b4c9 Updated to rails 3.2.1 2012-02-11 14:15:13 +01:00
Marcin Kulik
bd568f2e3f guard + guard-jasmine-headless-webkit 2012-02-04 16:49:50 +01:00
Marcin Kulik
02f32d3d7f More gems 2011-11-23 22:17:34 +01:00
Marcin Kulik
266f0d1870 Oh well.., 2011-11-23 21:53:34 +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
Marcin Kulik
b7535ac913 Remove old sinatra app 2011-11-21 22:05:03 +01:00
Marcin Kulik
4c6a5bd129 Initial commit 2011-03-09 19:07:49 +01:00