Commit Graph

340 Commits

Author SHA1 Message Date
Joshua Arts 7c0c944cb4
Merge pull request #224 from joshua-arts/localization
Add localisation support.
2018-07-19 16:10:33 -04:00
Joshua Arts c5cfc621ca localize controllers 2018-07-19 16:04:08 -04:00
Joshua Arts ce4c8b3bff localize views 2018-07-17 11:57:49 -04:00
Joshua Arts 55b83226c9 detect users preferred language 2018-07-13 11:04:32 -04:00
Joshua Arts 29e273f5a1
Merge pull request #223 from bigbluebutton/settings-fix
Fix Greenlight accounts unable to update settings.
2018-07-13 10:35:19 -04:00
Joshua Arts a6b05f5fd3 fix gl accounts unable to update settings 2018-07-13 10:21:32 -04:00
Joshua Arts 8089decc17 ignore bundler files 2018-07-12 17:42:20 -04:00
Joshua Arts f5ab362f96 add ability for custom branding images 2018-07-11 15:33:35 -04:00
Joshua Arts 20a2c570ba
Merge pull request #222 from bruckwubete/bn_launcher_integration
Bn launcher integration
2018-07-11 15:03:29 -04:00
bruckwubete 01ea22ed6d removed OpenSSL::SSL::VERIFY_PEER assignment 2018-07-11 14:57:00 -04:00
bruckwubete b7801f9874 adding DB_ADAPTER check 2018-07-11 13:19:20 -04:00
Joshua Arts 1412b39620 skip cleanup and minor fixes 2018-07-11 10:23:16 -04:00
bruckwubete cec4393837 rubocop fixes 2018-07-10 16:05:37 -04:00
bruckwubete f36741f131 added specs for bn-launcher 2018-07-10 16:00:57 -04:00
Joshua Arts 4394b0b6e7 add rspec command to travis 2018-07-10 15:16:35 -04:00
bruckwubete 278df69c55 Merge branch 'master' into bn_launcher_integration 2018-07-10 15:07:37 -04:00
bruckwubete c5a1f3bbce Merge branch 'master' of https://github.com/bigbluebutton/greenlight 2018-07-10 15:07:11 -04:00
bruckwubete 91644281c4 fixing rubocop errors 2018-07-10 15:05:50 -04:00
Joshua Arts 047edbd6e8 disable travis email notifications 2018-07-10 14:52:58 -04:00
bruckwubete 407e8ee13c made omniauth-bn-launcher public 2018-07-10 13:54:45 -04:00
bruckwubete 137b8450a8 adding checksum. using customer name as the provider 2018-07-10 12:11:00 -04:00
Joshua Arts 121ec4b3f7
Merge pull request #221 from bigbluebutton/travis-rubocop
Add Travis CI.
2018-07-10 12:04:55 -04:00
Joshua Arts 51c3ae9807 add slack notifications and deploy to travis 2018-07-10 11:54:19 -04:00
Joshua Arts 6b118ce933 exclude vendor from rubocop 2018-07-09 16:59:20 -04:00
Joshua Arts 19ffe483c6 add rubocop to travis config 2018-07-09 16:41:49 -04:00
Joshua Arts 3b985a6dbb add travis.yml 2018-07-09 16:10:11 -04:00
bruckwubete 0d2a5a4c90 small fixes 2018-07-09 16:00:10 -04:00
Joshua Arts fa5f27d17f remove outdated #home test 2018-07-09 15:17:23 -04:00
bruckwubete 590e189474 Merge branch 'master' into bn_launcher_integration 2018-07-09 13:20:34 -04:00
bruckwubete 68d61d115c Merge branch 'master' of https://github.com/bigbluebutton/greenlight2 2018-07-09 13:19:59 -04:00
bruckwubete 67c32a396f passing params to the launcher gem 2018-07-09 13:17:23 -04:00
Joshua Arts 60a5b57121 add stay on 1.0 link 2018-07-06 12:12:27 -04:00
Joshua Arts cbdf32e7b1
Merge pull request #4 from bigbluebutton/easy-upgrading
Make upgrading from 1.0 easier.
2018-07-06 11:44:08 -04:00
Joshua Arts 8647993443 fix docker-compose org 2018-07-06 11:42:50 -04:00
Joshua Arts e2ad6e7715 make upgrading from 1.0 easier 2018-07-05 17:25:59 -04:00
bruckwubete 930ed809f5 pass github token as runtime arg 2018-07-04 17:06:52 -04:00
bruckwubete adeb844918 Merge branch 'bn_launcher_integration' of https://github.com/bigbluebutton/greenlight2 into bn_launcher_integration 2018-07-04 15:36:06 -04:00
Joshua Arts fd1b550f93
Merge pull request #2 from bigbluebutton/release_recommendations
Final tweaks and getting ready for release.
2018-07-04 15:29:42 -04:00
bruckwubete b51ac6aa7c reverting unnecessary changes 2018-07-04 15:24:01 -04:00
Joshua Arts 8a9f2a3cc2 multiple fixes and tweaks 2018-07-04 15:22:59 -04:00
bruckwubete 3bb0c26f33 clean up for PR 2018-07-04 15:20:21 -04:00
Joshua Arts 21e0a3558d add delete confirmation modal 2018-07-04 15:20:12 -04:00
bruckwubete 3c11aca1aa able to handle launcher login with gem 2018-07-04 14:48:22 -04:00
Joshua Arts 91b9bb4054 set .ruby-version to 2.5.1 2018-07-04 09:56:50 -04:00
Joshua Arts d383f142ee tidy or line styling 2018-07-04 09:43:08 -04:00
Joshua Arts ecd101833a
Merge pull request #1 from Hajar1/master
switched hr line to a inline or
2018-07-03 15:53:00 -04:00
Adnan Hajar 9764ac6848 switched hr line to a inline or 2018-07-03 15:40:38 -04:00
Joshua Arts dcf199c0aa fix chat join message 2018-07-03 13:11:39 -04:00
Joshua Arts efcc312e9e remove ability to change home room 2018-07-03 11:57:45 -04:00
Joshua Arts ab7ae8434b add demo server trial to README.md 2018-06-29 16:59:45 -04:00