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
|
13 years ago |
|
Marcin Kulik
|
9e59b19c16
|
Claiming asciicasts
|
13 years ago |
Micha Wrobel
|
5ad02c8610
|
Remove wrong route
|
13 years ago |
|
Micha Wrobel
|
ea62987c06
|
Fix typo
|
13 years ago |
|
Micha Wrobel
|
5d52be2bae
|
Add Forbiden Exception and refactor existing actions
|
13 years ago |
|
Marcin Kulik
|
b7807c3f0d
|
Better styles + pagination
|
13 years ago |
|
Micha Wrobel
|
4f47f0a7fc
|
Add specs for destroy
|
13 years ago |
|
Micha Wrobel
|
cc6fd9eb2a
|
Remove posibility to update comment
|
13 years ago |
|
Micha Wrobel
|
70cf1bdc3b
|
Add comment resource
|
13 years ago |
|
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
|
13 years ago |
|
Marcin Kulik
|
b3e8fbb7df
|
Load asciicast data via ajax
|
13 years ago |
|
Marcin Kulik
|
ece7bfa909
|
Fix ApplicationController#current_user
|
13 years ago |
|
Micha Wrobel
|
2669bbb310
|
Don't use assigns(:current_user) in spec
|
13 years ago |
|
Marcin Kulik
|
d0e0ec4f88
|
Use :alert (supported directly by redirect_to) instead of :error.
|
13 years ago |
|
Micha Wrobel
|
c4763bb566
|
Improve controller specs, tiny refactoring
|
13 years ago |
|
Micha Wrobel
|
ce67e84a60
|
Don't raise AR::RecordNotFound if there is no id
|
13 years ago |
|
Micha Wrobel
|
1b33acb937
|
Make sure that @current_user is also set and cleared
|
13 years ago |
|
Micha Wrobel
|
bf6b74289b
|
Add omniauth authentication: github and twitter
|
13 years ago |
|
Marcin Kulik
|
28b07a88ed
|
Return Location header on successful upload
|
13 years ago |
|
Marcin Kulik
|
59dbd5aea3
|
Api::AsciicastsController
|
13 years ago |
|
Marcin Kulik
|
140cc1c0fc
|
Asciicasts#show (available at /:id)
|
13 years ago |
|
Marcin Kulik
|
c5de80788a
|
Asciicast model
|
13 years ago |
|
Marcin Kulik
|
9fee724e99
|
Rescue from RecordNotFound
|
13 years ago |
|
Marcin Kulik
|
2abdf89511
|
404 handling
|
13 years ago |
|
Marcin Kulik
|
89a29aadd2
|
Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7
|
13 years ago |