Merge branch 'dev'

CHANGELOG.md

@@ -20,4 +20,7 @@ _Security updates_
 ## v1.2.0
 
 - Added password change form in settings
-- Added more documentation on deployment in production
+- Added more documentation on deployment in production
+
+## v1.2.1
+- Fix presenter url (400 error in production)

lib/claper_web/live/event_live/manage.html.heex

@@ -26,14 +26,14 @@
           <svg class="flex-shrink-0 mr-1.5 h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
             <path fill-rule="evenodd" d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z" clip-rule="evenodd" />
           </svg>
-          <%= gettext "Finish on" %> <span class="ml-1" x-text="date"></span> 
+          <%= gettext "Finish on" %> <span class="ml-1" x-text="date"></span>
         </div>
       </div>
     </div>
     <div class="hidden mt-5 md:flex lg:mt-0 lg:ml-4">
       <span class="md:ml-3">
         <span class="italic text-gray-400 text-sm mr-5"><%= raw(gettext "Press <strong>F</strong> in the presentation window to enable fullscreen" ) %></span>
-        <button phx-hook="OpenPresenter" id={"openPresenter-#{@event.uuid}"} data-url={Routes.event_presenter_url(@socket, :show, @event.code)} type="button" class="inline-flex items-center px-5 py-4 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-gradient-to-tl from-primary-500 to-secondary-500 bg-size-200 bg-pos-0 hover:bg-pos-100 transition-all duration-500">
+        <button phx-hook="OpenPresenter" id={"openPresenter-#{@event.uuid}"} data-url={Routes.event_presenter_path(@socket, :show, @event.code)} type="button" class="inline-flex items-center px-5 py-4 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-gradient-to-tl from-primary-500 to-secondary-500 bg-size-200 bg-pos-0 hover:bg-pos-100 transition-all duration-500">
           <svg xmlns="http://www.w3.org/2000/svg" class="-ml-1 mr-2 h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
             <path stroke-linecap="round" stroke-linejoin="round" d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z" />
           </svg>
@@ -84,7 +84,7 @@
           <.live_component module={ClaperWeb.PollLive.FormComponent} id="poll-create" event_uuid={@event.uuid} presentation_file={@event.presentation_file} poll={@poll} live_action={@create_action} position={@state.position} return_to={Routes.event_manage_path(@socket, :show, @event.code)} />
         </div>
       <% end %>
-      
+
     </div>
 
     </div>
@@ -252,4 +252,4 @@
 
     </div>
   </div>
-</div>
+</div>

mix.exs

@@ -1,7 +1,7 @@
 defmodule Claper.MixProject do
   use Mix.Project
 
-  @version "1.2.0"
+  @version "1.2.1"
 
   def project do
     [