Commit Graph

253 Commits

Author SHA1 Message Date
John Ma efa9e08dfc Fixed #318 Allow multiple domains when using Google as OAuth provider (GRN-38) (#319)
* <Added muli_domain restriction with google_oauth>

* <Fixed code style>

* <Added some rspec tests>
2018-11-15 15:01:53 -05:00
John Ma 1954ba4cff <Fixed UI for join button> (#308) 2018-11-15 14:52:57 -05:00
John Ma de98fd0a3c Display notification that max concurrent sessions has been reached (GRN-41) (#317)
* <Added max concurrent sessions check>

* <Refactored some exception logic>

* <Fixed code style>

* <Generalized BBBException error message>
2018-11-15 14:20:46 -05:00
John Ma 0e7277a046 Modify UI for "accept terms" checkbox (#321)
* <Changed terms and conditions checkbox>

* <Fixed code style>
2018-11-15 12:56:00 -05:00
John Ma f94678627c Allow for specification of email sender (#311)
* <Allow for configuration of email sender>

* <Configure for localization>

* <Added a change in verify_mail>
2018-11-08 10:27:26 -05:00
John Ma b8785a3bf8 Fixed loading of error pages (#310)
* <Fixed loading of error pages>

* <Remove not_found from application folder>
2018-10-23 13:10:54 -04:00
Jesus Federico b3a2d9e39e
Updates to env variables for logging (#309)
* Updates to env variables for logging

* Added not_found template to application
2018-10-23 11:45:14 -04:00
Jesus Federico 207ec6ffb2
Unify the UI style in sign up, sign in buttons when using omniauth (GRN-35) (#301)
* Changed style to buttons for sign up

* Added assets and generalized code for sign up buttons

* Added new style to sign in modal

* Replaced hex colors with the official ones

* Removed the old social icons that are no longer used

* Centred text in sign up buttons

* Base button rendering on iconset_providers and secured office 365
2018-10-17 12:41:57 -04:00
John Ma 1bb5be68a5 Fix for email verification issue (GRN-36) (#300)
* <incorrect smtp settings no longer crashes the application>

* <Added rspec tests>

* <>

* Delete env

* Update development.rb
2018-10-17 11:42:50 -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
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 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 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
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
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
Joshua Arts 81d460f1c2 fix before_filter deprecation warning 2018-08-21 14:54:52 -04:00
Joshua Arts d7db798adc show placeholder when no participants field 2018-08-21 13:20:04 -04:00
Joshua Arts a6fc8f0f2f fix stats format being removed 2018-08-20 14:53:14 -04:00
Joshua Arts 0cf5baddb2 add option to disable recording thumbnails 2018-08-17 16:31:16 -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
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
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Joshua Arts d7083363b7 center version in footer 2018-07-30 15:05:21 -04:00
Joshua Arts c7fbaa3f80 fix recordings lengths 2018-07-30 11:48:11 -04:00
Joshua Arts 2a2e4f285c change terms from txt to markdown 2018-07-27 15:12:27 -04:00
Joshua Arts 4b9ca3f13e recenter errors and missing locales 2018-07-27 14:55:32 -04:00
Joshua Arts 572134f344 check for no recordings 2018-07-27 14:18:39 -04:00
Joshua Arts 7b15b84daa delete recordings with account 2018-07-27 14:14:48 -04:00
Joshua Arts 5e5f31c375 add option in settings to delete account 2018-07-27 11:36:28 -04:00
Joshua Arts 89b1afa470 fix missing locales and bump name/email max 2018-07-26 11:53:50 -04:00
Joshua Arts fd2dc3abec fix bug with single thumbnails erroring 2018-07-25 16:16:25 -04:00
Joshua Arts a9892d2dcb redesign landing & fix footer 2018-07-25 14:43:05 -04:00
Joshua Arts 6a668149b6 add padding to room block ellipsis 2018-07-24 14:55:54 -04:00
Joshua Arts d6aee4d2d1 bump max name length to 32 characters 2018-07-24 11:05:25 -04:00
Joshua Arts 6234bdc0df
Merge pull request #227 from bruckwubete/bn_launcher_integration
redirect to https in prod for bn_launcher
2018-07-23 16:56:30 -04:00
bruckwubete e60407378a gix rubocop offense 2018-07-23 16:37:17 -04:00
Joshua Arts 12a448aa24
Merge pull request #225 from joshua-arts/ldap
Add support for LDAP authentication.
2018-07-23 15:34:42 -04:00
bruckwubete 5f6d70f751 redirect to https in prod 2018-07-23 15:30:31 -04:00
Joshua Arts 3696fa95d7 add version in footer 2018-07-23 15:06:21 -04:00
Joshua Arts f91c6d193a make features appear non-clickable 2018-07-23 14:40:41 -04:00
Joshua Arts 0202d09a9d fix video link spanning entire page 2018-07-23 12:23:59 -04:00
Joshua Arts 00a3deec29 explicitly call #omniauth_fail 2018-07-23 12:07:26 -04:00
Joshua Arts 9a738c4432 add signup with provider buttons 2018-07-23 11:46:53 -04:00
Joshua Arts 40cb48a10a remove unneeded redirect 2018-07-20 17:09:03 -04:00
Joshua Arts 775285bba9 add ldap authentication 2018-07-20 14:20:14 -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 a6b05f5fd3 fix gl accounts unable to update settings 2018-07-13 10:21:32 -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
Joshua Arts 1412b39620 skip cleanup and minor fixes 2018-07-11 10:23:16 -04:00
bruckwubete 91644281c4 fixing rubocop errors 2018-07-10 15:05:50 -04:00
bruckwubete 137b8450a8 adding checksum. using customer name as the provider 2018-07-10 12:11:00 -04:00
bruckwubete 0d2a5a4c90 small fixes 2018-07-09 16:00:10 -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 e2ad6e7715 make upgrading from 1.0 easier 2018-07-05 17:25:59 -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 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 d383f142ee tidy or line styling 2018-07-04 09:43:08 -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 efbf42f698 remove unused launch route 2018-06-29 16:18:00 -04:00
bruckwubete 2bb41977ed Merge https://github.com/joshua-arts/greenlight-2.0 2018-06-29 10:08:58 -04:00
bruckwubete e3e32365d0 able to handle launcher login 2018-06-29 10:07:06 -04:00
Joshua Arts 056289789a add ability to launch through a loadbalanced bbb configuration 2018-06-29 09:24:25 -04:00
Joshua Arts 1acf901c68 finish controller tests 2018-06-28 16:55:56 -04:00
Joshua Arts 63cdbdc874 Merge branch master into tests 2018-06-28 11:29:30 -04:00
Joshua Arts 0b9fdb371e fix footer and update links 2018-06-28 11:21:02 -04:00
Joshua Arts c802e4806a fix waiting to join retry logic 2018-06-28 10:39:39 -04:00
Joshua Arts d9c5d37810 correctly handle failed login 2018-06-28 09:35:36 -04:00
Joshua Arts f0ab2924db allow client to be determined by server 2018-06-27 17:53:11 -04:00
Joshua Arts a6b313f38e test sessions controller and fix style 2018-06-27 17:00:37 -04:00
Joshua Arts 60d8a595f0 always join owners ad moderators 2018-06-26 16:20:04 -04:00
Josh ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
Josh f0011a564e raise when user not found 2018-06-25 15:51:23 -04:00
Josh 939820bffb minor styling and fixes 2018-06-22 15:58:25 -04:00
Josh c16197670b add ability to configure terms and conditions 2018-06-21 16:17:18 -04:00
Josh 2dc033ee20 remove tabler plugins 2018-06-21 11:06:14 -04:00
Josh ad7aaa1a11 dynamically select websocket protocol 2018-06-21 10:57:20 -04:00
Josh 54adff3779 load Twitter image over https 2018-06-21 10:17:46 -04:00
Josh f6bff7a58f simplify room uid format 2018-06-21 10:06:10 -04:00
Josh 1c966663e0 switch feather for fontawesome 2018-06-20 15:18:05 -04:00
Josh e1eca134fc minor fixes 2018-06-19 16:43:27 -04:00
Josh d1b81a385f add more model tests 2018-06-18 14:55:01 -04:00
Josh 5d5cfd1b7d add ability to change recording visibility 2018-06-18 14:25:30 -04:00
Josh b2b2c641da add support for deploying to a subdirectory 2018-06-18 10:28:47 -04:00
Josh ce6ec0acfb fix logout route to not conflict with BBB 2018-06-15 16:21:00 -04:00
Josh 086a39ca3d rework tests 2018-06-15 14:41:07 -04:00
Josh 8cffc4872c reinclude tabler progress 2018-06-15 11:34:34 -04:00
Josh 911bfb446e remove unneeded styling 2018-06-15 11:23:20 -04:00
Josh b81eadda8d production settings 2018-06-14 14:22:19 -04:00
Josh 37d9ae4136 add readme 2018-06-13 16:33:23 -04:00
Josh bc67d9e1e5 clean styling 2018-06-13 15:51:10 -04:00
Josh 7fadd6be69 seperate js in files 2018-06-13 14:43:08 -04:00
Josh 83642f22c1 minor fixes 2018-06-13 13:27:29 -04:00
Josh bc9c2c1232 add ability to configure banner message 2018-06-13 09:55:34 -04:00
Josh 8390e075e1 finish settings and public recordings 2018-06-12 17:28:02 -04:00
Josh 39b687a58f recording management 2018-06-12 14:36:35 -04:00
Josh 46bb456063 error pages and rec row 2018-06-11 17:32:08 -04:00
Josh 2b065eb7fa handle errors and fix join form 2018-06-11 13:05:54 -04:00
Josh 2b0f75e62b join page tweaks 2018-06-08 16:59:09 -04:00
Josh 4f70c9a8e5 validate passwords and fix home 2018-06-08 14:44:08 -04:00
Josh 520c489e62 change /start to post 2018-06-07 16:57:56 -04:00
Josh 2b28c750a8 in progress button 2018-06-07 16:39:25 -04:00
Josh 657feb777f signup and room waiting 2018-06-07 15:52:42 -04:00
Josh c1549193f2 redesign home page 2018-06-06 14:51:32 -04:00
Josh fa64e53792 remove video modal 2018-06-05 16:49:00 -04:00
Josh d9a95ffc18 work on user settings 2018-06-04 15:58:59 -04:00
joshua-arts 79949b4aa6 join with specific id 2018-06-03 14:57:30 -04:00
joshua-arts 140547d035 shorten is_running? 2018-06-01 21:30:11 -04:00
Josh 11a61180ed show all rooms 2018-06-01 17:28:39 -04:00
Josh 475646f7c1 remove table border 2018-06-01 14:28:34 -04:00
Josh a9d5215d2b styling again 2018-06-01 14:20:40 -04:00
Josh 45fb18e609 add room functionality 2018-06-01 11:55:52 -04:00
joshua-arts 1bcd176285 styling 2018-05-31 22:15:18 -04:00
Josh 39414e269b more ui tweaks 2018-05-31 16:54:48 -04:00
Josh ede80075c1 redo rooms page 2018-05-31 15:04:18 -04:00
Josh 9e5250353b add room post 2018-05-29 17:08:38 -04:00
Josh de44d8024b room resources 2018-05-29 16:51:18 -04:00
Josh 32ec2bacce restructure app 2018-05-29 15:28:29 -04:00
Josh 5042e2572c minor tweaks 2018-05-29 08:40:35 -04:00
joshua-arts af3c45b019 minor ui tweaks 2018-05-28 19:12:24 -04:00
joshua-arts 79d63e7b70 settings and sessions UI 2018-05-28 18:10:20 -04:00
Josh 6c1074443f more work on frontend 2018-05-25 16:51:16 -04:00
Josh 0dce8d2bf5 continue front-end work 2018-05-25 11:55:48 -04:00
Josh a1a41bfa43 work on frontend 2018-05-24 16:59:20 -04:00
Josh 3dd7b33363 change rooms#index to rooms#show 2018-05-23 16:13:24 -04:00
Josh 434021239c sessions and fixes 2018-05-22 16:58:11 -04:00
Josh f189c98c56 add rspec tests 2018-05-18 11:51:03 -04:00
Josh 6cdcd89387 reworking routes 2018-05-15 11:43:59 -04:00
Josh 1ddc3172eb one meeting per room 2018-05-14 14:28:18 -04:00
Josh 0f8a4734b2 add lb option 2018-05-11 15:57:31 -04:00
Josh b452932767 work on tests 2018-05-10 15:03:59 -04:00