Commit Graph

455 Commits

Author SHA1 Message Date
farhatahmad a0c99dde47 Updated rubocop and fixed issues (#490) 2019-05-02 15:44:00 -04:00
jfederico bc57caa806 Updated rubocop gem 2019-05-02 14:34:37 +00:00
jfederico fe5a567788 Merge branch 'master' of github.com:bigbluebutton/greenlight 2019-05-01 21:05:40 +00:00
transifex-integration[bot] 3473069bda Translate /config/locales/en.yml in pt_BR (#484)
translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language
2019-05-01 17:01:53 -04:00
jfederico 8e731e878b Merge branch 'master' of github.com:bigbluebutton/greenlight 2019-05-01 20:54:36 +00:00
farhatahmad 4896133d58 Added signup_url to list of urls not to redirect to (#481) 2019-05-01 16:53:47 -04:00
farhatahmad 57c49ca8f4 Fixed #486: Allow users to sign in if ALLOW_GREENLIGHT_ACCOUNTS=false (#480)
* Allow local users to sign in when sign up is turned off

* Update _header.html.erb
2019-05-01 16:29:53 -04:00
jfederico 63a6cdb28b Removed rubocop.yml so the default is loaded 2019-05-01 19:30:23 +00:00
Jesus Federico bba42bb708
Update .rubocop.yml 2019-05-01 15:14:58 -04:00
Jesus Federico c5b5d1e445
Update .rubocop.yml 2019-05-01 14:49:53 -04:00
transifex-integration[bot] 84caa20078 Translate /config/locales/en.yml in pt (#485)
translation completed for the source file '/config/locales/en.yml'
on the 'pt' language
2019-05-01 11:32:58 -04:00
transifex-integration[bot] 327da4d503 Translate /config/locales/en.yml in de_DE (#477)
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-04-22 11:40:34 -04:00
Jesus Federico 1c160a8b27
Translate /config/locales/en.yml es, es_MX, fr (#476)
* Translate /config/locales/en.yml in es_MX

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

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

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

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

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

* Restored es file
2019-04-22 10:37:46 -04:00
transifex-integration[bot] aac0696e02 Translate /config/locales/en.yml in hi_IN (#472)
translation completed for the source file '/config/locales/en.yml'
on the 'hi_IN' language
2019-04-22 09:59:51 -04:00
Rafael Baldasso Audibert 32bbc80415 Added Record type/format I18n (#471)
* 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

* Added I18n for recording types/formats
2019-04-22 09:17:37 -04:00
Jesus Federico 9b2424cde0
GRN2-112: Default language fallback fails with a 500 error (#469)
* GRN2-112: Default language fallback fails with a 500 error

* Updates for passing rspec tests

* Added cache for gitlab ci

* Updated cache for gitlab

* Restored Dockerfile

* Fixed glitch in filter for build and deployment
2019-04-17 15:33:38 -04:00
Jesus Federico c8a799bce8
HOT-FIX: Issue with changes with the language file name (#466)
* HOT-FIX: Issue with changes with the language file name

* Rubocop!
2019-04-16 17:08:17 -04:00
Jesus Federico 5ff41d0590
Allow multiple as host_url (#465) 2019-04-16 09:28:30 -04:00
transifex-integration[bot] 751aecf360 Translate '/config/locales/en.yml' in 'zh_CN' (#464)
* Translate /config/locales/en.yml in zh_CN

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-04-16 09:21:31 -04:00
Jesus Federico 56fe9d3640
Update README.md 2019-04-15 11:27:09 -04:00
Jesus Federico 1d2cbf6871
Updates to translations for pt_BR, pt, fr, ar (#463) 2019-04-15 09:16:11 -04:00
transifex-integration[bot] b7ae2e591c Translate /config/locales/en.yml in es_MX (#456)
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
2019-04-12 13:29:26 -04:00
transifex-integration[bot] d43229af7e Translate /config/locales/en.yml in es (#457)
translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-04-12 13:29:07 -04:00
transifex-integration[bot] 6d04198918 Translate /config/locales/en.yml in de_DE (#455)
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-04-12 11:14:41 -04:00
farhatahmad 6bd5d81697 Fix issue with flash messages and activation link (#454) 2019-04-11 14:31:45 -04:00
transifex-integration[bot] c595ba9895 Translate /config/locales/en.yml in zh_CN (#452)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-04-11 13:20:59 -04:00
farhatahmad a14007743f Users are redirected to the url they clicked login/signup from (#446) 2019-04-11 12:45:43 -04:00
farhatahmad d39a11059e Fixed #366: Changed how GreenLight handles LDAP jpegPhoto (GRN-92) (#445)
* Fixed issue with LDAP jpegPhoto

* Update _header.html.erb
2019-04-11 11:53:32 -04:00
Rafael Baldasso Audibert 822dd27509 Added mailer i18n (#436)
* Added mailer i18n

* Added translation to mailer in the JS

Also added a generic way to add JS translation through a javascript entry in the locale file

* Moved line-breaks from translations to JS file
2019-04-11 11:30:50 -04:00
farhatahmad 88776eaadb GRN-88: Fixed some things that Scrutinizer was complaining about (#433)
* Scrutinizer fixes

* Moved helper code to concern

* Another scrutinizer fix

* User controller conflict fix

* Another user controller fix

* Added include verifier
2019-04-11 10:25:49 -04:00
farhatahmad 5e3aa72955 GRN-85-fix: Fix for endpoint auto completion (#451)
* Fix for endpoint auto completion

* Update application.rb

* Update application.rb
2019-04-11 10:07:35 -04:00
farhatahmad f6715b83ae Join meeting name is now stored in a session cookie (#432) 2019-04-10 17:06:19 -04:00
farhatahmad 4d648534f7 Fixed #398 Fixed issue with recording length and sort (GRN-83) (#426)
* Fixed issue with recording length and sort

* Made js run on any page with a table element on it

* Scrutinizer fix
2019-04-10 16:32:28 -04:00
farhatahmad 95a98f6574 Added check for bigbluebutton/ for endpoint config (#408) 2019-04-10 16:04:59 -04:00
Jesus Federico dd4629908c
GRN-93: Get rid of false positive exception in production logs (#450) 2019-04-10 15:10:55 -04:00
Jesus Federico a7d307aec1
GRN-93: Get rid of false positive exception in production logs (#449) 2019-04-10 13:55:34 -04:00
Jesus Federico 3dea09ee9b
GRN-94: Make sure reset-password also works on non-verified accounts (#448)
* Fix for issue with excesive requests to lb

* Fixed issue with rspec on users not passing when run alone

* Include dotenv in production

* GRN-94: Make sure reset-password also works on non-verified accounts
2019-04-10 10:56:01 -04:00
Jesus Federico 2b0301da38
GRN-93: Fix for issue with excesive requests to LB (#447)
* Fix for issue with excesive requests to lb

* Fixed issue with rspec on users not passing when run alone

* Include dotenv in production
2019-04-10 10:12:32 -04:00
Jesus Federico c07cfd0d93
GRN-80: Patch for fixing the added function in a production environment (#444)
* Patch for fixing the added function in a production environment

* Rubocop!
2019-04-09 11:22:55 -04:00
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