Commit Graph

60 Commits

Author SHA1 Message Date
06236b49f7 Sanitize search for users and rooms (#1784) 2020-06-11 12:39:18 -04:00
51824ad84b Merge v2.6-alpha (#1672)
* GRN2-xx: Switch the relation between users and roles to make queries cleaner and faster (#1299)

* First steps

* Fixes in account creation flow

* Fixed most testcases

* more test fixes

* Fixed more test cases

* Passing tests and rubocop

* Added rake task to remove rooms

* Adding translation (#1510)

* Update _account.html.erb

* Update en.yml

* Fix "for" attribute for label elements (#1488)

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix some issues reported by LGTM (#1478)

* Declare local JavaScript variables (reported by LGTM)

Signed-off-by: Stefan Weil <sw@weilnetz.de>

* Remove unused local JavaScript variable (reported by LGTM)

Signed-off-by: Stefan Weil <sw@weilnetz.de>

* Puma Worker Configuration (#1332)

We noticed that the current default settings perform very poorly under
load. We managed to literally take down Greenlight during a larger event
when people where accessing the landing page for rooms and when doing
some tests, I was more or less able to DoS Greenlight on my own.

This patch adds a default worker configuration which significantly
improves the situation. The small, 4 core machine I was testing on could
handle about thrice the amount of requests.

While the new default configuration should be reasonably well suited for
most deployments, this patch further allows users to easily configure
the worker pool on their own in the environment file.

* Made name and email readonly for no greenlight accounts (#1534)

* Fixed hardcoded string (#1532)

* fixed spelling error that was bugging me :) - sep a rat e (#1535)

Co-authored-by: Dave Lane <dave@oerfoundation.org>

* Improve Server Rooms View (#1524)

* Order rooms by status

* Cleaned up order function

* Now displays Started/Created/Ended

* Added participant count to rooms list

* Fix rake task user:create so that users can be created when terms are present (#1565)

* Changed user create task to always accept terms

* clean up

* More secure room ID (#1451)

* Legal and privpolicy link (#1421)

* add customizable Links to Imprint and Privacy Policy

* fix copy&paste error in spec

* replace "imprint" with "legal" since that is the correct term

* remove german translation of new strings, transifex will take care of them later

* GRN2-295:Refactored update profile and update password (#1591)

* Refactored update profile and update password

* Relowered rubocop settings

* Fixed email sending when not supposed to (#1592)

* Design changes for small screens  (#1580)

* now rap for pagination

* Update _subtitle.html.erb

* Update _rooms.html.erb

* Update _recordings.html.erb

* Update _rooms.html.erb

* Update _users.html.erb

* Update cant_create_rooms.html.erb

* Update room.js

* Update edit.html.erb

* Update new.html.erb

* Update cant_create_rooms.html.erb

* Update _sessions.html.erb

* Update _account.html.erb

* Make Greenlight work with Ruby 2.7 (#1560)

Greenlight's failure to start up with Ruby 2.7 seems to be caused by [an
issue in bootsnap](https://github.com/Shopify/bootsnap/issues/258).
Updating that library makes Greenlight work again.

However, there are still a lot of deprecation warnings. But that's
something to deal with separately.

This fixes #1558

* use email input for sign in (#1199)

* use email input for sign in

* use email input for registration

* use email input for invitation

* use email input for account settings

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>

* Fix Gemfile (#1593)

* Fixed invalid token for password reset (#1632)

* HELP_URL env variable now works as expected (#1636)

* #1372 Fix for long Text in Table + Remove invalid HTML Tag (#1403)

* removed invalid HTML Tag

* removed invalid HTML Tag

* Update _public_recording_row.html.erb

* Update _recording_row.html.erb

* Update _server_recording_row.html.erb

form-inline replaced by own css

* Update _server_room_row.html.erb

* Update _public_recording_row.html.erb

* Update _recording_row.html.erb

* Update _public_recording_row.html.erb

* Update _recordings.html.erb

* Update _rooms.html.erb

* Update main.scss

fix for long text

* Update main.scss

* Update _public_recording_row.html.erb

* Added more validation on profile image (#1644)

* Users who can't create rooms but have shared rooms now have a different view (#1649)

* Revert "Puma Worker Configuration (#1332)" (#1667)

This reverts commit 78ed8d7460.

* Removed html safe from all flash messages (#1668)

* Remove hardcoded guest=true if require mod approval is set (#1669)

* Change random generation for room uid (#1670)

* GRN2-290: Update gems and update to Rails 5.2.4.3 (#1671)

* Update gems and update to Rails 5.2.4.3

* remove gemfile error

Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com>
Co-authored-by: Florian Weber <fnwbr@users.noreply.github.com>
Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: Lars Kiesow <lkiesow@uos.de>
Co-authored-by: Dave Lane <dave@lane.net.nz>
Co-authored-by: Dave Lane <dave@oerfoundation.org>
Co-authored-by: Henning <hng@users.noreply.github.com>
Co-authored-by: Marcel Waldvogel <marcel@waldvogel.family>
Co-authored-by: Christian Marg <marg@rz.tu-clausthal.de>
Co-authored-by: Klaus <klaus@jsxc.org>
2020-05-26 17:37:23 -04:00
f4990b4523 GRN2-xx: Replaced bbb_id field with a better string generator (#1250)
* Replaced bbb_id field with a better string generator

* Update room.rb

How about this instead @farhatahmad ?

* Update room.rb

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 15:06:56 -04:00
03cdbd6b69 Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
2cc1fdf281 Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -05:00
005c738e4d GRN2-260: Added the ability to merge user accounts (#938)
* Added the ability to merge user accounts

* Styling fixes
2020-02-14 10:24:06 -05:00
967130e57c GRN2-253: Added the ability to share rooms across multiple users (#912)
* Added ability to share rooms with other users

* Fixed testcases
2020-02-12 17:49:35 -05:00
c13a83a3f3 Fixed issues with rubocop (#916) 2020-02-12 17:49:35 -05:00
09de6b6739 GRN2-128: Added the ability to manage rooms (#848)
* Added the ability to manage rooms

* Small fixes

* Fixed travis complaints

* Fixed issues with role permissions

* Fixed issue with delete room

* Fixed rubocop and added testcases
2020-02-12 17:49:35 -05:00
d3b669d552 GRN2-xx: Users, Room and Recordings are now no longer permanently deleted (#773)
* Bug fixes for 2.4

* Removed accidental code add

* Switched from deleting to tombstoning

* Fixed bug with login
2019-09-19 10:03:44 -04:00
fd6077696d GRN2-180: First stages of refactoring code for v2.4 (#748)
* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes
2019-09-19 10:03:44 -04:00
2775b18993 Merge branch 'v2' 2019-07-29 14:30:30 +00:00
403a7c4e40 GRN2-xx: Removed readonly maintenance mode (#699)
* Removed readonly maintenance mode

* Removed full reference
2019-07-29 10:23:18 -04:00
0934919e44 GRN2-206: Remove support for the flash client Fixes(#654) (#661)
* Remove ability to specify flash client

* Always join via html5

* Fix styling and tests
2019-07-24 09:37:59 -04:00
7b96d5ae41 Add room setting to require moderator approval (#660) 2019-07-23 16:16:14 -04:00
f7c88cfc6a Merge branch 'v2.2.1-alpha' into master 2019-07-23 15:57:08 -04:00
4e16e99758 Allowed users to start rooms if database is in readonly (#680)
* Allowed users to start rooms if database is in readonly

* Travis fix
2019-07-22 17:02:49 -04:00
0e4adc0049 Add watchtower metadata (#635) 2019-07-22 16:28:09 -04:00
c4eeee3d40 Add setting for recording visibility (#634) 2019-07-22 15:39:49 -04:00
a055b88eb7 GRN2-129: Added server recordings and refactored adminsitrator panel (#662)
* Added server recordings and refactored adminsitrator panel

* Fixed some issues

* Fixed issue with owner email search

* Fixed issue with edit user
2019-07-22 12:46:47 -04:00
23abdb52ee Add paging to Recordings Table (GRN2-26) (#512)
* Add translations for the validation messages

* Add translations for next/prev button

* Add paging to recordings

* sync

* Fix line endings
2019-05-14 09:01:41 -04:00
a0c99dde47 Updated rubocop and fixed issues (#490) 2019-05-02 15:44:00 -04:00
b15868fb3c GRN-80: Allow local accounts on multitenant (#428)
* Changed the way the omniauth providers are declared

* Allow local authentication for multitenant mode based on customer settings

* Cleanead up code mandated by rubocop

* Completed implementation for signin and added the one for signup

* Fixed issue with rubocop

* Renamed customer_name to lb_user

* Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented

* Completed implementation of email_verification

* Fixed rubocop issue

* Final update

* Fix for test with loadbalancer

* Make sure loadbalancer mockup is only used when env defined

* Fix for test on rooms_controller

* Fixed most of the test failing on multitenant env

* Fixed issue detected by rubocop

* Fixed issue with activation tockens not working on resend

* Fixed new issue found by rubocop

* Updated travis script

* Harcoded credentials for mockup

* Updated expectation on start_session

* Fixed issue with duplication of home room

* Updated script for rubocop

* Restored Gemfile
2019-04-05 14:54:36 -04:00
c0b46be547 Added fix for multitenant error (#394)
* Added fix for multitenant error

* Fixed issue with room lock when using ldap

* Fixed test cases

* Fixed rubocop issue

* Included internal documentation for LDAP ENV variables
2019-03-13 15:56:57 -04:00
08f6f32779 Persist password (#393)
* never hold the owner of the room on the waiting screen

* persist room passwords so we can always call create meeting, even if it's already running, to avoid any inconsistency or race condition when joining a meeting

* Fixed issues in migration, room attribute updates, random_password and tests
2019-03-12 17:54:57 -04:00
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
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
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
f8af2fc3bf escape uid in invite path 2018-08-16 13:25:32 -04:00
162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
c7fbaa3f80 fix recordings lengths 2018-07-30 11:48:11 -04:00
572134f344 check for no recordings 2018-07-27 14:18:39 -04:00
7b15b84daa delete recordings with account 2018-07-27 14:14:48 -04:00
89b1afa470 fix missing locales and bump name/email max 2018-07-26 11:53:50 -04:00
056289789a add ability to launch through a loadbalanced bbb configuration 2018-06-29 09:24:25 -04:00
1acf901c68 finish controller tests 2018-06-28 16:55:56 -04:00
f0ab2924db allow client to be determined by server 2018-06-27 17:53:11 -04:00
ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
939820bffb minor styling and fixes 2018-06-22 15:58:25 -04:00
f6bff7a58f simplify room uid format 2018-06-21 10:06:10 -04:00
d1b81a385f add more model tests 2018-06-18 14:55:01 -04:00
5d5cfd1b7d add ability to change recording visibility 2018-06-18 14:25:30 -04:00
b2b2c641da add support for deploying to a subdirectory 2018-06-18 10:28:47 -04:00
086a39ca3d rework tests 2018-06-15 14:41:07 -04:00
7fadd6be69 seperate js in files 2018-06-13 14:43:08 -04:00
8390e075e1 finish settings and public recordings 2018-06-12 17:28:02 -04:00
39b687a58f recording management 2018-06-12 14:36:35 -04:00
2b065eb7fa handle errors and fix join form 2018-06-11 13:05:54 -04:00
657feb777f signup and room waiting 2018-06-07 15:52:42 -04:00
d9a95ffc18 work on user settings 2018-06-04 15:58:59 -04:00