7 commits

Author	SHA1	Message	Date
Dennis Schubert	be8f920c29	Merge branch 'stable' into develop	2015-07-24 04:05:32 +02:00
Jonne Haß	397845161f	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)	2015-07-11 10:19:19 +02:00
cmrd Senya	7a5a0a909a	Allow extended profile fields (previously private profile) to be set public (#5684). ... This adds a new boolean field "public_details" to person model. By default it is false and represents old behaviour. When it is set to true, extended profile (bio,location,gender,birthday) get available to people who didn't log into diaspora and to people you don't share with (i.e. it is made public). In UI, a bootstrap-switch added on the profile-edit page in order to change the setting. This also changes wording from public/private profile to basic/extended. The latter could be public and limited.	2015-07-11 04:36:45 +03:00
Steffen van Bergerem	9c4f80346b	Use entypo-rails mappings	2015-07-03 15:31:29 +02:00
Steffen van Bergerem	049c8eb384	Bootstrap header rewrite	2015-06-20 00:38:40 +02:00
Steffen van Bergerem	b3a5e92eca	Remove all faceboxes	2015-06-15 14:09:24 +02:00
efstrian	69c3a4100d	Issue #4297: Color themes can override bootstrap variables	2015-06-07 19:58:54 +03:00

Renamed from app/assets/stylesheets/application.scss (Browse further)