lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,184 Commits 7 Branches 0 Tags 24 MiB
Commit Graph

631 Commits

Author SHA1 Message Date
transifex-integration[bot] 88f408c092 Translate /config/locales/en.yml in de_DE (#438) 
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
 2019-04-09 10:36:18 -04:00
transifex-integration[bot] 362ae1d6dd Translate /config/locales/en.yml in pt_BR (#437) 
translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language
 2019-04-09 10:35:41 -04:00
Jesus Federico 57aa72ecee
GRN-73: Added settings for externalizing logs (#441) 
* Added settoings for externalizing logs

* Fix for passing rubocop

* Attempt to fix jenkins fail

* Final Jenkins fix
 2019-04-08 16:06:14 -04:00
Jesus Federico 154bb883b6
Make sure the loadbalancer URL is correct (#440) 2019-04-08 09:19:35 -04:00
Jesus Federico b15868fb3c
GRN-80: Allow local accounts on multitenant (#428) 
* Changed the way the omniauth providers are declared

* Allow local authentication for multitenant mode based on customer settings

* Cleanead up code mandated by rubocop

* Completed implementation for signin and added the one for signup

* Fixed issue with rubocop

* Renamed customer_name to lb_user

* Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented

* Completed implementation of email_verification

* Fixed rubocop issue

* Final update

* Fix for test with loadbalancer

* Make sure loadbalancer mockup is only used when env defined

* Fix for test on rooms_controller

* Fixed most of the test failing on multitenant env

* Fixed issue detected by rubocop

* Fixed issue with activation tockens not working on resend

* Fixed new issue found by rubocop

* Updated travis script

* Harcoded credentials for mockup

* Updated expectation on start_session

* Fixed issue with duplication of home room

* Updated script for rubocop

* Restored Gemfile
 2019-04-05 14:54:36 -04:00
Jesus Federico 5ba5b663ac
GRN-86: Change the way the locales are handled (#417) 
* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German
 2019-03-28 11:02:36 -04:00
transifex-integration[bot] 7474a3c6a0 Translate /config/locales/en.yml in ru_RU (#416) 
translation completed for the source file '/config/locales/en.yml'
on the 'ru_RU' language
 2019-03-28 08:51:56 -04:00
transifex-integration[bot] 9a13a4683e Translate /config/locales/en.yml in de (#414) 
translation completed for the source file '/config/locales/en.yml'
on the 'de' language
 2019-03-27 16:25:35 -04:00
transifex-integration[bot] 1d2e142f5b Translate /config/locales/en.yml in de_DE (#413) 
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
 2019-03-27 14:13:33 -04:00
transifex-integration[bot] a6d6dc5136 Translate /config/locales/en.yml in zh_CN (#412) 
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
 2019-03-27 10:36:32 -04:00
transifex-integration[bot] 18cefe8c0b Translate '/config/locales/en.yml' in 'es_MX' (#411) 
* Translate /config/locales/en.yml in es_MX

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

* Rename es_MX.yml to es-MX.yml

* Rename es-MX.yml to es_MX.yml
 2019-03-27 09:45:05 -04:00
transifex-integration[bot] 1f34174df1 Translate '/config/locales/en.yml' in 'pt_BR' (#410) 
* Translate /config/locales/en.yml in pt_BR

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

* Rename pt_BR.yml to pt-BR.yml

* Rename pt-BR.yml to pt_BR.yml
 2019-03-27 08:52:05 -04:00
Jesus Federico 8d484e2c0e
Update en.yml 2019-03-26 09:43:43 -04:00
Jesus Federico 6e0b232c3e
Updated locales (#402) 2019-03-21 11:45:45 -04:00
farhatahmad 3195bb4429 GRN-59: Implemented pagination on the API call (#370) 
* Added the env variable and functionality to paginate the call to the bbbapi

* Update user.rb
 2019-03-12 13:50:20 -04:00
farhatahmad c60e25f71c GRN-56: Correctly implemented the account verification flow (#367) 
* Correctly implemented the account verification flow

* Fixed issues with redirect locations
 2019-02-22 16:47:02 -05:00
farhatahmad 9c23c88735 Added a env variable to toggle visibilty of the customize tab in user settings (#369) 2019-02-15 12:15:29 -05:00
farhatahmad d24e8fad14 Added the ability to choose which room settings are available using env variable (#363) 2019-02-06 16:13:53 -05:00
farhatahmad 9883616f9c Fixed issue with visibility redirected and changed the 'no recordings' string for the recordings page (#361) 2019-02-06 12:02:53 -05:00
farhatahmad 2e8670a8ab GRN-11: Ability to configure room specific settings (#348) 
* Added the ability to set room settings on create or update

* Added room settings alerts and made fixes to other alerts

* Small bug fixes related to rubocop and the create room modal

* Update test case and fixed issue with small edge case

* Update room.js
 2019-02-06 11:08:18 -05:00
farhatahmad 8ff05643dc Added a Recordings page where the user can see all recordings (#352) 2019-02-04 11:21:42 -05:00
farhatahmad ef23cae73d Changed the link to the bbb image to be an absolute url (#353) 2019-02-04 10:19:11 -05:00
farhatahmad ecee282fc4 GRN-19: Add confirmation for accepting cookies from the site (#345) 
* Added a cookie warning

* Cleaned up code to better match application standard
 2019-02-01 12:54:29 -05:00
farhatahmad ffff724712 GRN-48: Password reset e-mails getting into SPAM folders (#349) 
* Changed the way emails look and added an extra string for the user to check their spam folder

* Update verify_email.text.erb
 2019-02-01 12:14:51 -05:00
Jesus Federico 56a72ade9d
Completed fix for the specs (#343) 2019-01-18 10:29:06 -05:00
plastilincheg 8df16d2651 Update ru.yml (#338) 
Change some mistakes
 2018-12-21 15:24:07 -05:00
John Ma 1571e27ac0 Added russian translation (#336) 
* <Added russian locale>

* Update ru.yml

* Update ru.yml
 2018-12-21 12:42:05 -05:00
John Ma 8fe66d81f1 Fixed #332 Allow users to reset their password (#335) 
* <Added password reset system>

* <Added rspec tests>

* <Fixed code style>

* <Added rescue for invalid smtp configuration>
 2018-12-21 11:56:52 -05:00
John Ma 8cdbf1d5e6 Add the ability to Sort Recordings (GRN-43) (#327) 
* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Added filter ui options>

* <Add sorting functionality>

* <Added sorting functionality for public recordings>

* <Update branch>

* <Fix code>

* <Fix code>

* <Fix code style>

* Update sort.js
 2018-12-13 11:58:33 -05:00
John Ma b3f37cd3b3 Fixed #323 Allow users to select a language in settings (GRN-17) (#324) 
* <Added ui for language setting and migration>

* <Option to choose languages added>

* <Fixed code style>

* <Added Rspec tests>

* <sync db>

* <Sync db>

* <Generalized language settings>

* <Fixed flash message>

* Fixed las issue with i18n fallback

* <Modified fallback config>

* <Fixed code style>
 2018-12-06 16:00:22 -05:00
John Ma 895af7494e Fixed #280 Search/Paginate recordings (GRN-12) (#281) 
* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Removed commented code>

* Update search.js
 2018-12-06 10:24:22 -05:00
John Ma 41a543f6b8 Fixed #303 Add the ability to rename rooms and recordings (GRN-18) (#304) 
* <Added modal for rename>

* <Commit changes and switch branch>

* <Javascript Scaffolding for rename room feature>

* <Created room_block.js>

* <update changes>

* <Updating rename branch>

* <Update rename.js>

* <Update branch>

* <Update branch>

* <Implemented renaming of room blocks>

* <Refactoring code>

* Remove modal due to new design

* <Finished renaming of rooms>

* <Updated renaming of recordings>

* <updating branch>

* <added renaming of recordings>

* <update branch>

* <>

* <Fixed code style>

* <Fixed rspec tests>

* Update application.js
 2018-12-04 10:48:51 -05:00
John Ma efa9e08dfc Fixed #318 Allow multiple domains when using Google as OAuth provider (GRN-38) (#319) 
* <Added muli_domain restriction with google_oauth>

* <Fixed code style>

* <Added some rspec tests>
 2018-11-15 15:01:53 -05:00
John Ma de98fd0a3c Display notification that max concurrent sessions has been reached (GRN-41) (#317) 
* <Added max concurrent sessions check>

* <Refactored some exception logic>

* <Fixed code style>

* <Generalized BBBException error message>
 2018-11-15 14:20:46 -05:00
John Ma 0e7277a046 Modify UI for "accept terms" checkbox (#321) 
* <Changed terms and conditions checkbox>

* <Fixed code style>
 2018-11-15 12:56:00 -05:00
Jesus Federico 3b67ffee40
Generalized logs and mailer (#312) 2018-10-26 11:59:49 -04:00
Jesus Federico b3a2d9e39e
Updates to env variables for logging (#309) 
* Updates to env variables for logging

* Added not_found template to application
 2018-10-23 11:45:14 -04:00
Jesus Federico 207ec6ffb2
Unify the UI style in sign up, sign in buttons when using omniauth (GRN-35) (#301) 
* Changed style to buttons for sign up

* Added assets and generalized code for sign up buttons

* Added new style to sign in modal

* Replaced hex colors with the official ones

* Removed the old social icons that are no longer used

* Centred text in sign up buttons

* Base button rendering on iconset_providers and secured office 365
 2018-10-17 12:41:57 -04:00
John Ma 1bb5be68a5 Fix for email verification issue (GRN-36) (#300) 
* <incorrect smtp settings no longer crashes the application>

* <Added rspec tests>

* <>

* Delete env

* Update development.rb
 2018-10-17 11:42:50 -04:00
John Ma ec250f3ed5 Fixed #291 Added OAuth2 for Office365 (GRN-32) (#293) 
* <Added omniauth for office365>

* <Fixed code style>

* Update puma.rb

* <Inserted link to documentation>
 2018-10-16 12:58:06 -04:00
Jesus Federico 90b965d03f
Workaround for issue with email notification (#297) 2018-10-15 15:55:29 -04:00
Bruck Wubete fd1b586c6e Fixed #266 Externalize version tag so it is based on GitHub tag when deployed to production (GRN-1) (#292) 
* Update Jenkinsfile

* updating Jenkinsfile

* updating version in Jenkins

* Update version.rb
 2018-10-12 16:11:22 -04:00
John Ma a9be611d00 Fixed #269 Add health-check endpoint (GRN-3) (#290) 
* <Added health_check endpoint>

* <changed gemfile_lock>

* <fixed code style>

* <removed excess health_check routes>
 2018-10-12 15:57:53 -04:00
Tyler Copeland cf2fac019e Updated styles for the Google Auth button (GRN-31) (#296) 
* Greenlight landing page layout adjustments, general cleanup and responsive styles

* Text update Signup to Sign up

* Updated Google Sign in and Sign up styles

* no changes were made to sample env but needed to commit it

* minor padding update on the Google icon

* deleted Google Auth secrets from the sameple.env

* updated the if condition in new.html.erb

* <changed logic of button display>

* Update _login_modal.html.erb
 2018-10-12 15:33:19 -04:00
John Ma 967c805836 Fixed #267 Email verification feature (#268) 
* <Implemented basic welcome email upon signup>

* <Added config option to enable>

* <Added verification link routing>

* <Added views for verify/resend and reconfigured routes>

* <Finished Verification System minus Rspec changes>

* <Fixed code style>

* <Modified dome rspec tests>

* <Switched sample env back to default>

* <Added test cases to increase code coverage>

* <Added test_helper>

* <Minor code changes>

* <Added requested changes>

* <Added requested changes>

* <see if this fixes migration>

* <see if this fixes migration>

* <fixed migrations>

* Delete .rake_tasks~

* Update _confirm_button.html.erb

* Update _resend_button.html.erb

* Update verify_email.html.erb

* Update verify_email.text.erb

* <Fixed bugs>

* <Added validation of verification link and fixed some code style>

* <Disabled updating email for omniauth>
 2018-10-09 14:22:02 -04:00
John Ma 5c3fd15323 Fixed #283 (#284) 
* <fixed translation errors>

* <fixed translation errors>

* <fixed translation errors>
 2018-10-03 14:08:50 -04:00
John Ma f0f0638be3 500 internal server error (fixes #277) (#279) 
* <Fixed bug>

* <Fixed some errors>

* <fixed rspec tests>

* <Made requested changes>

* Delete search.js
 2018-10-02 17:48:01 -04:00
Tyler Copeland 423ec6c828 Greenlight landing page layout adjustments, general cleanup and responsive styles (#271) 2018-09-19 15:28:48 -04:00
John Ma d83ec1a027 Fix #260 issues with privacy policy (#261) 
* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>
 2018-09-14 14:33:58 -04:00
John Ma 94d0d1acd7 John ui fix issue#256 (#257) 
Greenlight Homepage should display "Welcome to BigBlueButton", "powered by Greenlight"
 2018-09-11 13:40:07 -04:00
Joshua Arts cb77c6b5af add ar, de, el and fr locales from transifex 2018-08-30 10:46:13 -04:00
jfederico 7190779abb Added Spanish translation 2018-08-21 20:03:58 +00:00
Joshua Arts 71395003c1 revert version 2018-08-21 13:28:56 -04:00
Joshua Arts a27fbec44a
Merge pull request #247 from britoederr/master 
Brazilian Portuguese Translate
 2018-08-20 10:32:35 -04:00
Éder Brito e7b97e3d67
Update application.rb 2018-08-20 11:04:16 -03:00
Joshua Arts 0cf5baddb2 add option to disable recording thumbnails 2018-08-17 16:31:16 -04:00
bruckwubete 66ff9c7a2f fix force ssl logic for lb configuration 2018-08-15 11:45:37 -04:00
Éder Brito 7b65b04d9b
Brazilian Portuguese Translate 2018-08-14 11:08:06 -03:00
Éder Brito f742e1af78
Brazilian Portuguese Translate 2018-08-13 15:40:38 -03:00
Éder Brito e98037fd64
Update application.rb 2018-08-13 15:39:31 -03:00
Joshua Arts f0610f363d add option to force ssl 2018-08-02 14:58:20 -04:00
Joshua Arts 8ff0018eac allow for production cable config 2018-08-02 14:08:13 -04:00
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Joshua Arts 4b9ca3f13e recenter errors and missing locales 2018-07-27 14:55:32 -04:00
Joshua Arts 7b15b84daa delete recordings with account 2018-07-27 14:14:48 -04:00
Joshua Arts 5e5f31c375 add option in settings to delete account 2018-07-27 11:36:28 -04:00
Joshua Arts 89b1afa470 fix missing locales and bump name/email max 2018-07-26 11:53:50 -04:00
Joshua Arts a9892d2dcb redesign landing & fix footer 2018-07-25 14:43:05 -04:00
Joshua Arts 11f0c1f5e6 disable allow_greenlight_accounts when ldap is enabled 2018-07-24 11:13:04 -04:00
Joshua Arts 12a448aa24
Merge pull request #225 from joshua-arts/ldap 
Add support for LDAP authentication.
 2018-07-23 15:34:42 -04:00
Joshua Arts 3696fa95d7 add version in footer 2018-07-23 15:06:21 -04:00
Joshua Arts f91c6d193a make features appear non-clickable 2018-07-23 14:40:41 -04:00
Joshua Arts 00a3deec29 explicitly call #omniauth_fail 2018-07-23 12:07:26 -04:00
Joshua Arts 9a738c4432 add signup with provider buttons 2018-07-23 11:46:53 -04:00
Joshua Arts 690a12ceba add relative root to ldap callback path 2018-07-20 16:04:50 -04:00
Joshua Arts 775285bba9 add ldap authentication 2018-07-20 14:20:14 -04:00
Joshua Arts c5cfc621ca localize controllers 2018-07-19 16:04:08 -04:00
Joshua Arts ce4c8b3bff localize views 2018-07-17 11:57:49 -04:00
Joshua Arts 55b83226c9 detect users preferred language 2018-07-13 11:04:32 -04:00
Joshua Arts f5ab362f96 add ability for custom branding images 2018-07-11 15:33:35 -04:00
bruckwubete 01ea22ed6d removed OpenSSL::SSL::VERIFY_PEER assignment 2018-07-11 14:57:00 -04:00
bruckwubete 91644281c4 fixing rubocop errors 2018-07-10 15:05:50 -04:00
bruckwubete 137b8450a8 adding checksum. using customer name as the provider 2018-07-10 12:11:00 -04:00
bruckwubete 0d2a5a4c90 small fixes 2018-07-09 16:00:10 -04:00
bruckwubete 590e189474 Merge branch 'master' into bn_launcher_integration 2018-07-09 13:20:34 -04:00
bruckwubete 68d61d115c Merge branch 'master' of https://github.com/bigbluebutton/greenlight2 2018-07-09 13:19:59 -04:00
bruckwubete 67c32a396f passing params to the launcher gem 2018-07-09 13:17:23 -04:00
Joshua Arts e2ad6e7715 make upgrading from 1.0 easier 2018-07-05 17:25:59 -04:00
bruckwubete 930ed809f5 pass github token as runtime arg 2018-07-04 17:06:52 -04:00
bruckwubete adeb844918 Merge branch 'bn_launcher_integration' of https://github.com/bigbluebutton/greenlight2 into bn_launcher_integration 2018-07-04 15:36:06 -04:00
bruckwubete b51ac6aa7c reverting unnecessary changes 2018-07-04 15:24:01 -04:00
bruckwubete 3c11aca1aa able to handle launcher login with gem 2018-07-04 14:48:22 -04:00
Joshua Arts efcc312e9e remove ability to change home room 2018-07-03 11:57:45 -04:00
Joshua Arts efbf42f698 remove unused launch route 2018-06-29 16:18:00 -04:00
bruckwubete 2bb41977ed Merge https://github.com/joshua-arts/greenlight-2.0 2018-06-29 10:08:58 -04:00
bruckwubete e3e32365d0 able to handle launcher login 2018-06-29 10:07:06 -04:00
Joshua Arts 056289789a add ability to launch through a loadbalanced bbb configuration 2018-06-29 09:24:25 -04:00
Joshua Arts f0ab2924db allow client to be determined by server 2018-06-27 17:53:11 -04:00
Josh ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
Josh c16197670b add ability to configure terms and conditions 2018-06-21 16:17:18 -04:00
Josh e1eca134fc minor fixes 2018-06-19 16:43:27 -04:00
Josh d1b81a385f add more model tests 2018-06-18 14:55:01 -04:00
Josh b2b2c641da add support for deploying to a subdirectory 2018-06-18 10:28:47 -04:00
Josh ce6ec0acfb fix logout route to not conflict with BBB 2018-06-15 16:21:00 -04:00
Josh 26a9f588a1 support postgres in production 2018-06-15 11:24:10 -04:00
Josh b81eadda8d production settings 2018-06-14 14:22:19 -04:00
Josh bc67d9e1e5 clean styling 2018-06-13 15:51:10 -04:00
Josh 7fadd6be69 seperate js in files 2018-06-13 14:43:08 -04:00
Josh bc9c2c1232 add ability to configure banner message 2018-06-13 09:55:34 -04:00
Josh 39b687a58f recording management 2018-06-12 14:36:35 -04:00
Josh 46bb456063 error pages and rec row 2018-06-11 17:32:08 -04:00
Josh 2b065eb7fa handle errors and fix join form 2018-06-11 13:05:54 -04:00
Josh 4f70c9a8e5 validate passwords and fix home 2018-06-08 14:44:08 -04:00
Josh 520c489e62 change /start to post 2018-06-07 16:57:56 -04:00
Josh 657feb777f signup and room waiting 2018-06-07 15:52:42 -04:00
Josh 56489ee6cd uncomment route 2018-06-06 14:57:08 -04:00
Josh d9a95ffc18 work on user settings 2018-06-04 15:58:59 -04:00
Josh 45fb18e609 add room functionality 2018-06-01 11:55:52 -04:00
Josh ede80075c1 redo rooms page 2018-05-31 15:04:18 -04:00
Josh 9e5250353b add room post 2018-05-29 17:08:38 -04:00
Josh de44d8024b room resources 2018-05-29 16:51:18 -04:00
Josh 32ec2bacce restructure app 2018-05-29 15:28:29 -04:00
Josh 0dce8d2bf5 continue front-end work 2018-05-25 11:55:48 -04:00
Josh 3dd7b33363 change rooms#index to rooms#show 2018-05-23 16:13:24 -04:00
Josh 434021239c sessions and fixes 2018-05-22 16:58:11 -04:00
Josh 6cdcd89387 reworking routes 2018-05-15 11:43:59 -04:00
Josh 1ddc3172eb one meeting per room 2018-05-14 14:28:18 -04:00
Josh 0f8a4734b2 add lb option 2018-05-11 15:57:31 -04:00
Josh b452932767 work on tests 2018-05-10 15:03:59 -04:00
Josh 5347d902c0 start writing tests 2018-05-09 16:31:52 -04:00
Josh 4037b6304e initial commit 2018-05-07 16:06:01 -04:00