Unverified Commit 09a425cb authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.7.12.0'

parents dc7c5ffe 1e8a96d8

Changelog.md

+13 −0
Original line number Diff line number Diff line 
# 0.7.12.0



## Refactor

* Harmonize markdown titles sizes [#8029](https://github.com/diaspora/diaspora/pull/8029)



## Bug fixes

* Improve handling of mixed case hostnames while fetching OpenGraph data [#8021](https://github.com/diaspora/diaspora/pull/8021)

* Fix "remember me" with two factor authentication enabled [#8031](https://github.com/diaspora/diaspora/pull/8031)



## Features

* Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966)

* Improve communication about signing up on closed pods [#7896](https://github.com/diaspora/diaspora/pull/7896)



# 0.7.11.0



## Refactor

app/assets/stylesheets/home.scss

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ 
    padding: 15px;

  }



  .part-of-diaspora {

    font-style: italic;



    a {

      color: $white;

    }

  }



  .login-form {

    fieldset { background: none; }

app/assets/stylesheets/markdown-content.scss

+24 −0
Original line number Diff line number Diff line
@@ -16,6 +16,30 @@ 
    }

  }



  h1 {

    font-size: 2.7rem;

  }



  h2 {

    font-size: 2.3rem;

  }



  h3 {

    font-size: 2rem;

  }



  h4 {

    font-size: 1.8rem;

  }



  h5 {

    font-size: 1.6rem;

  }



  h6 {

    font-size: 1.4rem;

  }



  .img-responsive {

    display: inline;

  }

app/assets/stylesheets/registration.scss

+12 −11
Original line number Diff line number Diff line 
.page-registrations.action-new,

.page-registrations.action-create {

.page-registrations {

  .ball {

    background: image-url('branding/ball.png') no-repeat;

    background-size: contain;
@@ -12,19 +11,24 @@ 
    height: 633px;

  }



  @media (max-width: $screen-xs-max) {

    .v-center {

      height: auto;

    }

  }



  .content {

    display: table-cell;

    vertical-align: middle;



    h2 {

    h1 {

      font-size: 35px;

      margin: 12px;

      text-align: center;

      margin: 12px 0;

    }

  }



  form {

    max-width: 400px;

    max-width: 500px;

  }



  .captcha-img {
@@ -34,16 +38,13 @@ 
    width: 120px;

  }



  .captcha-input {

  .form-control.captcha-input {

    border-bottom: 1px solid $input-border;

    border-bottom-left-radius: 5px;

    border-bottom-right-radius: 5px;

    box-sizing: border-box;

    font-size: 16px;

    height: 40px;

    line-height: $line-height-base;

    padding: 10px 10px 10px 130px;

    width: 100%;

    padding-left: 130px;

  }



  .terms > a {

app/controllers/registrations_controller.rb

+8 −4
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
#   the COPYRIGHT file.



class RegistrationsController < Devise::RegistrationsController

  before_action :check_registrations_open_or_valid_invite!

  before_action :check_registrations_open_or_valid_invite!, except: :registrations_closed



  layout -> { request.format == :mobile ? "application" : "with_header" }

  layout -> { request.format == :mobile ? "application" : "with_header_with_footer" }



  def create

    @user = User.build(user_params)
@@ -28,13 +28,17 @@ class RegistrationsController < Devise::RegistrationsController 
    end

  end



  def registrations_closed

    render "registrations/registrations_closed"

  end



  private



  def check_registrations_open_or_valid_invite!

    return true if AppConfig.settings.enable_registrations? || invite.try(:can_be_used?)



    flash[:error] = params[:invite] ? t("registrations.invalid_invite") : t("registrations.closed")

    redirect_to new_user_session_path

    flash[:error] = t("registrations.invalid_invite") if params[:invite]

    redirect_to registrations_closed_path

  end



  def invite