Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e
Show author of NSFW post
2015-07-29 21:13:41 +02:00
fla
4aef8de571
Improve mobile drawer
2015-07-29 14:22:19 +02:00
Dennis Schubert
23c83b9447
Merge branch 'stable' into develop
2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0
Fix conversations view with no contacts
...
closes #6266
2015-07-29 12:08:35 +02:00
Jonne Haß
4abc0c5988
Merge branch 'stable' into develop
2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465
Update backbone.js
...
closes #6262
2015-07-29 10:04:18 +02:00
Jonne Haß
4094fb260d
Merge pull request #6263 from svbergerem/remove-remaining-span
...
Remove remaining span-* and improve mobile photos page
2015-07-29 01:35:05 +02:00
Steffen van Bergerem
816092c477
Remove remaining span-* and improve mobile photos page
2015-07-28 23:36:47 +02:00
Steffen van Bergerem
a2349052f4
Use autosize for mobile publisher
2015-07-28 20:15:11 +02:00
Steffen van Bergerem
1c11b374bf
Remove mbp-helper
2015-07-28 19:50:17 +02:00
Jonne Haß
d62c4387f3
Merge branch 'stable' into develop
2015-07-28 18:24:19 +02:00
cmrd Senya
fa411c73a7
Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js ( #5939 ).
...
closes #6257
2015-07-28 18:24:10 +02:00
Jonne Haß
6ee3843449
Merge branch 'stable' into develop
2015-07-26 13:11:49 +02:00
theworldbright
d724397168
Refactor posts controller
2015-07-26 12:58:42 +02:00
Steffen van Bergerem
1aebf74a3f
Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream
...
Fix page width on people view (BS3 regression)
2015-07-26 12:38:20 +02:00
Steffen van Bergerem
7f28c79156
Merge pull request #6246 from AugierLe42e/spv-align-icons
...
Better alignement of interaction icons
2015-07-26 01:46:37 +02:00
Jonne Haß
11a8ac614c
Merge pull request #6240 from svbergerem/contact-page-update-counts
...
Update number of contacts on contact page when adding/removing contacts
2015-07-24 22:02:39 +02:00
augier
00674fee74
Fix page width on people view (BS3 regression)
2015-07-24 21:08:54 +02:00
augier
1423ba73b8
Better alignement of interaction icons
2015-07-24 20:08:29 +02:00
Steffen van Bergerem
04191996a5
Add updates for 'only sharing' and 'all contacts'
2015-07-24 14:18:43 +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
Steffen van Bergerem
4a178e20e5
Update number of contacts on contact page when adding/removing contacts
2015-07-24 02:38: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
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
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
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
Steffen van Bergerem
cf4143f4a1
Remove jquery-idletimer
2015-07-20 03:51:03 +02:00
Steffen van Bergerem
295c8533a1
Fix profile visibility icon
2015-07-17 14:37:22 +02:00
Augier
adef7ee37c
Better display for stream faces
2015-07-15 20:31:40 +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
Dennis Schubert
aa86003cf9
Keep the hacky scope workaround in comments.js
...
because we still are supporting browsers without .bind() and I do not
want to break the patterns here.
Follow up to #6171 - I wanted to avoid feedback loop delays for that
little change.
2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)
df440ed8d8
Very minor changes of some JS files
2015-07-08 19:09:08 +02: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
