Download as
Browse Code »

Commit 469b20636dc46c244f93c6139083f04c17fb134f

Authored by Victor Costa
2 parents ea969be6 5cb72f37
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'staging' of gitlab.com:participa/noosfero into staging

Showing 3 changed files with 1 additions and 3 deletions   Show diff stats
lib/noosfero/api/entities.rb
  Diff comments   View file @469b206
... ... @@ -66,7 +66,6 @@ module Noosfero
66 66 class Person < Profile
67 67 root 'people', 'person'
68 68 expose :user, :using => UserBasic, documentation: {type: 'User', desc: 'The user data of a person' }
69   - expose :orientacao_sexual, :identidade_genero, :transgenero, :etnia
70 69 end
71 70  
72 71 class Enterprise < Profile
... ...
plugins/juventude
  Diff comments   View file @469b206
1   -Subproject commit 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc
  1 +Subproject commit aaf94bccdadc7542f7c1e66dd4d2d416ec5a8809
... ...
public/designs/themes/cube-responsive/theme.yml
  Diff comments   View file @469b206
... ... @@ -2,4 +2,3 @@ name: &quot;Noosfero responsive some Bootstrap styling&quot;
2 2 layout: "application-responsive"
3 3 icon_theme: [awesome, pidgin]
4 4 responsive: true
5   -public: true
... ...