Commit Graph

186 Commits

Author SHA1 Message Date
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
ba4cbca196 Config keys for carrierwave+fog 2012-03-10 18:03:06 +01:00
Marcin Kulik
d8fb7866fe cap config 2012-03-10 18:01:02 +01:00
Marcin Kulik
03710d37e0 carrierwave initializer 2012-03-10 17:05:45 +01:00
Marcin Kulik
de37091ac0 production section in app.yml 2012-03-10 16:17:54 +01:00
Micha Wrobel
fc53b71ee2 Validate nickname uniquness 2012-03-06 22:39:16 +01:00
Marcin Kulik
d8cc88e617 Build script for travis-ci 2012-03-06 15:17:12 +01:00
Marcin Kulik
f914a97308 Airbrake/Errbit 2012-03-04 23:49:13 +01:00
Marcin Kulik
c3326e4b16 Browse path 2012-03-04 23:44:36 +01:00
Marcin Kulik
51dfa8474f Profile paths: ~sickill 2012-03-04 23:07:45 +01:00
Marcin Kulik
35af4cf9e7 Home and installation pages 2012-03-04 22:44:04 +01:00
Marcin Kulik
ebf0383e99 Fix comment routes 2012-03-04 21:26:22 +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
9e59b19c16 Claiming asciicasts 2012-03-04 20:30:26 +01:00
Micha Wrobel
5ad02c8610 Remove wrong route 2012-03-04 16:48:24 +01:00
Micha Wrobel
0c62dc51b3 Don't include model name in json response 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
285f9934ab Google analytics 2012-03-04 00:23:36 +01:00
Marcin Kulik
b3e8fbb7df Load asciicast data via ajax 2012-03-03 18:38:11 +01:00
Micha Wrobel
54b13fa3a6 Add OauthHelper.get_avatar_url 2012-02-26 17:45:38 +01:00
Micha Wrobel
bf6b74289b Add omniauth authentication: github and twitter 2012-02-25 23:43:17 +01:00
Micha Wrobel
11fddcdc0d Add database.yml.example 2012-02-21 22:32:48 +01:00
Marcin Kulik
2f0c7491e8 Missing app.yml 2012-02-21 18:06:18 +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
59dbd5aea3 Api::AsciicastsController 2012-01-14 21:27:10 +01:00
Marcin Kulik
140cc1c0fc Asciicasts#show (available at /:id) 2011-11-27 13:54:10 +01:00
Marcin Kulik
c5de80788a Asciicast model 2011-11-23 22:31:00 +01:00
Marcin Kulik
b1eb7a30b8 Require activerecord in application.rb 2011-11-23 22:29:37 +01:00
Marcin Kulik
2abdf89511 404 handling 2011-11-23 21:47:09 +01:00
Marcin Kulik
4692ea08e6 T3rminal -> AsciiIo 2011-11-23 21:41:25 +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