Commit Graph

1040 Commits

Author SHA1 Message Date
Ahmad Farhat db6db06a78
Fix date for duplicate rooms (#1680) 2020-05-27 16:42:26 -04:00
transifex-integration[bot] 140254ad62
Translate '/config/locales/en.yml' in 'gl' (#1676)
* Translate /config/locales/en.yml in gl

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

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

translation completed for the source file '/config/locales/en.yml'
on the 'gl' 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-05-27 16:13:19 -04:00
Ahmad Farhat d7079e7880
Fixes for 2.6 (#1677) 2020-05-27 14:46:33 -04:00
transifex-integration[bot] 39962c54df
Translate '/config/locales/en.yml' in 'de_DE' (#1673)
* 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-05-27 14:12:44 -04:00
transifex-integration[bot] e3f5d40139
Translate '/config/locales/en.yml' in 'tr' (#1639)
* Translate /config/locales/en.yml in tr

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

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

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-05-27 11:23:38 -04:00
transifex-integration[bot] 76faee591f
Translate '/config/locales/en.yml' in 'nl' (#1675)
* 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-05-27 10:34:00 -04:00
transifex-integration[bot] ccb1be1734
Translate '/config/locales/en.yml' in 'zh_CN' (#1647)
* Translate /config/locales/en.yml in zh_CN

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

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

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: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-27 10:23:46 -04:00
transifex-integration[bot] da19a23be1
Translate /config/locales/en.yml in cs (#1631)
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>
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-05-27 10:17:59 -04:00
transifex-integration[bot] e8ed94db98
Translate /config/locales/en.yml in gl (#1605)
translation completed for the source file '/config/locales/en.yml'
on the 'gl' 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-05-27 10:09:38 -04:00
transifex-integration[bot] 093487a6cc
Translate '/config/locales/en.yml' in 'fr' (#1602)
* 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-05-27 10:06:28 -04:00
Ahmad Farhat 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 78ed8d74601b613af3fd96ccf75a6bada24deddd.

* 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
Jesus Federico 7411eba8e0
GRN2-xx: Added port to database configuration (#1550)
* GRN2-XX: Added port to database configuration

* GRN2-XX: Added port to database configuration
2020-05-08 16:13:57 -04:00
Ahmad Farhat 6b628d62d3
Remove production check for hosts (#1549) 2020-05-08 16:09:03 -04:00
jfederico 6104b3d713 GRN2-xx: Bypass SAFE_HOSTS on dev and test environments 2020-05-08 15:38:02 -04:00
Ahmad Farhat 891a32a15c
GR2-xx: Updated gems to point to rubygems (#1546)
* Updated gems

* Updated another gem

Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-05-08 15:29:20 -04:00
Ahmad Farhat f47d68ea18
GRN2-xx: Allow SAFE_HOSTS to be left blank (#1545)
* Allow SAFE_HOSTS to be left blank

* a different approach

Co-authored-by: jfederico <jesus@123it.ca>
2020-05-08 15:25:24 -04:00
transifex-integration[bot] 0806bf4e58
Translate /config/locales/en.yml in it (#1502)
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: Jesus Federico <jesus@123it.ca>
2020-05-08 14:48:44 -04:00
transifex-integration[bot] 5a77128185
Translate /config/locales/en.yml in eu (#1499)
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>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-05-08 14:42:41 -04:00
transifex-integration[bot] 9e3d8f2821
Translate /config/locales/en.yml in vi (#1484)
translation completed for the source file '/config/locales/en.yml'
on the 'vi' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-05-08 14:37:17 -04:00
transifex-integration[bot] 2fbbaebadb
Translate /config/locales/en.yml in ja_JP (#1481)
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: Jesus Federico <jesus@123it.ca>
2020-05-08 14:30:05 -04:00
transifex-integration[bot] 3b447cf333
Translate /config/locales/en.yml in da (#1475)
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: Jesus Federico <jesus@123it.ca>
2020-05-08 14:01:41 -04:00
transifex-integration[bot] 7a44a6b6e8
Translate '/config/locales/en.yml' in 'de_DE' (#1462)
* 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: Jesus Federico <jesus@123it.ca>
2020-05-08 13:58:23 -04:00
Ahmad Farhat 6fc402e40b
GRN2-xx: Added SAFE_HOSTS env variable to block unknown hosts (#1543)
* Added SAFE_HOSTS env variable to block unknown hosts

* Update sample.env
2020-05-08 13:33:02 -04:00
transifex-integration[bot] 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
Ahmad Farhat 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
Ahmad Farhat 8f3ba8a038
Bumped LDAP gem version (#1443) 2020-04-29 17:45:37 -04:00
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
transifex-integration[bot] 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
Jesus Federico 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
Ahmad Farhat c81c6ab417
Update joiner.rb 2020-04-28 13:31:27 -04:00
Ahmad Farhat 8788664061
Merge branch 'master' into room-settings 2020-04-28 13:30:39 -04:00
Jesus Federico 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
Jesus Federico 6dd78ca41b
Merge branch 'master' into translations_en-yml--master_eu 2020-04-28 13:15:47 -04:00
Ahmad Farhat 44bd2315b2
Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00