merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,119 Commits 2 Branches 0 Tags 12 MiB
Commit Graph

271 Commits

Author SHA1 Message Date
farhatahmad 3195bb4429 GRN-59: Implemented pagination on the API call (#370) 
* Added the env variable and functionality to paginate the call to the bbbapi

* Update user.rb
 2019-03-12 13:50:20 -04:00
farhatahmad ab6655554c Added javascript needed to rename from all recordings (#390) 2019-03-05 17:04:14 -05:00
farhatahmad ef8fc2c0e4 GRN-69: Fixed javascript bug related to room validation (#388) 
* Fixed javascript bug related to room validation

* More javascript bugs

* Removed room name length error

* Fixed issue with room post url
 2019-03-05 15:07:14 -05:00
Jesus Federico 37af17fae1
Revert "Redirecting the user to the referrer on login success/fail (#374)" (#389) 
This reverts commit 404134aa8d.
 2019-03-05 14:45:42 -05:00
farhatahmad 79bb782319 Fixed issues with application js order and flash messages (#387) 2019-03-04 16:29:07 -05:00
farhatahmad 404134aa8d Redirecting the user to the referrer on login success/fail (#374) 2019-03-04 15:51:53 -05:00
farhatahmad 532c7bd2af Refactored flash messages code (#372) 2019-02-27 15:21:52 -05:00
farhatahmad c60e25f71c GRN-56: Correctly implemented the account verification flow (#367) 
* Correctly implemented the account verification flow

* Fixed issues with redirect locations
 2019-02-22 16:47:02 -05:00
farhatahmad 9c23c88735 Added a env variable to toggle visibilty of the customize tab in user settings (#369) 2019-02-15 12:15:29 -05:00
farhatahmad d24e8fad14 Added the ability to choose which room settings are available using env variable (#363) 2019-02-06 16:13:53 -05:00
farhatahmad 9883616f9c Fixed issue with visibility redirected and changed the 'no recordings' string for the recordings page (#361) 2019-02-06 12:02:53 -05:00
farhatahmad 16def655cf Sorted the recording playback array by the type attribute before displaying (#358) 2019-02-06 11:43:00 -05:00
farhatahmad 2e8670a8ab GRN-11: Ability to configure room specific settings (#348) 
* Added the ability to set room settings on create or update

* Added room settings alerts and made fixes to other alerts

* Small bug fixes related to rubocop and the create room modal

* Update test case and fixed issue with small edge case

* Update room.js
 2019-02-06 11:08:18 -05:00
farhatahmad 992c154c10 Change the browser tab text to BigBlueButton (#357) 2019-02-04 13:16:14 -05:00
farhatahmad 8ff05643dc Added a Recordings page where the user can see all recordings (#352) 2019-02-04 11:21:42 -05:00
farhatahmad ef23cae73d Changed the link to the bbb image to be an absolute url (#353) 2019-02-04 10:19:11 -05:00
farhatahmad c73064a70a GRN-45: Fixed the URL being sent in the password reset email (#351) 
* Fixed the url used in the reset password emails and added the ability to preview emails in the dev environment

* Replaced localhost with example.com in email previews

* Update password_reset.html.erb
 2019-02-01 15:00:10 -05:00
farhatahmad ecee282fc4 GRN-19: Add confirmation for accepting cookies from the site (#345) 
* Added a cookie warning

* Cleaned up code to better match application standard
 2019-02-01 12:54:29 -05:00
farhatahmad ffff724712 GRN-48: Password reset e-mails getting into SPAM folders (#349) 
* Changed the way emails look and added an extra string for the user to check their spam folder

* Update verify_email.text.erb
 2019-02-01 12:14:51 -05:00
John Ma 8fe66d81f1 Fixed #332 Allow users to reset their password (#335) 
* <Added password reset system>

* <Added rspec tests>

* <Fixed code style>

* <Added rescue for invalid smtp configuration>
 2018-12-21 11:56:52 -05:00
John Ma 8cdbf1d5e6 Add the ability to Sort Recordings (GRN-43) (#327) 
* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Added filter ui options>

* <Add sorting functionality>

* <Added sorting functionality for public recordings>

* <Update branch>

* <Fix code>

* <Fix code>

* <Fix code style>

* Update sort.js
 2018-12-13 11:58:33 -05:00
John Ma b3f37cd3b3 Fixed #323 Allow users to select a language in settings (GRN-17) (#324) 
* <Added ui for language setting and migration>

* <Option to choose languages added>

* <Fixed code style>

* <Added Rspec tests>

* <sync db>

* <Sync db>

* <Generalized language settings>

* <Fixed flash message>

* Fixed las issue with i18n fallback

* <Modified fallback config>

* <Fixed code style>
 2018-12-06 16:00:22 -05:00
John Ma 895af7494e Fixed #280 Search/Paginate recordings (GRN-12) (#281) 
* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Removed commented code>

* Update search.js
 2018-12-06 10:24:22 -05:00
John Ma 41a543f6b8 Fixed #303 Add the ability to rename rooms and recordings (GRN-18) (#304) 
* <Added modal for rename>

* <Commit changes and switch branch>

* <Javascript Scaffolding for rename room feature>

* <Created room_block.js>

* <update changes>

* <Updating rename branch>

* <Update rename.js>

* <Update branch>

* <Update branch>

* <Implemented renaming of room blocks>

* <Refactoring code>

* Remove modal due to new design

* <Finished renaming of rooms>

* <Updated renaming of recordings>

* <updating branch>

* <added renaming of recordings>

* <update branch>

* <>

* <Fixed code style>

* <Fixed rspec tests>

* Update application.js
 2018-12-04 10:48:51 -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 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 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 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 d7db798adc show placeholder when no participants field 2018-08-21 13:20:04 -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 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 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 12a448aa24
Merge pull request #225 from joshua-arts/ldap 
Add support for LDAP authentication.
 2018-07-23 15:34:42 -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 9a738c4432 add signup with provider buttons 2018-07-23 11:46:53 -04:00
Joshua Arts 775285bba9 add ldap authentication 2018-07-20 14:20:14 -04:00
Joshua Arts ce4c8b3bff localize views 2018-07-17 11:57:49 -04:00
Joshua Arts f5ab362f96 add ability for custom branding images 2018-07-11 15:33:35 -04:00
bruckwubete 590e189474 Merge branch 'master' into bn_launcher_integration 2018-07-09 13:20:34 -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
Joshua Arts 8a9f2a3cc2 multiple fixes and tweaks 2018-07-04 15:22:59 -04:00
Joshua Arts 21e0a3558d add delete confirmation modal 2018-07-04 15:20:12 -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 efcc312e9e remove ability to change home room 2018-07-03 11:57:45 -04:00
Joshua Arts 0b9fdb371e fix footer and update links 2018-06-28 11:21:02 -04:00
Joshua Arts d9c5d37810 correctly handle failed login 2018-06-28 09:35:36 -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 ad7aaa1a11 dynamically select websocket protocol 2018-06-21 10:57:20 -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 5d5cfd1b7d add ability to change recording visibility 2018-06-18 14:25:30 -04:00
Josh 086a39ca3d rework tests 2018-06-15 14:41:07 -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
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 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 434021239c sessions and fixes 2018-05-22 16:58:11 -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 5347d902c0 start writing tests 2018-05-09 16:31:52 -04:00
Josh e6d01ef1b9 implement wait for moderator 2018-05-08 10:41:03 -04:00
Josh 4037b6304e initial commit 2018-05-07 16:06:01 -04:00