From 4cd41f5aa8fdc04fc0070532c050bddd09f8e12b Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Sun, 14 Mar 2021 14:06:11 -0400 Subject: [PATCH] Replace all CRLF files to LF (#2572) --- .github/workflows/build.release.yml | 64 ++-- app/views/rooms/show.html.erb | 280 +++++++++--------- .../shared/modals/_invite_user_modal.html.erb | 88 +++--- .../shared/modals/_share_room_modal.html.erb | 86 +++--- app/views/user_mailer/invite_email.html.erb | 86 +++--- app/views/user_mailer/invite_email.text.erb | 54 ++-- 6 files changed, 329 insertions(+), 329 deletions(-) diff --git a/.github/workflows/build.release.yml b/.github/workflows/build.release.yml index 3f8fa9c9..46cecd08 100644 --- a/.github/workflows/build.release.yml +++ b/.github/workflows/build.release.yml @@ -1,32 +1,32 @@ -env: - RUBY_VERSION: 2.7.2 - - -name: Build Release -on: - release: - types: [released] - -jobs: - main: - name: Build Docker Image - runs-on: ubuntu-18.04 - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to Github Container Registry - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and Push release - uses: docker/build-push-action@v2 - with: - push: true - tags: | - bigbluebutton/greenlight:latest - bigbluebutton/greenlight:v2 - bigbluebutton/greenlight:${{ github.event.release.tag_name }} - build-args: version_code=${{ github.event.release.tag_name }} +env: + RUBY_VERSION: 2.7.2 + + +name: Build Release +on: + release: + types: [released] + +jobs: + main: + name: Build Docker Image + runs-on: ubuntu-18.04 + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Github Container Registry + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and Push release + uses: docker/build-push-action@v2 + with: + push: true + tags: | + bigbluebutton/greenlight:latest + bigbluebutton/greenlight:v2 + bigbluebutton/greenlight:${{ github.event.release.tag_name }} + build-args: version_code=${{ github.event.release.tag_name }} diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 0d8903df..3feb5219 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -1,140 +1,140 @@ -<% -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. -# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -%> - -<% exceeds_limit = current_room_exceeds_limit(@room)%> -<% if exceeds_limit%> -
- <%= t("room.room_limit_exceeded", difference: @diff) %> -
-<% end %> -
-
-
-
-
-

<%= title(@room.name) %>

- <% if current_user.main_room == @room %> - - <% else %> - - <% end %> -
-

<%= @room.sessions %> <%= t("room.sessions") %><% unless hide_recording_tables %> | <%= @recordings.length %> <%= t("room.recordings") %><% end %>

- <% unless exceeds_limit %> - -
-
-
- - - - -
-
-
-
-
- -
-
- <% if @room.access_code.present? %> - - - <% end %> - <% if Rails.configuration.enable_google_calendar_button %> - - - <%= t("add_to_google_calendar") %> - - <% end %> -
-
-
-
- <% end %> -
-
- <% if @room_running %> - <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> - <% else %> - <% unless exceeds_limit %> - <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> - <% end %> - <% end %> -
-
- - <% if total_room_count(current_user) > 5 %> -
- - - - " class="form-control w-100" onChange="filterRooms()" onKeyUp="filterRooms()"> - - - -
- <% end %> - -
- <% if current_user.role.get_permission("can_create_rooms") %> - <% current_user.ordered_rooms.each do |room| %> -
- <%= link_to room do %> - <%= render "rooms/components/room_block", room: room %> - <% end %> -
- <% end %> - <% end %> - - <% if shared_access_allowed %> - <% current_user.shared_rooms.each do |room| %> -
- <%= link_to room do %> - <%= render "rooms/components/shared_room_block", room: room %> - <% end %> -
- <% end %> - <% end %> - - <% if current_user.role.get_permission("can_create_rooms") && !room_limit_exceeded %> - <%= render "rooms/components/create_room_block"%> - <% end %> -
-
-
- -<% unless hide_recording_tables %> - <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> -<% end %> - -<%= render "shared/modals/delete_room_modal" %> - -<%= render "shared/modals/create_room_modal" %> - -<% if preupload_allowed? %> - <%= render "shared/modals/preupload_presentation_modal" %> -<% end %> - -<% if shared_access_allowed %> - <%= render "shared/modals/share_room_modal" %> - <%= render "shared/modals/remove_access_modal" %> -<% end %> +<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +%> + +<% exceeds_limit = current_room_exceeds_limit(@room)%> +<% if exceeds_limit%> +
+ <%= t("room.room_limit_exceeded", difference: @diff) %> +
+<% end %> +
+
+
+
+
+

<%= title(@room.name) %>

+ <% if current_user.main_room == @room %> + + <% else %> + + <% end %> +
+

<%= @room.sessions %> <%= t("room.sessions") %><% unless hide_recording_tables %> | <%= @recordings.length %> <%= t("room.recordings") %><% end %>

+ <% unless exceeds_limit %> + +
+
+
+ + + + +
+
+
+
+
+ +
+
+ <% if @room.access_code.present? %> + + + <% end %> + <% if Rails.configuration.enable_google_calendar_button %> + + + <%= t("add_to_google_calendar") %> + + <% end %> +
+
+
+
+ <% end %> +
+
+ <% if @room_running %> + <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> + <% else %> + <% unless exceeds_limit %> + <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right", "data-disable": "" %> + <% end %> + <% end %> +
+
+ + <% if total_room_count(current_user) > 5 %> +
+ + + + " class="form-control w-100" onChange="filterRooms()" onKeyUp="filterRooms()"> + + + +
+ <% end %> + +
+ <% if current_user.role.get_permission("can_create_rooms") %> + <% current_user.ordered_rooms.each do |room| %> +
+ <%= link_to room do %> + <%= render "rooms/components/room_block", room: room %> + <% end %> +
+ <% end %> + <% end %> + + <% if shared_access_allowed %> + <% current_user.shared_rooms.each do |room| %> +
+ <%= link_to room do %> + <%= render "rooms/components/shared_room_block", room: room %> + <% end %> +
+ <% end %> + <% end %> + + <% if current_user.role.get_permission("can_create_rooms") && !room_limit_exceeded %> + <%= render "rooms/components/create_room_block"%> + <% end %> +
+
+
+ +<% unless hide_recording_tables %> + <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> +<% end %> + +<%= render "shared/modals/delete_room_modal" %> + +<%= render "shared/modals/create_room_modal" %> + +<% if preupload_allowed? %> + <%= render "shared/modals/preupload_presentation_modal" %> +<% end %> + +<% if shared_access_allowed %> + <%= render "shared/modals/share_room_modal" %> + <%= render "shared/modals/remove_access_modal" %> +<% end %> diff --git a/app/views/shared/modals/_invite_user_modal.html.erb b/app/views/shared/modals/_invite_user_modal.html.erb index b7680877..b8e5a768 100644 --- a/app/views/shared/modals/_invite_user_modal.html.erb +++ b/app/views/shared/modals/_invite_user_modal.html.erb @@ -1,44 +1,44 @@ -<% -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. -# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -%> - - +<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +%> + + diff --git a/app/views/shared/modals/_share_room_modal.html.erb b/app/views/shared/modals/_share_room_modal.html.erb index 57a50c6d..038917e1 100644 --- a/app/views/shared/modals/_share_room_modal.html.erb +++ b/app/views/shared/modals/_share_room_modal.html.erb @@ -1,43 +1,43 @@ -<% -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. -# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -%> - - +<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +%> + + diff --git a/app/views/user_mailer/invite_email.html.erb b/app/views/user_mailer/invite_email.html.erb index 6f7c6505..a822b6ce 100644 --- a/app/views/user_mailer/invite_email.html.erb +++ b/app/views/user_mailer/invite_email.html.erb @@ -1,43 +1,43 @@ -<% -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. -# -# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). -# -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -%> - -
-
- <%= image_tag(@image, height: '70') %> - -

- <%= t('mailer.user.invite.subject') %> -

- -

- <%= t('mailer.user.invite.info', name: @name) %> -

- -

- <%= t('mailer.user.invite.username', email: @email) %> -

- -

- <%= t('mailer.user.invite.signup_info') %> -

- - - <%= t('mailer.user.invite.signup_link') %> - -
-
+<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# +# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). +# +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +%> + +
+
+ <%= image_tag(@image, height: '70') %> + +

+ <%= t('mailer.user.invite.subject') %> +

+ +

+ <%= t('mailer.user.invite.info', name: @name) %> +

+ +

+ <%= t('mailer.user.invite.username', email: @email) %> +

+ +

+ <%= t('mailer.user.invite.signup_info') %> +

+ + + <%= t('mailer.user.invite.signup_link') %> + +
+
diff --git a/app/views/user_mailer/invite_email.text.erb b/app/views/user_mailer/invite_email.text.erb index 0cef70c2..f5f259d1 100644 --- a/app/views/user_mailer/invite_email.text.erb +++ b/app/views/user_mailer/invite_email.text.erb @@ -1,27 +1,27 @@ -<% -# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. -# -# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). -# -# This program is free software; you can redistribute it and/or modify it under the -# terms of the GNU Lesser General Public License as published by the Free Software -# Foundation; either version 3.0 of the License, or (at your option) any later -# version. -# -# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License along -# with BigBlueButton; if not, see . -%> - -<%= t('mailer.user.invite.subject') %> - -<%= t('mailer.user.invite.info', name: @name) %> - -<%= t('mailer.user.invite.username', email: @email) %> - -<%= t('mailer.user.invite.signup_info') %> - -<%= @url %> +<% +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# +# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). +# +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +%> + +<%= t('mailer.user.invite.subject') %> + +<%= t('mailer.user.invite.info', name: @name) %> + +<%= t('mailer.user.invite.username', email: @email) %> + +<%= t('mailer.user.invite.signup_info') %> + +<%= @url %>