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

1024 Commits

Author SHA1 Message Date
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
Joshua Arts 4434c31fed
Merge pull request #243 from joshua-arts/temp-stats-rec-fix 
Fix error when loading recordings that contain "statistics" format.
 2018-08-16 14:39:58 -04:00
Joshua Arts f58d76c5ef prevent from grabbing length from stats format 2018-08-16 14:30:49 -04:00
Joshua Arts efc2e3ab17
Merge pull request #242 from bigbluebutton/escape-uid-url 
Escape room uid when generating invite path.
 2018-08-16 13:33:44 -04:00
Joshua Arts f8af2fc3bf escape uid in invite path 2018-08-16 13:25:32 -04:00
Joshua Arts 0d1df083d9
Merge pull request #241 from bruckwubete/master 
fix force ssl logic for lb configuration
 2018-08-15 12:08:10 -04:00
bruckwubete 0d252add03 linting 2018-08-15 11:49:13 -04:00
bruckwubete 66ff9c7a2f fix force ssl logic for lb configuration 2018-08-15 11:45:37 -04:00
Éder Brito 7b65b04d9b
Brazilian Portuguese Translate 2018-08-14 11:08:06 -03:00
Éder Brito f742e1af78
Brazilian Portuguese Translate 2018-08-13 15:40:38 -03:00
Éder Brito e98037fd64
Update application.rb 2018-08-13 15:39:31 -03:00
Joshua Arts f0610f363d add option to force ssl 2018-08-02 14:58:20 -04:00
Joshua Arts 8ff0018eac allow for production cable config 2018-08-02 14:08:13 -04:00
Joshua Arts fc0ecc1bb9
Merge pull request #233 from joshua-arts/license 
Add LGPL 3.0 License.
 2018-08-01 10:03:34 -04:00
Joshua Arts 562e84fc0d add LICENSE file 2018-08-01 09:49:05 -04:00
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Joshua Arts b8e3045b30 fix start indentation 2018-07-30 15:42:45 -04:00