Commit Graph
93 Commits
Author SHA1 Message Date
Jesus Federico 6bc43d8e52 Revert "Bump rack from 2.0.7 to 2.0.8 (#914)" (#915)
This reverts commit 315a83957e.
2020-01-09 11:11:39 -05:00
jfederico c708f19f10 Patch on start script for validating the existentce of the database 2019-12-03 14:11:30 -05:00
Jesus Federico 5a18da1a2f Update start 2019-11-28 16:43:17 -05:00
Jesus Federico cf5a873493 Updated script for start (#839) 2019-10-15 12:58:11 -04:00
Jesus Federico 7854485534 Updated script for start (#838) 2019-10-15 12:15:45 -04:00
jfederico 9967e276c0 Fixed script so the releases for alpha and beta are not built as latest 2019-09-23 17:03:36 +00:00
jfederico b2f2e73bbc Merge branch 'v2.4-beta' 2019-09-20 16:23:21 +00:00
jfederico ec47225abd Replaced tocken for slack notifications on travis 2019-09-20 15:56:45 +00:00
Jesus Federico 1eddd564d5 Revert "GRN2-xx: Migration Error now returns 500 and added the option to disable cache (#770)" (#774)
This reverts commit 9bd5a659d5.
2019-08-29 12:08:28 -04:00
jfederico 459d0ed582 Reverted 500 error on migration failed 2019-08-29 14:03:07 +00:00
Jesus Federico 4d69d06ba1 GRN2-ZZZ: Added messages for debugging actioncable (#731)
* GRN2-ZZZ: Added messages for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* Log unsubscribe
2019-08-09 12:07:38 -04:00
jfederico 2775b18993 Merge branch 'v2' 2019-07-29 14:30:30 +00:00
Jesus Federico f7c88cfc6a Merge branch 'v2.2.1-alpha' into master 2019-07-23 15:57:08 -04:00
jfederico 5ecb3e419e Merge branch 'master' into v2.2.1-alpha 2019-07-12 20:37:52 +00:00
Jesus Federico 65270bdbb0 Update en.yml 2019-07-12 11:15:02 -04:00
Jesus Federico 5a8758d396 Merge pull request #621 from bigbluebutton/v2.2-alpha
v2.2-alpha release
2019-07-10 12:07:22 -04:00
jfederico 09afd9154f Updates to Gemfile for custom gems 2019-07-10 13:40:21 +00:00
Jesus Federico a3158b5872 GRN2-178: Generalized use of language_name based on Mozilla Mapping (#613)
* GRN2-178: Generalized use of language_name based on Moxilla Mapping

* Fixed issues catched by rubocop

* MAke sure the file with data exists

* Removed language mapping from local code
2019-07-09 12:24:30 -04:00
Jesus Federico efe0e70b03 Reorganized docker-contrib.yml (#585) 2019-06-26 10:54:03 -04:00
Jesus Federico d985681e0d Fixed script for building docker image (#575) 2019-06-21 10:34:56 -04:00
Jesus Federico a0a99b34c2 GRN2-159: Changed the inception of the version tag (#574)
* GRN2-159: Changed the inception of the version tag

* GRN2-159: Restored TRAVIS_BRANCH

* Relocated ARG aNV for version in Dockerfile
2019-06-21 10:15:10 -04:00
Jesus Federico f5c33e9306 GRN2-159: Changed the inception of the version tag (#573) 2019-06-21 09:36:52 -04:00
jfederico 790a0365c5 Merge branch 'translations_en-yml--master_es' 2019-06-13 15:24:37 +00:00
jfederico d11dc42f85 Merge branch 'translations_en-yml--master_zh_CN' 2019-06-13 15:21:45 +00:00
jfederico b5958834b2 Merge branch 'translations_en-yml--master_vi_VN' 2019-06-13 15:20:11 +00:00
jfederico ce819b6929 Merge branch 'translations_en-yml--master_it_IT' 2019-06-13 15:19:59 +00:00
jfederico f95f08e5c2 Merge branch 'translations_en-yml--master_it' 2019-06-13 15:19:54 +00:00
jfederico 6e4925ecdf Merge branch 'translations_en-yml--master_hu_HU' 2019-06-13 15:19:42 +00:00
jfederico 9cf9e9f23d Merge branch 'translations_en-yml--master_fa_IR' 2019-06-13 15:19:26 +00:00
jfederico 30c3a5a10a Merge branch 'translations_en-yml--master_es_MX' 2019-06-13 15:19:07 +00:00
jfederico 3a7fc56bd2 Merge branch 'translations_en-yml--master_de_DE' 2019-06-13 15:16:06 +00:00
jfederico e1fc628202 Add settings for postgres 2019-05-24 15:54:20 +00:00
Jesus Federico 98395328b2 Merge pull request #555 from bigbluebutton/alpha-2.1.1
Alpha 2.1.1
2019-05-24 11:49:59 -04:00
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
Jesus Federico c42e4d960b Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-17 14:50:26 -04:00
Jesus Federico 2d03054e46 Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-09 18:29:24 -04:00
Jesus Federico 7b19f8fa4f Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-07 18:11:37 -04:00
Jesus Federico 6acb924c38 Merge branch 'master' into translations_en-yml--master_es_MX 2019-05-07 18:10:24 -04: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
Jesus Federico 4fc5b26fe2 Merge branch 'master' into translations_en-yml--master_de_DE 2019-05-07 14:25:05 -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
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
jfederico 8e731e878b Merge branch 'master' of github.com:bigbluebutton/greenlight 2019-05-01 20:54:36 +00: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
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
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
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
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
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
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
Jesus Federico 08f6f32779 Persist password (#393)
* never hold the owner of the room on the waiting screen

* persist room passwords so we can always call create meeting, even if it's already running, to avoid any inconsistency or race condition when joining a meeting

* Fixed issues in migration, room attribute updates, random_password and tests
2019-03-12 17:54:57 -04:00
Jesus Federico 37af17fae1 Revert "Redirecting the user to the referrer on login success/fail (#374)" (#389)
This reverts commit 404134aa8d.
2019-03-05 14:45:42 -05:00
Jesus Federico 49779b2dd1 Updated bootstrap and sqlite3 in order to solve some concerns with security (#385) 2019-03-04 16:54:11 -05:00
Jesus Federico a0036e244b CI Updates (#386)
* Fixed issue with pushing build to dockerhub

* Fixed issue with pushing build to dockerhub
2019-02-28 11:54:08 -05:00
Jesus Federico 5553a8ffaa Updated internal documentation (#384) 2019-02-27 14:10:19 -05:00
Jesus Federico 6ebdd43709 New updates to scripts for travis (#381) 2019-02-26 09:34:51 -05:00
Jesus Federico fff8a52cc2 Updated scripts for CI (#380) 2019-02-25 15:33:05 -05:00
Jesus Federico 7429349d3b GRN-37: Externalized scripts for building/deploying docker images though CI (#375) 2019-02-22 13:11:15 -05:00
Jesus Federico 56a72ade9d Completed fix for the specs (#343) 2019-01-18 10:29:06 -05:00
Jesus Federico 4d9d0ebb97 GRN-46: Scoped user email uniqueness validation (#342)
* Scoped user email uniqueness validation

* Scoped user email uniqueness validation

* Scoped user email uniqueness validation

* Extended User test for check email scope
2019-01-17 16:27:50 -05:00
jfederico e915aba9db Updates to specs 2019-01-09 22:01:19 +00: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 5174bf1c1e Added step for precompiling assets (#302) 2018-10-17 14:40:55 -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
Jesus Federico de5bbc44f2 Shortened commit tag used for build version (#299) 2018-10-16 14:58:52 -04:00
Jesus Federico 1617b7dba1 Helper scripts (#298)
* Added helper scripts

* Added commit tag to version tag to builds from master

* Restored script for Travis

* Restored script for Jenkins

* Restored script for Jenkins

* Restored script for Jenkins
2018-10-16 14:28:21 -04:00
Jesus Federico 90b965d03f Workaround for issue with email notification (#297) 2018-10-15 15:55:29 -04:00
Jesus Federico a2ffd74042 Fixed room view broken when no format presentation is included (GRN-34) (#289) 2018-10-09 16:16:27 -04:00
jfederico c05d2e314d Fixed badge for coverage 2018-09-14 18:37:28 +00:00
Jesus Federico 074a002abf Added support for coveralls (#264) 2018-09-12 16:06:49 -04:00
Jesus Federico f6742fd440 removed Docker build step (#253) 2018-08-24 14:24:27 -04:00
jfederico 7190779abb Added Spanish translation 2018-08-21 20:03:58 +00:00