augier
00674fee74
Fix page width on people view (BS3 regression)
2015-07-24 21:08:54 +02:00
Jonne Haß
97c9561ab7
Merge branch 'stable' into develop
2015-07-24 11:33:47 +02:00
Jonne Haß
b9bc20c7ce
Backport statistics page to Bootstrap 2
2015-07-24 11:30:34 +02:00
Jonne Haß
c76cf90b62
Readd legacy services to statistics.json
2015-07-24 10:57:37 +02:00
Jonne Haß
d68b3f02bd
Expose whether chat is enabled as NodeInfo metadata
...
related to #6211
2015-07-24 04:16:54 +02:00
Dennis Schubert
be8f920c29
Merge branch 'stable' into develop
2015-07-24 04:05:32 +02:00
Jonne Haß
b7064677ff
Collapse StatisticsController into NodeInfoController
2015-07-24 03:51:31 +02:00
Jonne Haß
c928d6c117
Expose whether chat is enabled as NodeInfo metadata
...
related to #6211
2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca
Implement NodeInfo
2015-07-24 03:50:02 +02:00
Dennis Schubert
929248c112
Merge pull request #6230 from Flaburgan/add-viewport
...
Add viewport to desktop view
2015-07-23 23:46:49 +02:00
Jonne Haß
5a5d595339
Merge pull request #6238 from svbergerem/mobile-location-polls
...
Add location and polls to mobile website
2015-07-23 20:02:11 +02:00
Steffen van Bergerem
6fafa731e6
Display locations on mobile devices
2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443
Display polls on mobile devices
2015-07-23 14:09:38 +02:00
Steffen van Bergerem
853dc093cd
Fix poll design (show result)
2015-07-23 12:59:29 +02:00
Steffen van Bergerem
031faeece5
Fix regression for default.html
2015-07-22 22:00:37 +02:00
Jonne Haß
2cede713b1
Merge pull request #6228 from svbergerem/refactor-publisher-js
...
Refactor publisher_view.js
2015-07-22 20:59:35 +02:00
fla
2090b5f909
Add viewport to desktop view
2015-07-22 19:27:30 +02:00
Steffen van Bergerem
3d6918646e
Add js for aria-labelledby in conversations
2015-07-22 18:37:02 +02:00
Steffen van Bergerem
44c370513e
Refactor publisher_view.js
2015-07-22 17:36:25 +02:00
Jonne Haß
5ecafa2bb0
Merge pull request #6227 from svbergerem/accessibility
...
Improve accessibility of signin/signup/password and conversation pages
2015-07-22 15:09:21 +02:00
Steffen van Bergerem
5fd89961c4
Use aria-labelledby for conversations
2015-07-22 13:02:16 +02:00
Steffen van Bergerem
4819544030
Use sr-only and aria-labelledby on signup/signin/password pages
2015-07-22 12:24:09 +02:00
Jonne Haß
3af30718f9
Merge branch 'stable' into develop
2015-07-22 11:55:59 +02:00
Steffen van Bergerem
aa53763b98
Fix peeping tom on 404 error page
...
closes #6226
2015-07-22 11:55:24 +02:00
Jonne Haß
6e2a2d420c
Merge branch 'develop' of github.com:diaspora/diaspora into develop
2015-07-22 10:07:25 +02:00
Jonne Haß
0cbe7ec9a8
Merge branch 'stable' into develop
2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Dennis Schubert
3210fb3835
Merge pull request #6224 from svbergerem/sticky-footer
...
Sticky footer
2015-07-22 04:21:18 +02:00
Steffen van Bergerem
37352b1b10
Sticky footer
2015-07-22 02:40:23 +02:00
Steffen van Bergerem
839d76c15e
Moar entypo on mobile website
2015-07-21 21:16:46 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +02:00
Dennis Schubert
b4bc7d8198
Merge branch 'stable' into develop
2015-07-20 03:56:59 +02:00
Dennis Schubert
53c3ef1d2b
Merge branch 'release/0.5.2.0' into stable
2015-07-20 03:52:22 +02:00
Steffen van Bergerem
cf4143f4a1
Remove jquery-idletimer
2015-07-20 03:51:03 +02:00
Steffen van Bergerem
94b745d5c8
Merge branch 'stable' into develop
2015-07-20 01:31:33 +02:00
Ivan Korunkov
5ca9ca9844
Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource.
...
closes #6212
2015-07-20 01:31:22 +02:00
Ivan Korunkov
c98dacdfab
Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks.
2015-07-20 01:29:00 +02:00
Jonne Haß
3a4815996f
Merge branch 'stable' into develop
2015-07-17 20:21:19 +02:00
Rich**
48f5aed63e
Make default conversation subject translatable and properly capitalize it
...
closes #6206 , closes #6205
2015-07-17 20:20:00 +02:00
Steffen van Bergerem
295c8533a1
Fix profile visibility icon
2015-07-17 14:37:22 +02:00
Dennis Schubert
0f51d89ba5
Merge pull request #6200 from AugierLe42e/fix-stream-faces
...
Better display for stream faces
2015-07-16 03:39:21 +02:00
Augier
adef7ee37c
Better display for stream faces
2015-07-15 20:31:40 +02:00
Jonne Haß
9229f1dfd2
Merge branch 'stable' into develop
2015-07-14 09:58:59 +02:00
Alex Chvatal
634aa7b09a
capitalize Wiki in the links sidebar. closes #6188
...
closes #6193
2015-07-14 09:58:43 +02:00
Benjamin Neff
e4ca9f01e2
fix jsxc_helper_spec and use new url_to in jsxc_helper
...
closes #6151
2015-07-13 23:52:13 +02:00
Benjamin Neff
f875be8d5b
use federation-gem for webfinger/hcard generation
...
remove old webfinger/hcard generation code
this fixes #5143
2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598
Merge pull request #6151 from SuperTux88/federation-gem
...
Federation Gem Step 1: Webfinger/HCard generation
2015-07-12 17:02:23 +02:00
Benjamin Neff
0ffe513b40
fix jsxc_helper_spec and use new url_to in jsxc_helper
2015-07-11 11:19:42 +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
