lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
473 Commits 7 Branches 0 Tags 24 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
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 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
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
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
farhatahmad 9e0a7b513f Removed the Oops from the string (#578) 2019-06-25 22:06:15 -04:00
farhatahmad 3aaa735934 Removed env variable from name (#580) 2019-06-25 16:51:52 -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
transifex-integration[bot] c5e020e90d Translate /config/locales/en.yml in de_DE 
translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language
 2019-06-13 14:46:50 +00:00
transifex-integration[bot] 157915a235 Translate /config/locales/en.yml in hu_HU 
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language
 2019-06-13 14:36:13 +00:00
farhatahmad cb939735bc Fixed string for user demoted email (#556) 2019-06-13 10:32:18 -04:00
transifex-integration[bot] 92a6db1a25 Translate /config/locales/en.yml in zh_CN 
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language
 2019-06-10 10:32:08 +00:00
transifex-integration[bot] d85d7b38b0 Translate /config/locales/en.yml in hu_HU 
translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language
 2019-06-06 08:26:37 +00:00
transifex-integration[bot] a682dbcfc8 Translate /config/locales/en.yml in fa_IR 
translation completed for the source file '/config/locales/en.yml'
on the 'fa_IR' language
 2019-06-01 05:49:16 +00:00
transifex-integration[bot] ccea24ce6c 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-24 18:31:53 +00:00
farhatahmad 006a2029dd
Bug fixes related to banned users (#554) 2019-05-23 18:31:01 -04:00
farhatahmad 990f72ebf4
Fixed issues with endpoint and conf check (#553) 2019-05-23 17:08:43 -04:00
farhatahmad 3e0238eb0c
Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
farhatahmad 190fc57f5e Added a BigBlueButton error page (#548) 2019-05-23 09:36:28 -04:00
shawn-higgins1 70acb9a7e1 GRN2-118: Create a setting to require authentication to join a room (#541) 
* Create a setting to require authentication to join a room

* Apply comments
 2019-05-22 13:44:40 -04:00
shawn-higgins1 f88d67f6fb GRN2-6: Notify admins when a approve/invite user signs up (#538) 
* Notify admins when a approve/invite user signs up

* Fix formating

* Uses admins_url variable
 2019-05-22 13:38:00 -04:00
shawn-higgins1 83a9edf81d GRN2-140: Added Email to inform user they've been promoted (#534) 
* Added Email to inform user they've been promoted

* Update user_mailer.rb

* Send email when a user is demoted

* Change more-info string
 2019-05-22 13:36:33 -04:00
farhatahmad 9638ebcbc5 GRN2-134: Added Color Input for lighten and darken (#529) 
* Added Color Input for lighten and darken

* rspec
 2019-05-22 13:34:37 -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
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] 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
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