Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-02 23:38:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rails4

Browse source 
Conflicts:
	Gemfile.lock
	config/routes.rb
This commit is contained in:
Reinier Balt 2013-06-17 09:25:02 +02:00
commit 4a485558e2
51 changed files with 5475 additions and 5015 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config/routes.rb
View file

@ -5,7 +5,6 @@ Tracksapp::Application.routes.draw do
post 'login' => 'login#login'
get 'login' => 'login#login'
get 'login/expire_session' => 'login#expire_session'
get 'login/check_expiry' => 'login#check_expiry'
get 'logout' => 'login#logout'
@ -102,9 +101,13 @@ Tracksapp::Application.routes.draw do
post 'add_predecessor'
end
end
get 'todos/tag/:name' => 'todos#tag', :as => :tag
get 'tags.autocomplete' => "todos#tags", :format => 'autocomplete'
# match /todos/tag and put everything in :name, including extensions like .m and .txt.
# This means the controller action needs to parse the extension and set format/content type
# Needed for /todos/tag/first.last.m to work
get 'todos/tag/:name' => 'todos#tag', :as => :tag, :format => false, :name => /.*/
get 'tags.autocomplete' => "todos#tags", :format => 'autocomplete'
get 'todos/done/tag/:name' => "todos#done_tag", :as => :done_tag
get 'todos/all_done/tag/:name' => "todos#all_done_tag", :as => :all_done_tag
get 'auto_complete_for_predecessor' => 'todos#auto_complete_for_predecessor'