1. 12 Jun, 2020 3 commits
  2. 11 Jun, 2020 5 commits
  3. 09 Jun, 2020 1 commit
  4. 04 Jun, 2020 3 commits
  5. 03 Jun, 2020 4 commits
  6. 02 Jun, 2020 7 commits
  7. 28 May, 2020 5 commits
  8. 27 May, 2020 11 commits
  9. 26 May, 2020 1 commit
    • Ahmad Farhat's avatar
      Merge v2.6-alpha (#1672) · 51824ad8
      Ahmad Farhat authored
      * 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: default avatarAhmad Farhat <ahmad.af.farhat@gmail.com>
      
      * Fix some issues reported by LGTM (#1478)
      
      * Declare local JavaScript variables (reported by LGTM)
      Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
      
      * Remove unused local JavaScript variable (reported by LGTM)
      Signed-off-by: default avatarStefan 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: default avatarDave 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: default avatarAhmad 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: default avatarMrKeksi <mrkeksi@users.noreply.github.com>
      Co-authored-by: default avatarFlorian Weber <fnwbr@users.noreply.github.com>
      Co-authored-by: default avatarStefan Weil <sw@weilnetz.de>
      Co-authored-by: default avatarLars Kiesow <lkiesow@uos.de>
      Co-authored-by: default avatarDave Lane <dave@lane.net.nz>
      Co-authored-by: default avatarDave Lane <dave@oerfoundation.org>
      Co-authored-by: default avatarHenning <hng@users.noreply.github.com>
      Co-authored-by: default avatarMarcel Waldvogel <marcel@waldvogel.family>
      Co-authored-by: default avatarChristian Marg <marg@rz.tu-clausthal.de>
      Co-authored-by: default avatarKlaus <klaus@jsxc.org>
      51824ad8