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
Dennis Schubert
c703cadf9b
Merge branch 'stable' into develop
2015-07-07 02:51:38 +02:00
Dennis Schubert
b5b5f1f028
Revert "Issue #6145 : Set a fixed body-height" for global side effects
...
This reverts commit 990c678cd3
2015-07-07 02:50:30 +02:00
Dennis Schubert
eecceacd46
Merge branch 'stable' into develop
2015-07-07 02:46:39 +02:00
Haidy777
990c678cd3
Issue #6145 : Set a fixed body-height
...
closes #6169
2015-07-07 02:46:34 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
Dennis Schubert
8b773c89e1
Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments
...
Fix for #5483 and #5757 (mobile stream comments)
2015-06-27 04:43:50 +02:00
Steffen van Bergerem
d6ddbbe4af
Navbar background color for autocomplete results
2015-06-21 21:13:57 +02:00
Jonne Haß
79c5202a5b
Merge pull request #6109 from svbergerem/bootstrap-header-rewrite
...
Bootstrap header rewrite
2015-06-21 19:46:07 +02:00
SansPseudoFix
57ac37cd2d
Fix broken avatar getting start page
...
Update add contact page
BS3
Fix syntax
2015-06-21 16:38:12 +02:00
Steffen van Bergerem
b3c535bab4
Add color theme support for new header
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
fla
264f41a09d
Add Services and Privacy settings page to mobile
2015-06-18 17:26:31 +02:00
theworldbright
3ac66128ad
Restyle button and adjust position of back up arrow
...
Squashed commits:
[47c4a02] Remove styling for return to top of post button
2015-06-17 22:23:25 +09:00
Steffen van Bergerem
ae0209b49b
Merge branch 'stable' into develop
2015-06-16 23:43:32 +02:00
Jonne Haß
3a527d01da
Remove top margin for first heading in a post
...
That is, if it's the first element in the post
closes #6110
2015-06-16 23:43:14 +02:00
Steffen van Bergerem
b3a5e92eca
Remove all faceboxes
2015-06-15 14:09:24 +02:00
Steffen van Bergerem
ab60644aa0
Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design
...
Improve mobile conversation design
2015-06-15 13:26:49 +02:00
fla
44a12e74b1
Improve mobile conversation design
2015-06-15 12:32:03 +02:00
Steffen van Bergerem
92a3dd53f0
Replace jquery.autoresize with autosize
2015-06-14 20:03:15 +02:00
Steffen van Bergerem
6c32fa7845
Fix Bootstrap 3 regression: add email visibility icon to settings page
2015-06-07 22:31:58 +02:00
efstrian
69c3a4100d
Issue #4297 : Color themes can override bootstrap variables
2015-06-07 19:58:54 +03:00
dimana
31d760867c
Issue #4297 : Updated color themes and testing
2015-06-07 19:57:37 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
Steffen van Bergerem
06a1a1c978
Fix Bootstrap3 regression: reshares in SPV
2015-06-07 12:01:13 +02:00
Augier
0d0d5d6aa1
Fixing infinite scroll and notif dropodown loaders
2015-06-07 10:28:22 +02:00
Steffen van Bergerem
7b7700b317
Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input
2015-06-05 12:09:42 +02:00
Steffen van Bergerem
fd3da0f0b3
Profile padding fixes
2015-06-05 02:37:43 +02:00
Steffen van Bergerem
0a0c3f48f2
Merge pull request #6057 from AugierLe42e/drawer-fix
...
Fixed variable drawer width
2015-06-05 00:21:36 +02:00
Steffen van Bergerem
39fe6bfff2
Set max-width to 100% for images in post-content
2015-06-05 00:12:05 +02:00
Steffen van Bergerem
2da262a262
Bootstrap3: fix likes avatars and conversation participants
2015-06-04 22:49:42 +02:00
Augier
7d1bba4e44
Fixed variable drawer width
2015-06-04 22:35:19 +02:00
SansPseudoFix
f3938a173e
Fix pagination issue for mobile view
2015-06-04 18:08:00 +02:00
Steffen van Bergerem
3fdb8a2052
Fix mobile drawer
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
93dd3a3a72
Use nav-tabs for ToS
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
797ae8a918
Remove bootstrap-fix.scss
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
20c63b20ba
Remove inline css, use font-size-small
2015-06-04 18:05:45 +02:00
SansPseudoFix
9f6d6a2e80
Fix for too long username in notification dropdown
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
cc58c66e3d
Use media objects for mobile posts/comments/notifications
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
a3725599ef
Use darker version creation-blue and creation-green for brand-primary and brand-success
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557
Refactor button colors
2015-06-04 18:05:44 +02:00
Augier
d7522d9498
corrected failing cuke and social buttons
2015-06-04 18:05:44 +02:00
theworldbright
5589dac108
Perform compositional styling to "getting started"
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
46abdbdd1f
Style fixes for left navbar in notification view
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8e9ceb9a2b
Improve no message text and delete icon for conversations, fix regressions
2015-06-04 18:05:43 +02:00
Augier
0cbf581176
Better settings display
2015-06-04 18:05:43 +02:00
theworldbright
0e30c07903
Change line height to 20px for entypo form icons
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8a004ee02a
Overwrite Bootstrap variables and fix publisher
2015-06-04 18:05:43 +02:00
theworldbright
e372b4eb95
Remove some inline css and minor refactoring
2015-06-04 18:05:43 +02:00
