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.

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

Removed duplicate code for openid_connect provider #2431

Merged
merged 1 commit into from
Jan 14, 2021

Conversation

defnull
Copy link
Contributor

@defnull defnull commented Jan 14, 2021

Not tested, but the error looked very obvious.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 90.857% when pulling 64ba420 on defnull:patch-3 into c92917b on bigbluebutton:master.

@farhatahmad farhatahmad merged commit fed6ca4 into bigbluebutton:master Jan 14, 2021
lanet-technik added a commit to lanet-technik/lanet-greenlight that referenced this pull request Jan 16, 2021
* Translate /config/locales/en.yml in da (bigbluebutton#2290)

translation completed for the source file '/config/locales/en.yml'
on the 'da' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in cs (bigbluebutton#2289)

translation completed for the source file '/config/locales/en.yml'
on the 'cs' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix Invite Link Separator (bigbluebutton#2309)

This patch fixes the separator before the invite link in the text which
is sent to BigBlueButton. The `\n` characters were filtered out so that
at least a space character was missing here.

This fixes bigbluebutton#2307

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Improce Word Wrapping in Recording Table (bigbluebutton#2328)

Using `break-all` for word-wrapping in the recording table can cause
awkward word wrapping. Using `break-word` should mostly avoid that
while still ensuring that words too long to properly fit are wrapped.

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Allow Searching for Rooms (bigbluebutton#2315)

* Allow Searching for Rooms

If a user has a lot of rooms, finding the correct one can be somewhat
annoying and it would be great to be able to search for or filter the
rooms in the room list.

This patch adds a very simple search functionality for this. The search
bar is hidden as long as a user has not more than six (two rows in
desktop mode) rooms. If the number of rooms exceeds this limit, a search
field is shown to quickly filter the list.

* Updates Romm Filter Style

This patch updates the room filtering according to the review requests.
It switches to the same search input style that is used at places like
the recording table.

This mans, that this also works slightly different since the input now
has a clear and a search button. The basic functionality is the same
though.

Finally, this switches from plain JavaScript to jQuery functions for
filtering.

* Uppercased Name in Full Name (bigbluebutton#2333)

* fix: health_check SMTP check when no auth required (bigbluebutton#2281)

* Translate '/config/locales/en.yml' in 'nl' (bigbluebutton#2335)

* Translate /config/locales/en.yml in nl

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

* Translate /config/locales/en.yml in nl

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in gl (bigbluebutton#2337)

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in de_DE (bigbluebutton#2339)

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in es (bigbluebutton#2342)

translation completed for the source file '/config/locales/en.yml'
on the 'es' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fixes to room search (bigbluebutton#2343)

* Fixed 500 caused by room search (bigbluebutton#2366)

* Added field to track users last login (bigbluebutton#2367)

* Added mapping roles through email to site settings (bigbluebutton#2373)

* Translate /config/locales/en.yml in cs (bigbluebutton#2372)

translation completed for the source file '/config/locales/en.yml'
on the 'cs' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in nl (bigbluebutton#2375)

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in de_DE (bigbluebutton#2377)

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate '/config/locales/en.yml' in 'ja_JP' (bigbluebutton#2378)

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix a typo (bigbluebutton#2386)

* GRN2-310: Share Access now dynamically pulls the list of users from the server (bigbluebutton#2380)

* Share Access now dynamically pulls the list of users from the server

* Merge users now dynamically pulls the list of users from the server

* Only return the information needed to the front-end

* GRN2-309: Allows admins to edit a non-local users name and email (bigbluebutton#2389)

* Allows admins to edit a non-local users name and email

* Fixed edge case

* Make room delete permanent (bigbluebutton#2390)

* Translate /config/locales/en.yml in gl (bigbluebutton#2384)

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Only return required info for dynamic user lists (bigbluebutton#2397)

* Only pass muteOnStart if set to true (bigbluebutton#2401)

* Make all LIKE queries case insensitive (bigbluebutton#2402)

* Refine OpenID Connect Authentication from bigbluebutton#1194 (bigbluebutton#1399)

* Adds OpenID Connect.

* Add CSS class for openid_connect omniauth provider

* Add translation (de_DE and en) for openid_connect omniauth provider label

* Make uid_field configurable for openid_connect omniauth provider

* updates to support for openid

* updates to support for openid

* updated ldap gem

* updated sample.env

Co-authored-by: mapidentity <git@mapidentity.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: mapidentity <49822181+mapidentity@users.noreply.github.com>

* Bump nokogiri from 1.10.10 to 1.11.1 (bigbluebutton#2409)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.10...v1.11.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Translate /config/locales/en.yml in de_DE (bigbluebutton#2419)

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate /config/locales/en.yml in gl (bigbluebutton#2418)

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in nl (bigbluebutton#2415)

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Bump redcarpet from 3.5.0 to 3.5.1 (bigbluebutton#2425)

Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](vmg/redcarpet@v3.5.0...v3.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* GRN2-277: Optimize server recordings to make it useable for large deployments (bigbluebutton#2411)

* First changes to server recordings

* Update server recordings

* Rubocop

* Make sure to return nothing for empty searches

* Made sure exactly the right amount of recordings are returned

* Added test cases

* Translate /config/locales/en.yml in gl (bigbluebutton#2429)

translation completed for the source file '/config/locales/en.yml'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Translate /config/locales/en.yml in de_DE (bigbluebutton#2427)

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in es (bigbluebutton#2423)

translation completed for the source file '/config/locales/en.yml'
on the 'es' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Translate /config/locales/en.yml in ar (bigbluebutton#2404)

translation completed for the source file '/config/locales/en.yml'
on the 'ar' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Removed duplicate code for openid_connect provider (bigbluebutton#2431)

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Lars Kiesow <lkiesow@uos.de>
Co-authored-by: Julien Gribonvald <julien.gribonvald@gmail.com>
Co-authored-by: Marc Laporte <marclaporte@gmail.com>
Co-authored-by: Moritz Schlarb <schlarbm@uni-mainz.de>
Co-authored-by: mapidentity <git@mapidentity.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
Co-authored-by: mapidentity <49822181+mapidentity@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marcel Hellkamp <marc@gsites.de>
galupa pushed a commit to galupa/greenlight that referenced this pull request Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants