Commit Graph

561 Commits

Author SHA1 Message Date
jfederico 1a5cecc0c5 Merge branch 'master' into v2.1.1 2019-05-22 17:25:53 +00:00
Jesus Federico 661d6f9bdf
GRN2-149: Updated gems (#544)
* Updated gems
* Removed bundler updates from scripts
2019-05-22 13:20:39 -04:00
jfederico f2ea874801 Merge branch 'master' into v2.1.1 2019-05-22 16:36:28 +00:00
Jesus Federico 1fbd89d2fc
GRN2-149: Updated gems (#543)
* Updated gems
2019-05-22 12:34:42 -04:00
jfederico b971a6f6c2 Merge branch 'v2.1.1' of github.com:bigbluebutton/greenlight into v2.1.1 2019-05-22 16:05:18 +00:00
Jesus Federico be84e7e4ed
Updated Gemfile and scripts for supporting Heroku (#542)
* Include sqlite only for test and development

* Updated db config

* added assed precompile as a fallback for production

* restored some code from Gemfile

* Restored db settings

* Restored db settings

* Include sqlite for production in the docker image build

* Updated script for building image

* Updated script for building image

* Updated script for building image
2019-05-22 12:03:06 -04:00
shawn-higgins1 0360c78219 Revert "Notify admins when a approval/invite user signs up"
This reverts commit 251d85d88a.
2019-05-21 14:37:27 -04:00
shawn-higgins1 251d85d88a Notify admins when a approval/invite user signs up 2019-05-21 14:25:28 -04:00
farhatahmad 7dfab1482d GRN2-xx: Fixed issues with Greenlight ReadME (#537)
* Replaced Green Light with Greenlight

* Fixed docs links
2019-05-21 13:53:47 -04:00
transifex-integration[bot] 77f181fd71 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-21 13:46:37 +00:00
transifex-integration[bot] cf55847429 Translate /config/locales/en.yml in es
translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-05-21 13:45:41 +00:00
transifex-integration[bot] 4d5eec3174 Translate /config/locales/en.yml in it
translation completed for the source file '/config/locales/en.yml'
on the 'it' language
2019-05-21 09:36:32 +00:00
transifex-integration[bot] 7574bc482c Translate /config/locales/en.yml in it_IT
translation completed for the source file '/config/locales/en.yml'
on the 'it_IT' language
2019-05-21 09:36:16 +00:00
transifex-integration[bot] bf2ea7f9f2 Translate /config/locales/en.yml in it_IT
translation completed for the source file '/config/locales/en.yml'
on the 'it_IT' language
2019-05-21 09:33:15 +00:00
Fred Dixon f44b776d1e
Moving towards writing it as "Green Light" 2019-05-19 13:59:33 -04:00
farhatahmad 720dac6012 GRN2-6: Added the ability for admins to specify registration method (#520)
* Added the ability to invite users

* Small bug fix

* Added the ability to approve/decline users

* Small bug fixes

* More bug fixes

* More minor changes

* Final changes
2019-05-17 16:26:49 -04:00
Jesus Federico c42e4d960b
Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-17 14:50:26 -04:00
transifex-integration[bot] fb651e53f3 Translate /config/locales/en.yml in vi_VN
translation completed for the source file '/config/locales/en.yml'
on the 'vi_VN' language
2019-05-17 17:25:30 +00:00
farhatahmad adf4b68008 GRN2-139: Fixed issue with default bbb endpoint (#522)
* Fixed issue with default bbb endpoint

* Fixed issue with configuration rake task
2019-05-17 12:52:53 -04:00
farhatahmad c3ddb17514 GRN2-138: Fixed issue with admin rake task (#521)
* Fixed issue with admin rake task

* rspec
2019-05-17 12:49:42 -04:00
shawn-higgins1 4a4fcec6fb Add a colour picker that is consistent across all browsers (GRN2-96) (#518)
* sync

* Fix corruption

* Add back room.rb

* Line endings

* More line endings

* Add jQuery colour picker

* Remove inline styling
2019-05-17 12:28:58 -04:00
transifex-integration[bot] 64b1122550 Translate /config/locales/en.yml in zh_CN
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-05-15 12:25:39 +00:00
shawn-higgins1 23abdb52ee Add paging to Recordings Table (GRN2-26) (#512)
* Add translations for the validation messages

* Add translations for next/prev button

* Add paging to recordings

* sync

* Fix line endings
2019-05-14 09:01:41 -04:00
transifex-integration[bot] 52e628272b 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-14 04:23:14 +00:00
Rafael Baldasso Audibert d8f6c3f872 Added Google calendar button (#429)
* implement first version of the recording authentication, redirecting to the playback URL with the jwt token

* set default recording visibility by environment variable

* use the http header, if present, to determine the client ip address

* fix email verification when disabled

* revert playback component to link_to, change method to get

* remove unnecessary variable

* Added "Add to Google Calendar" button on Room page

* Added Google Calendar button enable to env.sample

* Updated CSS for the Google Calendar Button row

* Added correct translation when copying room link

* Fixed new Google Calendar button mobile display

* 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

* Update sample.env

* Update sample.env
2019-05-13 17:05:31 -04:00
transifex-integration[bot] d7b9e7a322 Translate '/config/locales/en.yml' in 'de_DE' (#517)
* Translate /config/locales/en.yml in de_DE

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

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

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

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

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

* 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-10 07:27:51 -04:00
Jesus Federico 2d03054e46
Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-09 18:29:24 -04:00
shawn-higgins1 55afbe99f5 Refactor users.html to only make one db call to get roles (GRN2-121) (#513)
* Refactor _users.html to only make one db call to get role

* Apply comments
2019-05-09 18:24:58 -04:00
farhatahmad 75bde6a42d GRN2-xx: Email and admin fix (#515)
* Email and admin fix

* Redirected super_admins to the admins page

* Small fix

* Update rooms_controller.rb
2019-05-09 18:07:17 -04:00
transifex-integration[bot] 31e27c983b 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-09 20:11:39 +00:00
shawn-higgins1 63ada8b3db Fixed #514: Fix UI issues with the create room modal (#516)
* sync

* Fix create room modal UI

* Fix line endings issues

* More line ending issues
2019-05-09 14:02:36 -04:00
transifex-integration[bot] bf6138d5bb Translate /config/locales/en.yml in zh_CN (#510)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-05-08 08:52:06 -04:00
transifex-integration[bot] acb0189d78 Translate /config/locales/en.yml in zh_CN
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-05-08 00:44:46 +00:00
transifex-integration[bot] 6d0f84877a Translate '/config/locales/en.yml' in 'de_DE' (#505)
* Translate /config/locales/en.yml in de_DE

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

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

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

* 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:21:17 -04:00
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