Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GRN2-199: Allow room owners to set a password that is required to join a room #646

Merged
merged 2 commits into from
Jul 22, 2019
Merged

GRN2-199: Allow room owners to set a password that is required to join a room #646

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17baba8
Allow rooms to have an optional access code
shawn-higgins1 Jul 12, 2019
aa8ce29
merge v.2.2.1-alpha
shawn-higgins1 Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
merge v.2.2.1-alpha
  • Loading branch information
@shawn-higgins1
shawn-higgins1 committed Jul 22, 2019
commit aa8ce296578247e438ec2c59ab1d93dcd210b8e0
2 changes: 1 addition & 1 deletion app/controllers/rooms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ def join_room(opts)
else
search_params = params[@room.invite_path] || params
@search, @order_column, @order_direction, pub_recs =
@room.public_recordings(search_params.permit(:search, :column, :direction), true)
public_recordings(@room.bbb_id, @user_domain, search_params.permit(:search, :column, :direction), true)

@pagy, @public_recordings = pagy_array(pub_recs)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.