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

553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jinesh
2603e945c8 GRN2-yyy: Added initial cloudbuild scripts (#581) 
* Initial cloudbuild scripts

* Update sample.env

* Update sample.env
 2019-06-25 13:01:01 -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
farhatahmad
7a3436cdea Added helpful message (#564) 2019-06-13 11:12:42 -04:00
farhatahmad
78c9903f7c GRN2-xx: Cleaned up Javascript Complaints from Scrutinizer (#557) 
* First step

* Fix flash issue
 2019-06-13 10:48:06 -04: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
Fred Dixon
36ad8f695a Update README.md 
Fix broken link to install page.
 2019-05-27 07:29:58 -04: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
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
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
9467f756e2 Added Indexs to improve db performance (#551) 2019-05-23 16:56:15 -04:00
farhatahmad
3e0238eb0c Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
farhatahmad
de1e75fbf8 Added check to emailer concern (#550) 2019-05-23 12:22:34 -04:00
farhatahmad
190fc57f5e Added a BigBlueButton error page (#548) 2019-05-23 09:36:28 -04:00
shawn-higgins1
c3d1ce3a04 Fix checkbox styling (#547) 2019-05-22 15:23:31 -04:00
farhatahmad
f7fef926f8 Merge pull request #545 from farhatahmad/v2.1.1 
GRN2-xx: Fixed Rubocop and Rspec
 2019-05-22 13:52:39 -04:00
farhatahmad
e90ca9cf48 Rspec and rubocop fixes 2019-05-22 13:51:55 -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
farhatahmad
996518eea7 Added filter for user role (#540) 2019-05-22 13:39:34 -04:00
shawn-higgins1
eac8290001 GRN2-148: Always check that email notifications are enabled before sending an email (#539) 
* Always check that email notificatiosn are enabled before sending an email

* Fix tests

* Fix formating

* Change to hardcoding the validation
 2019-05-22 13:38:34 -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
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