Commit Graph

503 Commits

Author SHA1 Message Date
Jinesh edc29ede02 added cache layer to cloudbuild (#672) 2019-07-22 12:20:59 -04:00
Anton Georgiev eb723be3d3
Merge pull request #655 from farhatahmad/2.2.0-hotfix
GRN2-205: Fixed issue with https redirect
2019-07-17 14:14:38 -04:00
farhatahmad 56be3a5b13 Removed left over testing code 2019-07-17 14:08:30 -04:00
farhatahmad 347ed2bdc1 Fixed issue with https redirect 2019-07-17 14:05:28 -04:00
transifex-integration[bot] 31b5e96ba6 Translate '/config/locales/en.yml' in 'pt_BR' (#645)
* Translate /config/locales/en.yml in pt_BR

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

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

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language
2019-07-12 11:37:13 -04:00
transifex-integration[bot] 979f8d172d Translate '/config/locales/en.yml' in 'de_DE' (#644)
* 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

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

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-07-12 11:36:53 -04:00
transifex-integration[bot] 506b44f80a Translate '/config/locales/en.yml' in 'pl_PL' (#643)
* Translate /config/locales/en.yml in pl_PL

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'pl_PL' language
2019-07-12 11:36:15 -04:00
transifex-integration[bot] bef6083e84 Translate '/config/locales/en.yml' in 'es_MX' (#642)
* 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_MX

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
2019-07-12 11:35:50 -04:00
transifex-integration[bot] 860a8a2f91 Translate '/config/locales/en.yml' in 'es' (#641)
* 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 es

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-07-12 11:35:37 -04:00
Jesus Federico 65270bdbb0
Update en.yml 2019-07-12 11:15:02 -04:00
transifex-integration[bot] 5e3809b35e Translate /config/locales/en.yml in pt_BR (#640)
translation completed for the source file '/config/locales/en.yml'
on the 'pt_BR' language
2019-07-12 11:08:40 -04:00
transifex-integration[bot] 7501be3bbc Translate /config/locales/en.yml in pl_PL (#639)
translation completed for the source file '/config/locales/en.yml'
on the 'pl_PL' language
2019-07-12 11:08:01 -04:00
transifex-integration[bot] 3c01bfcdaa Translate '/config/locales/en.yml' in 'de_DE' (#632)
* 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-07-11 14:29:45 -04:00
shawn-higgins1 85da83f8b0 Fix office365 if hd environment variable isn't set (#629) 2019-07-11 11:14:43 -04:00
transifex-integration[bot] eb82425747 Translate '/config/locales/en.yml' in 'de_DE' (#625)
* 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-07-11 09:06:30 -04:00
farhatahmad ea759d551c GRN2-195: Fixed issues with turbolinks caching (#626)
* Fixed issues with turbolinks caching

* Updated string for twitter flash
2019-07-11 08:54:52 -04:00
transifex-integration[bot] 355bee8059 Translate /config/locales/en.yml in sv_SE (#590)
translation completed for the source file '/config/locales/en.yml'
on the 'sv_SE' language
2019-07-10 14:00:56 -04:00
transifex-integration[bot] 026bb2794e Translate '/config/locales/en.yml' in 'zh_CN' (#592)
* 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-07-10 14:00:38 -04:00
transifex-integration[bot] 92f4dd613c Translate /config/locales/en.yml in hu_HU (#591)
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language
2019-07-10 13:39:54 -04:00
transifex-integration[bot] 3b1cd41ae2 Translate '/config/locales/en.yml' in 'es' (#624)
* 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 es

translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-07-10 13:34:47 -04:00
transifex-integration[bot] 1af434cd21 Translate /config/locales/en.yml in ar (#595)
translation completed for the source file '/config/locales/en.yml'
on the 'ar' language
2019-07-10 13:26:30 -04:00
transifex-integration[bot] 43ba3dff86 Translate '/config/locales/en.yml' in 'es_MX' (#622)
* 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_MX

translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
2019-07-10 13:26:05 -04:00
shawn-higgins1 bc78feb0bd Fix spelling error (#623) 2019-07-10 13:11:23 -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
farhatahmad c7a0c6a463 GRN2-192: Made error pages more descriptive (#620)
* GRN2-192

* Brought back error codes
2019-07-10 11:51:19 -04:00
shawn-higgins1 523d9a38f2 GRN2-30: Add custom ldap sign in page (#619)
* Add custom ldap signin page

* Remove old omniauth-ldap gem

* Use new bn gems
2019-07-10 11:26:43 -04:00
jfederico 09afd9154f Updates to Gemfile for custom gems 2019-07-10 13:40:21 +00:00
farhatahmad f1b4089d15 Added fix for room limit (#618) 2019-07-09 17:05:04 -04:00
farhatahmad 338953d728 Replaced old colour picker with a cleaner one (#617) 2019-07-09 17:03:18 -04:00
shawn-higgins1 2a96269d44 GRN2-175: Update Greenlight to work with the new launcher (#614)
* Update greenlight to support the new launcher

* Update comments to indicate that checksum should eventually be removed

* Fix spelling mistake

* Fix rubocop

* Missed variable name change

* Support old environment variable
2019-07-09 16:46:25 -04:00
shawn-higgins1 fc18976b6d GRN2-107: Add office365 auth (#616)
* add office365 auth

* Delete conflicting file
2019-07-09 13:54:15 -04:00
shawn-higgins1 40b05b1626 GRN2-155: Begin preparing for removal of Twitter accounts (#615)
* Add twitter deprecation message

* Fix rspec test

* Extract room switch to its own method

* update method name
2019-07-09 13:06:07 -04: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
farhatahmad 5d4bd1b851 GRN2-174: Added 404 if user does not exist (#609)
* Added 404 if user does not exist

* Differentiated between 404 and 500

* Rspec fixes
2019-07-09 11:00:33 -04:00
farhatahmad e4f50026f1 Added setting for admin to limit the number of rooms for the user (#607) 2019-07-09 10:56:06 -04:00
farhatahmad 4f2b190239 Small updates to ReadMe to better match the current state of Greenlight (#612) 2019-07-08 13:23:20 -04:00
farhatahmad 315bb1af1c Added a max-width to the email column in the manage users table (#611) 2019-07-08 09:12:46 -04:00
farhatahmad f6bd959c4c GRN2-135: Limit Jquery version in Gemfile (#610)
* Limit Jquery version in Gemfile

* Fixed issue with lock file
2019-07-08 09:08:39 -04:00
farhatahmad cb2587a6c6 Added the missing model attribute strings (#604) 2019-07-08 09:07:24 -04:00
farhatahmad 0fc85636f1 Removed duplicate keys in en.yml file (#603) 2019-07-08 09:04:24 -04:00
farhatahmad 7828c15286 GRN2-166: Fixed issue with language fallback not working (Fixed #593) (#602)
* Fixed issue with language fallback not working

* Rubocop fixes
2019-07-08 09:02:34 -04:00
shawn-higgins1 e153528fcc GRN2-162: Revert to sqlite in docker compose (#594)
* Revert to sqlite

* Missed uncomenting sqlite volume

* Update sample.env
2019-06-28 16:40:19 -04:00
farhatahmad 98f7afb9a1 Fixed issue with user list (#589) 2019-06-28 16:06:21 -04:00
transifex-integration[bot] ce2c9c1822 Translate /config/locales/en.yml in de_DE (#583)
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
2019-06-26 12:15:31 -04:00
transifex-integration[bot] 20b1e3b45a Translate /config/locales/en.yml in es_MX (#587)
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language
2019-06-26 12:15:12 -04:00
transifex-integration[bot] b8c19cef05 Translate /config/locales/en.yml in es (#586)
translation completed for the source file '/config/locales/en.yml'
on the 'es' language
2019-06-26 11:37:30 -04:00
Jesus Federico efe0e70b03
Reorganized docker-contrib.yml (#585) 2019-06-26 10:54:03 -04:00
shawn-higgins1 ccbd46f045 Improve container build: GRN2-156 (#582)
* Cache gems

* Remove debug statement

* Use postgress by default

* Update sample.env
2019-06-26 10:15:53 -04:00
transifex-integration[bot] 18214037c3 Translate /config/locales/en.yml in zh_CN (#572)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
2019-06-25 22:44:42 -04:00
farhatahmad bb17771a03 Removed recording warning on room delete if there are no recordings (#577) 2019-06-25 22:34:16 -04:00