[bbb-greenlight: 39/39] Merge tag 'release-2.7.6'
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [bbb-greenlight: 39/39] Merge tag 'release-2.7.6'
- Date: Thu, 15 Oct 2020 07:11:23 +0000 (UTC)
commit 0a11499e7d68ad3eb443aafff313ea6aa10ba015
Merge: a557bd9 ec4cde6
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Thu Oct 15 09:11:09 2020 +0200
Merge tag 'release-2.7.6'
Gemfile | 2 +-
Gemfile.lock | 90 ++++-----
app/assets/javascripts/room.js | 48 +++--
app/assets/javascripts/user_edit.js | 10 +
app/assets/javascripts/wait.js | 8 +-
app/assets/stylesheets/rooms.scss | 4 +
app/controllers/account_activations_controller.rb | 17 +-
app/controllers/admins_controller.rb | 11 +-
app/controllers/application_controller.rb | 12 +-
app/controllers/concerns/bbb_server.rb | 5 +-
app/controllers/concerns/joiner.rb | 1 -
app/controllers/concerns/populator.rb | 11 ++
app/controllers/rooms_controller.rb | 8 +-
app/controllers/users_controller.rb | 6 +-
app/mailers/user_mailer.rb | 4 +
app/models/invitation.rb | 9 +
app/models/user.rb | 5 +-
app/views/account_activations/show.html.erb | 2 +-
.../components/_invited_users_table.html.erb | 49 +++++
.../admins/components/_manage_users_table.html.erb | 122 ++++++++++++
.../admins/components/_manage_users_tags.html.erb | 9 +-
app/views/admins/components/_users.html.erb | 133 +------------
.../site_settings/_administration.html.erb | 30 +--
app/views/rooms/cant_create_rooms.html.erb | 2 +-
app/views/rooms/show.html.erb | 25 ++-
app/views/shared/_sessions.html.erb | 2 +-
.../shared/modals/_create_room_modal.html.erb | 10 +-
app/views/user_mailer/user_promoted.html.erb | 4 +-
app/views/user_mailer/user_promoted.text.erb | 2 +-
app/views/users/components/_account.html.erb | 8 +-
config/application.rb | 3 +
config/cable.yml | 2 +-
config/environments/production.rb | 4 +-
config/locales/cs.yml | 56 +++++-
config/locales/de_DE.yml | 45 +++--
config/locales/en.yml | 3 +
config/locales/es.yml | 216 +++++++++++++++++----
config/locales/fr.yml | 76 ++++++--
config/locales/gl.yml | 17 +-
config/locales/it.yml | 71 ++++++-
config/locales/ja_JP.yml | 33 ++--
config/locales/nl.yml | 7 +
config/locales/zh_CN.yml | 4 +
config/puma.rb | 4 +-
lib/assets/_primary_themes.scss | 7 +
lib/tasks/configuration.rake | 24 +--
sample.env | 40 +++-
spec/controllers/rooms_controller_spec.rb | 2 +-
spec/controllers/users_controller_spec.rb | 2 +-
spec/models/user_spec.rb | 1 +
50 files changed, 866 insertions(+), 400 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]