Commit Graph

677 Commits

Author SHA1 Message Date
transifex-integration[bot] 284cd07fa5 Translate '/config/locales/en.yml' in 'es_MX' (#507)
* Translate /config/locales/en.yml in es_MX

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

* Updated es_MX locale file

* Added es locale file
2019-05-07 18:14:21 -04:00
Jesus Federico 7b19f8fa4f
Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-07 18:11:37 -04:00
farhatahmad 84d7d8992a Small bug fix (#508) 2019-05-07 18:11:13 -04:00
Jesus Federico 6acb924c38
Merge branch 'master' into translations_en-yml--master_es_MX 2019-05-07 18:10:24 -04:00
transifex-integration[bot] 7371cf50c2 Translate /config/locales/en.yml in es
translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-05-07 22:08:30 +00:00
jfederico c5bb915363 Added es locale file 2019-05-07 19:36:05 +00:00
jfederico 79161523dd Updated es_MX locale file 2019-05-07 19:34:45 +00:00
farhatahmad 2e064de0a9 GRN2-xx: Fixed minor issues related to deletes (#506)
* Minor fixes to improve quality

* Changed styling on login button
2019-05-07 14:53:29 -04:00
Jesus Federico 4fc5b26fe2
Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-07 14:25:05 -04:00
transifex-integration[bot] f48ce84e96 Translate /config/locales/en.yml in de_DE
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-05-07 18:20:47 +00:00
transifex-integration[bot] a252ccc05b Translate /config/locales/en.yml in es_MX
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
2019-05-07 18:08:59 +00:00
shawn-higgins1 b5aa7edd16 Fixed #500: Add translations for active record validations (GRN2-127) (#504)
* Add translations for the validation messages

* Add translations for next/prev button
2019-05-07 12:17:42 -04:00
transifex-integration[bot] 2866c16fe3 Translate /config/locales/en.yml in de_DE
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-05-07 15:35:33 +00:00
transifex-integration[bot] 2c36932ea7 Translate /config/locales/en.yml in de_DE
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-05-07 15:32:32 +00:00
farhatahmad 73f6ec846f Fixed recaptcha (#503) 2019-05-07 11:18:15 -04:00
transifex-integration[bot] 794754bba8 Translate /config/locales/en.yml in de_DE (#498)
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-05-07 09:22:45 -04:00
transifex-integration[bot] 48bd5ee8a4 Translate /config/locales/en.yml in zh_CN (#497)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-05-07 09:22:13 -04:00
farhatahmad 75f48f4979 GRN2-125: Added a configurable reCAPTCHA on sign up (#502)
* Added a configurable reCAPTCHA on sign up

* Added missing code
2019-05-07 09:21:04 -04:00
shawn-higgins1 f6dd3d34eb Add recording count to room delete (#501) 2019-05-07 09:07:16 -04:00
farhatahmad 91760d284b Added check to make sure user is signed in (#499) 2019-05-07 09:03:02 -04:00
Jesus Federico 9f74b0e2c0
Admin panel (#496)
* Added the administrator role and functionality that comes with it  (#403)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* 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

* Update user.rb

* Update admins.js

* GRN-15: Added the ability to change color and image from admin interface (#425)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* 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

* GRN-15: Added the ability for admins to customize color and image

* Update user.rb

* Update user.rb

* Update routes.rb

* Update admins_controller.rb

* GRN-87:Added a super admin role and made changes to how to the design works (#430)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* 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

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* Update user.rb

* Update themes_controller_spec.rb

* Update routes.rb

* Update admins_controller.rb

* Removed duplicated code that broke the build after last merge

* GRN-78: Restructured some of the views to make the UI more consistent and responsive (#435)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* GRN-78: Cleaned up buttons and moved signin to its own page

* GRN-78: Moved the Rooms and Recordings link to nav bar

* Merge fix

* Views restructure fix (#458)

* Added cache to gitlab-ci.yml

* Restructured seed

* GRN2-99 -> GRN2-106: UI cleanup and refactoring (#478)

* GRN2-98: Change Fullname to Full name

* GRN2-105: Changed View Users to Manage Users

* GRN2-101/103: Updated email to match branding

* GRN2-100: Updated Email Sent flash to be more descriptive

* GRN2-104: Redirect user to sign in page w/ flash after clicking activation link

* GRN2-102: Changed the wording in the verification email

* GRN2-99: Added email form validation

* GRN2-106: Cleaned up Users list front end

* Fixes to rake and admin password validator for passing rubocop

* GRN2-113: Fixed issues with admin panel (#479)

* GRN2-116: Code clean up after restructure of views (#482)

* Removed unused references

* Rubocop

* Added pagination to admin view (#483)

* GRN2-114: Added the ability for admins to ban/unban users (#487)

* Added the ability for admins to ban and unban users

* Update sessions_helper.rb

*  Merge branch 'master' into admin-panel  (#492)

* Updated rubocop gem

* Updated rubocop and fixed issues (#490)

* Rubocop fixes

* GRN2-122: Updated sign in flow for admins and switch design tab to site settings (#489)

* Switched design tab to site settings

* Update _header with spaces instead of tabs

* Added more test cases to increase coverage (#494)
2019-05-03 13:05:12 -04:00
transifex-integration[bot] b9efff586a Translate /config/locales/en.yml in zh_CN (#495)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-05-03 09:03:02 -04:00
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