Merge master

config/routes.rb

@@ -14,11 +14,6 @@ Osem::Application.routes.draw do
                path:        'accounts'
   end
 
-  # Use letter_opener_web to open mails in browser (e.g. necessary for Vagrant)
-  if Rails.env.development?
-    mount LetterOpenerWeb::Engine, at: "/letter_opener"
-  end
-
   resources :users, except: [:new, :index, :create, :destroy] do
     resources :openids, only: :destroy
   end
@@ -174,6 +169,7 @@ Osem::Application.routes.draw do
       end
     end
     resource :program, only: [] do
+      get 'proposal/:id', to: 'proposals#show' # For backward compatibility
       resources :proposals, except: :destroy do
         get 'commercials/render_commercial' => 'commercials#render_commercial'
         resources :commercials, only: [:create, :update, :destroy]
@@ -201,6 +197,9 @@ Osem::Application.routes.draw do
     resources :physical_tickets, only: [:index, :show]
     resource :subscriptions, only: [:create, :destroy]
     resource :schedule, only: [:show] do
+      collection do
+        get 'app'
+      end
       member do
         get :events
       end