Commit 39784516 authored by Jonne Haß's avatar Jonne Haß
Browse files

Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 

Allow additional profile fields (previously private profile) to be set public (new updated version)
parents 84d5a13c 7a5a0a90

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local 
## Features

* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)

* Add mobile services and privacy settings pages [#6086](https://github.com/diaspora/diaspora/pull/6086)

* Optionally make your extended profile details public [#6162](https://github.com/diaspora/diaspora/pull/6162)



# 0.5.2.0

Gemfile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ gem "bootstrap-sass", "3.3.5" 
gem "compass-rails",  "2.0.4"

gem "sass-rails",     "5.0.1"

gem "autoprefixer-rails", "5.2.1"

gem "bootstrap-switch-rails", "3.3.3"



# Database

Gemfile.lock

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ GEM 
    bootstrap-sass (3.3.5)

      autoprefixer-rails (>= 5.0.0.1)

      sass (>= 3.2.19)

    bootstrap-switch-rails (3.3.3)

    buftok (0.2.0)

    builder (3.2.2)

    byebug (4.0.5)
@@ -751,6 +752,7 @@ DEPENDENCIES 
  autoprefixer-rails (= 5.2.1)

  backbone-on-rails (= 1.1.2.1)

  bootstrap-sass (= 3.3.5)

  bootstrap-switch-rails (= 3.3.3)

  capybara (= 2.4.4)

  carrierwave (= 0.10.0)

  compass-rails (= 2.0.4)

app/assets/javascripts/app/pages/settings.js

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
app.pages.Settings = Backbone.View.extend({

  initialize: function() {

    $(".settings_visibility").tooltip({placement: "top"});

    $("[name='profile[public_details]']").bootstrapSwitch();

  }

});

// @license-end

app/assets/javascripts/app/router.js

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ app.Router = Backbone.Router.extend({ 
    "conversations": "conversations",

    "user/edit": "settings",

    "users/sign_up": "registration",

    "profile/edit": "settings",



    //new hotness

    "posts/:id": "singlePost",