Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 2 contributors
View
30 Gemfile.lock
@@ -41,7 +41,7 @@ GEM
arel (3.0.2)
autotest-standalone (4.5.9)
bcrypt-ruby (3.0.1)
- bitfields (0.4.0)
+ bitfields (0.4.1)
builder (3.0.0)
canable (0.3.0)
capistrano (2.12.0)
@@ -61,19 +61,19 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.3.3)
daemons (1.1.8)
database_cleaner (0.7.2)
- devise (2.0.4)
+ devise (2.1.0)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
+ orm_adapter (~> 0.0.7)
railties (~> 3.1)
warden (~> 1.1.1)
diff-lcs (1.1.3)
differ (0.1.2)
erubis (2.7.0)
eventmachine (0.12.10)
- execjs (1.3.2)
+ execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (2.6.4)
activesupport (>= 2.3.9)
@@ -87,12 +87,12 @@ GEM
ffi (1.0.11)
french_rails (0.2.7)
rails (~> 3.0)
- friendly_id (4.0.5)
+ friendly_id (4.0.6)
fuubar (1.0.0)
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 0.0.10)
- haml (3.1.5)
+ haml (3.1.6)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
@@ -120,7 +120,7 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.7.1)
+ json (1.7.3)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -140,14 +140,14 @@ GEM
mini_magick (3.4)
subexec (~> 0.2.1)
mo (0.0.3)
- multi_json (1.3.4)
+ multi_json (1.3.6)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.3.0)
+ net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.2)
@@ -189,7 +189,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- raindrops (0.8.0)
+ raindrops (0.9.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -209,7 +209,7 @@ GEM
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
rspec-mocks (~> 2.10.0)
- rspec-core (2.10.0)
+ rspec-core (2.10.1)
rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4)
@@ -222,7 +222,7 @@ GEM
ruby-progressbar (0.0.10)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- sass (3.1.17)
+ sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -230,8 +230,8 @@ GEM
simple_autocomplete (0.3.8)
sitemap_generator (2.2.1)
slop (2.4.4)
- spork (0.9.1)
- springboard (0.19.3)
+ spork (0.9.2)
+ springboard (0.19.4)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
View
2  app/controllers/sections_controller.rb
@@ -7,7 +7,7 @@ def index
def show
@section = Section.find(params[:id])
- path = section_path(@section)
+ path = section_path(:id => @section, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
@sections = Section.published
@order = params[:order]
View
10 app/controllers/users_controller.rb
@@ -3,7 +3,7 @@ class UsersController < ApplicationController
before_filter :find_user
def show
- path = user_path(@user)
+ path = user_path(:id => @user, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
find_nodes(Diary)
respond_to do |wants|
@@ -13,7 +13,7 @@ def show
end
def news
- path = news_user_path(@user)
+ path = news_user_path(:id => @user, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
find_nodes(News)
respond_to do |wants|
@@ -23,7 +23,7 @@ def news
end
def posts
- path = posts_user_path(@user)
+ path = posts_user_path(:id => @user, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
find_nodes(Post)
respond_to do |wants|
@@ -33,13 +33,13 @@ def posts
end
def suivi
- path = suivi_user_path(@user)
+ path = suivi_user_path(:id => @user, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
find_nodes(Tracker)
end
def comments
- path = comments_user_path(@user)
+ path = comments_user_path(:id => @user, :format => params[:format])
redirect_to path, :status => 301 and return if request.path != path
@dont_index = true
@comments = @user.comments.published.order('created_at DESC').page(params[:page])
View
2  app/views/readings/index.html.haml
@@ -3,7 +3,7 @@
%h1 Mes lectures
= button_to "Tout oublier", readings_path, :method => :delete, :class => "delete_button"
-=h1 "Les derniers contenus que j'ai lu"
+=h1 "Les derniers contenus que j'ai lus"
= paginated_section @nodes do
#contents
= render @nodes.map(&:content)
View
BIN  public/images/sections/45.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

No commit comments for this range

Something went wrong with that request. Please try again.