merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
883 Commits 2 Branches 0 Tags 12 MiB
Commit Graph

883 Commits

Author SHA1 Message Date
Ahmad Farhat 7fa7d2f525
Removed placeholder text for maintenance window (#1049) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:48:54 -04:00
Ahmad Farhat b23c1d11b3
Added log line when BigBlueButton exception occurs (#1048) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:40:13 -04:00
Ahmad Farhat 03cdbd6b69
Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
etiennevvv 4cc45ab017
Fixed issue with users not being muted on join (#1027) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:10:31 -04:00
Ahmad Farhat 71f35c4c50
Add callback location for each provider (#1029) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-19 11:18:30 -04:00
etiennevvv 73061bdba9
GRN2-284: Fixed bug where admin rights emails was sent multiple times (#996) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-19 11:17:33 -04:00
Justin Byrne 3eead129c9
Updated documentation urls (#1021) 
The urls for the Auth settings were pointing towards the customise page these have been moved to the config page.
 2020-03-19 11:14:14 -04:00
transifex-integration[bot] d0fb3750f2
Translate /config/locales/en.yml in es_MX (#1038) 
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
 2020-03-19 11:04:33 -04:00
transifex-integration[bot] 79da307aa1
Translate /config/locales/en.yml in nl (#991) 
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: Jesus Federico <jesus@123it.ca>
 2020-03-18 21:09:48 -04:00
transifex-integration[bot] 89a7b70091
Translate /config/locales/en.yml in fa_IR (#990) 
translation completed for the source file '/config/locales/en.yml'
on the 'fa_IR' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-18 16:35:44 -04:00
Ahmad Farhat 3e7fb7ecc2
GRN2-xx: Added option to specify different redirect url for google auth (#1016) 
* Added option to specify different redirect url for google auth

* Made the redirect url generic so it works with 365

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-18 16:26:45 -04:00
transifex-integration[bot] 6bb831fb27
Translate /config/locales/en.yml in hu_HU (#986) 
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-18 16:11:44 -04:00
transifex-integration[bot] 8596a3f121
Translate /config/locales/en.yml in ru (#982) 
translation completed for the source file '/config/locales/en.yml'
on the 'ru' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-18 15:54:00 -04:00
etiennevvv 84fb615005
GRN2-283: Fixed bug where users can't join a shared room (Fixed #989) (#995) 
* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
 2020-03-18 15:19:16 -04:00
transifex-integration[bot] e670260f29
Translate /config/locales/en.yml in zh_CN (#980) 
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-04 09:54:44 -05:00
Ahmad Farhat 43911b9fd5
Fixed order of rooms in postgres (#979) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-04 09:50:06 -05:00
Ahmad Farhat 037e4f1c43
Scoped reset password to provider (#978) 2020-03-03 14:43:10 -05:00
dependabot[bot] 90dff3dc7f
Bump rake from 12.3.2 to 13.0.1 (#977) 
Bumps [rake](https://github.com/ruby/rake) from 12.3.2 to 13.0.1.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.2...v13.0.1)

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

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-03 13:50:42 -05:00
dependabot[bot] b95a9e450d
Bump nokogiri from 1.10.5 to 1.10.9 (#975) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.10.9/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.9)

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

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-03 13:45:28 -05:00
dependabot[bot] 469562c87d
Bump rack from 2.0.7 to 2.2.2 (#976) 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.2.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-03 13:41:16 -05:00
dependabot[bot] 11a83320bc
Bump puma from 3.12.2 to 3.12.3 (#974) 
Bumps [puma](https://github.com/puma/puma) from 3.12.2 to 3.12.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.2...v3.12.3)

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

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-03 13:36:07 -05:00
transifex-integration[bot] 2da2ee068d
Translate /config/locales/en.yml in de_DE (#972) 
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.
 2020-03-03 12:07:29 -05:00
Fred Dixon 2af1f7242f
Merge pull request #971 from bigbluebutton/v2.5-alpha 
Release v2.5
 2020-03-02 11:48:17 -05:00
Ahmad Farhat 0092a28bec
Replaced PG variables in docker-compose with the correct ones (#968) 2020-02-28 14:45:44 -05:00
etiennevvv edcda54f89
GRN2-268: Fixed redirection after executing an action in Manage Users (#967) 
* GRN2-268: Fixed redirection after executing an action in Manage Users

* GRN2-268: rubocop fix
 2020-02-28 11:32:32 -05:00
Ahmad Farhat 50f4d5e4f8
Small fixes to shared access (#966) 2020-02-28 10:13:51 -05:00
Ahmad Farhat 2c1472daff
Admins can no longer delete a users home room (#965) 2020-02-25 09:53:08 -05:00
Ahmad Farhat 54234ef54b
Admins that are not signed in are redirected to the signin page when doing admin actions (#964) 2020-02-24 17:30:39 -05:00
Ahmad Farhat 475374090a
Fixed issue with rooms not correctly ordering (#963) 2020-02-24 16:48:51 -05:00
etiennevvv 03266730e8
GRN2-233: Made account activation & password reset links based on tokens only (#959) 
* GRN2-233: Hiding email in verification link and password reset link

* updating tests

* removing uid from email verificaiton link

* GRN2-233: modifying test cases

* GRN2-233: Removing uid from password reset link

* GRN2-233: Removed email_params and fixed "authenticated?" method

* GRN2-233: Fixed error when trying to sign in unverified

* GRN2-233: Changed how activation tokens are generated
 2020-02-24 13:05:09 -05:00
etiennevvv b7aa5406ea
GRN2-273: Fixed bug where incorrect recording length returned when "Notes" format was included (#961) 
* GRN2-273: Fixed bug where incorrect recording length returned

* GRN2-273: Changing iteration variable name   in recording_length method
 2020-02-24 12:58:28 -05:00
Ahmad Farhat 4093a89b4a
Added dropdown for dynamically changing the log level (#962) 2020-02-24 12:51:27 -05:00
Ahmad Farhat 2cc1fdf281
Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -05:00
etiennevvv 92da1f6f87
GRN2-269: Pulling room settings using GET instead of data-attributes (#953) 
* GRN2-269: Pulling room settings using GET instead of data-attributes

* GRN2-269: added test case and fixed documentation

* GRN2:269: rubocop fix

* GRN2-269: Fixed test case
 2020-02-21 09:20:22 -05:00
Ahmad Farhat c75c624a1a
GRN2-xx: Made role priority unique scoped to provider (#942) 
* Made role priority unique scoped to provider

* Fixed issues related to update_role after making role priority unique
 2020-02-19 13:38:16 -05:00
Ahmad Farhat feccee7d62
GRN2-164: Switched the default database to Postgres (#952) 
* Switched the default database to Postgres

* Uncomment DB variables in sample.env
 2020-02-18 15:22:51 -05:00
Ahmad Farhat 005c738e4d
GRN2-260: Added the ability to merge user accounts (#938) 
* Added the ability to merge user accounts

* Styling fixes
 2020-02-14 10:24:06 -05:00
Ahmad Farhat 31258272c2
GRN2-265: No longer throws 500 if provider not included (#944) 
* No longer throws 500 if provider not included

* Rubocop fix
 2020-02-14 10:03:16 -05:00
etiennevvv 3641f1b953
GRN2-270: Hiding delete button in room dropdown for Home Room (#956) 2020-02-14 09:47:17 -05:00
etiennevvv 9fa79bcc16
GRN2-271: Removing redirection to "#" in invite participants copy button (#957) 2020-02-14 09:47:02 -05:00
etiennevvv b67bee2638 GRN2-264: Allow users to change the room settings on Home Room (#951) 
* GRN2-264: Allow users to change the room settings on Home Room

* fixing inconsistencies

* removing 'secondary_rooms' method and adjusting looping
 2020-02-12 17:49:35 -05:00
etiennevvv 01c93b1f67 GRN2-268: Redirecting user back to page they came from in Manage Users (#950) 
* GRN2-268: Redirecting user back to page they come from in Manage Users

* re-factoring
 2020-02-12 17:49:35 -05:00
etiennevvv 68b231dbdb GRN2-266: Autofocus room name when create room modal appears (#945) 
* added autofocus to the Room Name field

* added autofocus to Room Name text field

* added autofocus to Room Name text field

* GRN2-266 Fixing autofocus for Room name when creating room

* removing whitespace

* fixing whitespace

* fixing whitespace
 2020-02-12 17:49:35 -05:00
etiennevvv eb8cc9b17f GRN2-267 Redirect admin link when approving a new user to the "pending" tab (#947) 
* GRN2-267 redirect admin to 'pending' tab when approving a new user

* changes after robocop failed

* robocop changes
 2020-02-12 17:49:35 -05:00
Ahmad Farhat d6b7e975b0 Final fix for vendor assets (#940) 2020-02-12 17:49:35 -05:00
Ahmad Farhat e15e119d5d Included missing assets and fixed room delete 404 (#939) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 3f8ffa61d7 Fixed issue with links (#934) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 5949a6e243 GRN2-xx: Removed unnecessary log lines (#930) 
* Removed unnecessary log lines

* Removed empty function
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 397b4b742f GRN2-128: Fixed issue with manage rooms permissions (#929) 
* Fixed issue with manage rooms permissions

* Improved server rooms efficiency
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 967130e57c GRN2-253: Added the ability to share rooms across multiple users (#912) 
* Added ability to share rooms with other users

* Fixed testcases
 2020-02-12 17:49:35 -05:00