Commit Graph

240 Commits

Author SHA1 Message Date
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
John Ma ec250f3ed5 Fixed #291 Added OAuth2 for Office365 (GRN-32) (#293)
* <Added omniauth for office365>

* <Fixed code style>

* Update puma.rb

* <Inserted link to documentation>
2018-10-16 12:58:06 -04:00
Jesus Federico 90b965d03f
Workaround for issue with email notification (#297) 2018-10-15 15:55:29 -04:00
Bruck Wubete fd1b586c6e Fixed #266 Externalize version tag so it is based on GitHub tag when deployed to production (GRN-1) (#292)
* Update Jenkinsfile

* updating Jenkinsfile

* updating version in Jenkins

* Update version.rb
2018-10-12 16:11:22 -04:00
John Ma a9be611d00 Fixed #269 Add health-check endpoint (GRN-3) (#290)
* <Added health_check endpoint>

* <changed gemfile_lock>

* <fixed code style>

* <removed excess health_check routes>
2018-10-12 15:57:53 -04:00
Tyler Copeland cf2fac019e Updated styles for the Google Auth button (GRN-31) (#296)
* Greenlight landing page layout adjustments, general cleanup and responsive styles

* Text update Signup to Sign up

* Updated Google Sign in and Sign up styles

* no changes were made to sample env but needed to commit it

* minor padding update on the Google icon

* deleted Google Auth secrets from the sameple.env

* updated the if condition in new.html.erb

* <changed logic of button display>

* Update _login_modal.html.erb
2018-10-12 15:33:19 -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
John Ma 99fb4cc478 <Updated boostrap gem> (#288) 2018-10-09 16:07:50 -04:00
John Ma 967c805836 Fixed #267 Email verification feature (#268)
* <Implemented basic welcome email upon signup>

* <Added config option to enable>

* <Added verification link routing>

* <Added views for verify/resend and reconfigured routes>

* <Finished Verification System minus Rspec changes>

* <Fixed code style>

* <Modified dome rspec tests>

* <Switched sample env back to default>

* <Added test cases to increase code coverage>

* <Added test_helper>

* <Minor code changes>

* <Added requested changes>

* <Added requested changes>

* <see if this fixes migration>

* <see if this fixes migration>

* <fixed migrations>

* Delete .rake_tasks~

* Update _confirm_button.html.erb

* Update _resend_button.html.erb

* Update verify_email.html.erb

* Update verify_email.text.erb

* <Fixed bugs>

* <Added validation of verification link and fixed some code style>

* <Disabled updating email for omniauth>
2018-10-09 14:22:02 -04:00
John Ma daaf305c30 Fixed #272 Mocked up external server requests (#286)
* <Partially filled out the stub request>

* <Mocked requests to external servers>

* <Fixed style>

* Deleting rename.js

Accidentally slipped its way into the commit
2018-10-04 14:16:12 -04:00
John Ma 5c3fd15323 Fixed #283 (#284)
* <fixed translation errors>

* <fixed translation errors>

* <fixed translation errors>
2018-10-03 14:08:50 -04:00
John Ma 5c281a1a3f Fixes #278 (#282)
* <Fixed the main ui glitch>

* <Fixed issue>

* <Fixed code style>

* <Some more code style fixes>

* Update sessions_helper.rb
2018-10-03 11:42:14 -04:00
John Ma f0f0638be3 500 internal server error (fixes #277) (#279)
* <Fixed bug>

* <Fixed some errors>

* <fixed rspec tests>

* <Made requested changes>

* Delete search.js
2018-10-02 17:48:01 -04:00
John Ma dcd24d61be John fix issue#274 (#275)
* <fixed privacy policy errors>

* <Fixed code style>

* <Robustness changes>

* <redirect to 404 page if terms are disabled>

* <patched validation of accepted terms>

* <relaunching scrutinizer>
2018-10-02 10:23:09 -04:00
Tyler Copeland 423ec6c828 Greenlight landing page layout adjustments, general cleanup and responsive styles (#271) 2018-09-19 15:28:48 -04:00
jfederico c05d2e314d Fixed badge for coverage 2018-09-14 18:37:28 +00:00
John Ma d83ec1a027 Fix #260 issues with privacy policy (#261)
* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>
2018-09-14 14:33:58 -04:00
John Ma 4fb1a008ca Fixed #255
* <Fixed how uid was generated>

* <Fixed code style>

* <Removed unnecessary downcase call>
2018-09-12 17:03:01 -04:00
Jesus Federico 074a002abf
Added support for coveralls (#264) 2018-09-12 16:06:49 -04:00
John Ma 94d0d1acd7 John ui fix issue#256 (#257)
Greenlight Homepage should display "Welcome to BigBlueButton", "powered by Greenlight"
2018-09-11 13:40:07 -04:00
Calvin Walton d1ea30f94c
Merge pull request #258 from bruckwubete/patch-2
Update Jenkinsfile
2018-09-11 12:29:54 -04:00
Bruck Wubete 748f6c1f6a
Update Jenkinsfile 2018-09-11 12:20:22 -04:00
Joshua Arts 261c46c421
Merge pull request #254 from joshua-arts/more-locales
Add locales from Transifex.
2018-08-30 11:50:43 -04:00
Joshua Arts cb77c6b5af add ar, de, el and fr locales from transifex 2018-08-30 10:46:13 -04:00
Bruck Wubete e477948713 Update Jenkins File with github webhooks and slack notifications (#251)
* Update Jenkinsfile
2018-08-24 14:54:32 -04:00
Jesus Federico f6742fd440
removed Docker build step (#253) 2018-08-24 14:24:27 -04:00
Joshua Arts 1ae7996dd9
Merge pull request #249 from jfederico/transifex
Added translation to Spanish
2018-08-21 17:44:44 -04:00
Joshua Arts 8624b132a3
Merge pull request #250 from bruckwubete/staging
Added test stage to Jenkins CI
2018-08-21 16:15:17 -04:00
jfederico 7190779abb Added Spanish translation 2018-08-21 20:03:58 +00:00
bruckwubete ba50105dd9 resolve confict with master 2018-08-21 16:00:50 -04:00
bruckwubete 317e6e8cc5 update to add github trigger 2018-08-21 15:55:50 -04:00
bruckwubete 44a8e4ea97 Merge https://github.com/bigbluebutton/greenlight 2018-08-21 15:00:14 -04:00
Joshua Arts 81d460f1c2 fix before_filter deprecation warning 2018-08-21 14:54:52 -04:00
Joshua Arts ba4b7a018e make user_controller tests not env dependent 2018-08-21 13:52:20 -04:00
Joshua Arts 71395003c1 revert version 2018-08-21 13:28:56 -04:00
Joshua Arts 4c842c8e8d Merge branch 'master' of github.com:bigbluebutton/greenlight 2018-08-21 13:20:24 -04:00
Joshua Arts d7db798adc show placeholder when no participants field 2018-08-21 13:20:04 -04:00
Bruck Wubete 907b8e949e
Update Jenkinsfile 2018-08-21 08:04:41 -08:00
Bruck Wubete 810b62f66e
Added a Test stage 2018-08-21 07:56:52 -08:00
Bruck Wubete 3a97e91844
Remove unnecessary get pods command 2018-08-21 07:47:38 -08:00
Joshua Arts effcf89146
Merge pull request #248 from bruckwubete/master
Adding Jenkinsfile
2018-08-20 17:30:38 -04:00
bruckwubete 512892a6bc Adding Jenkinsfile to dockerignore 2018-08-20 17:23:07 -04:00
bruckwubete 3c28da67ac Squashed to 1 2018-08-20 17:20:27 -04:00
Joshua Arts a6fc8f0f2f fix stats format being removed 2018-08-20 14:53:14 -04:00
Joshua Arts a27fbec44a
Merge pull request #247 from britoederr/master
Brazilian Portuguese Translate
2018-08-20 10:32:35 -04:00
Éder Brito e7b97e3d67
Update application.rb 2018-08-20 11:04:16 -03:00
Joshua Arts ffcc841fe7
Merge pull request #246 from joshua-arts/disable-thumbnails-config
Add option to disable recording thumbnails.
2018-08-17 16:43:07 -04:00
Joshua Arts 0cf5baddb2 add option to disable recording thumbnails 2018-08-17 16:31:16 -04:00
Joshua Arts 04d07ee8d4
Merge pull request #245 from joshua-arts/bump-bigbluebutton-api-ruby
Bump bigbluebutton-api-ruby gem to 1.7.0.
2018-08-17 11:22:44 -04:00
Joshua Arts 1b204e7e7f bump bigbluebutton-api-ruby 2018-08-17 11:11:29 -04:00