Commit Graph

822 Commits

Author SHA1 Message Date
78ed8d7460 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.
2020-05-07 13:14:14 -04:00
2db50d3d68 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>
2020-05-06 16:04:55 -04:00
ed7bec04b0 Fix "for" attribute for label elements (#1488)
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-06 15:59:29 -04:00
db518c3620 Adding translation (#1510)
* Update _account.html.erb

* Update en.yml
2020-05-06 15:48:12 -04:00
467947f1b5 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
2020-05-06 15:23:28 -04:00
8f454cad0e Translate /config/locales/en.yml in uk (#1460)
translation completed for the source file '/config/locales/en.yml'
on the 'uk' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-04-29 22:23:30 -04:00
28302107bd GRN2-xx: Restructured email verification and password reset (#1444)
* Restructured email verification and password reset

* Fixed issue with password reset

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-29 17:56:46 -04:00
8f3ba8a038 Bumped LDAP gem version (#1443) 2020-04-29 17:45:37 -04:00
c92d6778c8 Translate /config/locales/en.yml in cs (#1454)
translation completed for the source file '/config/locales/en.yml'
on the 'cs' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-04-29 16:32:19 -04:00
7d881377d2 Translate '/config/locales/en.yml' in 'nl' (#1447)
* Translate /config/locales/en.yml in nl

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

* Translate /config/locales/en.yml in nl

translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-29 11:43:29 -04:00
4bea4bb64c Translate '/config/locales/en.yml' in 'de_DE' (#1442)
* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-29 11:27:34 -04:00
ce1e0d6737 Translate '/config/locales/en.yml' in 'ja_JP' (#1445)
* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-29 11:20:48 -04:00
6fa547fb83 Translate '/config/locales/en.yml' in 'lv' (#1435)
* Translate /config/locales/en.yml in lv

translation completed for the source file '/config/locales/en.yml'
on the 'lv' language.

* Translate /config/locales/en.yml in lv

translation completed for the source file '/config/locales/en.yml'
on the 'lv' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 15:30:52 -04:00
6cceafa081 Translate '/config/locales/en.yml' in 'de_DE' (#1441)
* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

* Translate /config/locales/en.yml in de_DE

translation completed for the source file '/config/locales/en.yml'
on the 'de_DE' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 15:11:12 -04:00
12f62de6e4 Translate /config/locales/en.yml in nl (#1438)
translation completed for the source file '/config/locales/en.yml'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 15:07:13 -04:00
16647b5c7f Translate '/config/locales/en.yml' in 'fr' (#1440)
* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

* Translate /config/locales/en.yml in fr

translation completed for the source file '/config/locales/en.yml'
on the 'fr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:50:39 -04:00
90032045a4 Translate /config/locales/en.yml in tr (#1439)
translation completed for the source file '/config/locales/en.yml'
on the 'tr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:39:14 -04:00
c7ade09ee8 Translate /config/locales/en.yml in it (#1437)
translation completed for the source file '/config/locales/en.yml'
on the 'it' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:32:07 -04:00
a48bd084e8 Translate '/config/locales/en.yml' in 'hu_HU' (#1436)
* Translate /config/locales/en.yml in hu_HU

translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

* Translate /config/locales/en.yml in hu_HU

translation completed for the source file '/config/locales/en.yml'
on the 'hu_HU' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:28:48 -04:00
7823f65067 Translate '/config/locales/en.yml' in 'bg' (#1434)
* Translate /config/locales/en.yml in bg

translation completed for the source file '/config/locales/en.yml'
on the 'bg' language.

* Translate /config/locales/en.yml in bg

translation completed for the source file '/config/locales/en.yml'
on the 'bg' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:24:06 -04:00
d3c806de60 Translate '/config/locales/en.yml' in 'ja_JP' (#1433)
* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

* Translate /config/locales/en.yml in ja_JP

translation completed for the source file '/config/locales/en.yml'
on the 'ja_JP' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:20:41 -04:00
238107536e Translate /config/locales/en.yml in hy (#1432)
translation completed for the source file '/config/locales/en.yml'
on the 'hy' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:17:39 -04:00
fef02ee76f Translate /config/locales/en.yml in es_MX (#1431)
translation completed for the source file '/config/locales/en.yml'
on the 'es_MX' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:13:21 -04:00
35812c21c6 Translate /config/locales/en.yml in da (#1430)
translation completed for the source file '/config/locales/en.yml'
on the 'da' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-04-28 14:10:24 -04:00
9ba74825f0 Translate /config/locales/en.yml in zh_CN (#1429)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-04-28 14:03:22 -04:00
8e701c8460 Translate '/config/locales/en.yml' in 'uk' (#1416)
* Translate /config/locales/en.yml in uk

translation completed for the source file '/config/locales/en.yml'
on the 'uk' language.

* Translate /config/locales/en.yml in uk

translation completed for the source file '/config/locales/en.yml'
on the 'uk' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-04-28 13:50:03 -04:00
2ab0c7e067 Merge pull request #1222 from farhatahmad/room-settings
GRN2-xx: Added room configuration tab to allow admins to set room settings as always enabled, optional or disabled
2020-04-28 13:42:55 -04:00
c81c6ab417 Update joiner.rb 2020-04-28 13:31:27 -04:00
8788664061 Merge branch 'master' into room-settings 2020-04-28 13:30:39 -04:00
a6d0e2a695 Translate '/config/locales/en.yml' in 'eu' (#1386)
* Translate /config/locales/en.yml in eu

translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.

* Translate /config/locales/en.yml in eu

translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2020-04-28 13:15:58 -04:00
6dd78ca41b Merge branch 'master' into translations_en-yml--master_eu 2020-04-28 13:15:47 -04:00
44bd2315b2 Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
5f9e82c705 Translate /config/locales/en.yml in eu
translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.
2020-04-28 17:04:23 +00:00
b08b1ff013 GRN2-xx: Fixed translation location for room status (#1378)
* Fixed translation location for room status

* Added more missing translations
2020-04-28 13:04:04 -04:00
f8a9d71b77 Translate /config/locales/en.yml in eu
translation completed for the source file '/config/locales/en.yml'
on the 'eu' language.
2020-04-24 10:02:15 +00:00
aeaa1e7d45 Merge branch 'v2' 2020-04-22 23:40:28 -04:00
855694c716 Store a random user id for unauthenticated users as a cookie (#1364) 2020-04-22 09:46:21 -04:00
dadc57d9ea Translate /config/locales/en.yml in zh_CN (#1356)
translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-21 13:54:39 -04:00
a11d79f1dc GRN2-xx: Updated i18n-language-mapping to 0.1.1 (#1361)
Updated i18n-language-mapping to 0.1.1
2020-04-21 13:41:33 -04:00
8049ddbd01 Allow to set a filter for LDAP authentication (#1306) 2020-04-20 15:25:25 -04:00
1d88f54b44 Added disabled styling to always enabled settings 2020-04-16 15:50:23 -04:00
63b6bb7407 Added tests 2020-04-16 15:50:23 -04:00
33d7fa4e1e Fixed rspec 2020-04-16 15:50:23 -04:00
5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
5aa1868f63 Local account email is now downcased to match the downcased value stored in db (#1319)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 15:21:27 -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
10ef20363a Additional LDAP Authentication Methods (#1287)
This patch allows anonymous and user based authentication to LDAP
servers. This change is based on a patch against bn-ldap-authentication:

-  https://github.com/blindsidenetworks/bn-ldap-authentication/pull/2

The patch introduces a new environment variable `LDAP_AUTH` which
controls the authentication method used against the LDAP server:

- `anonymous` enables an anonymous bind to the LDAP with no password
  being used.

- `user` uses the user's own credentials to search for his data,
  enabling authenticated login to LDAP without the need for a user with
  global read privileges.

The default still remains at using a bind user, allowing for a seamless
upgrade path from the previous version.

This fixes #1082

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 14:10:14 -04:00
9d14b561a5 Updated ldap gem to newest version (#1318) 2020-04-16 14:01:27 -04:00
37decd9b43 Fixed role permissin check for update_recording and delete_recording (#1308)
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:52:04 -04:00
311806faa7 Color Configuration for Cookie Banner (#1302)
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-16 12:46:46 -04:00