Mohammed Rashid
dd42635442
Issue #6235 : Add hoverable class inside the a tag
...
closes #6267
2015-07-30 04:18:06 +02:00
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ß
602ad2d209
Merge branch 'stable' into develop
2015-07-28 18:35:18 +02:00
Mikica Ivosevic
c8b01cb62c
application_controller.rb
...
refactor method after_sign_out_path_for
closes #6258
2015-07-28 18:35:13 +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
SansPseudoFix
a0eb2f065c
Fix capitalize for powered by diaspora - translation
2015-07-27 13:47:34 +02:00
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +02:00
Jonne Haß
6ee3843449
Merge branch 'stable' into develop
2015-07-26 13:11:49 +02:00
theworldbright
2a3dde1ae5
Refactor PostService and extract its tests
...
Squashed commits:
[ada0f09] Remove favorites from Posts table
closes #6208
2015-07-26 13:10:24 +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
Dennis Schubert
e8297f8d6b
Merge pull request #6207 from jaywink/social-relay
...
Implement social relay requirements
2015-07-25 23:01:45 +02:00
Steffen van Bergerem
9ca8005b27
Fix percentage on mobile polls
2015-07-25 04:34:52 +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
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
Steffen van Bergerem
4a178e20e5
Update number of contacts on contact page when adding/removing contacts
2015-07-24 02:38:49 +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
Jason Robinson
bdf6c71772
Implement social relay functionality
...
* .well-known/social-relay - to serve subscription preferences to relays
* Workers.deferred_dispatch relay carbon copy functionality for outbound sending
See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
2015-07-18 21:29:31 +03: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
Jonne Haß
84d5a13ce1
Merge branch 'stable' into develop
2015-07-11 00:17:19 +02:00
realtin
9eadc251ae
added post guid to the post_serializer
...
closes #6185
2015-07-11 00:17:01 +02:00
zaziemo
787c1cfce9
add spec and code to include guid in comment's export
...
#6115
2015-07-11 00:16:24 +02:00
Benjamin Neff
46a22fefe9
use federation-gem for webfinger/hcard generation
...
remove old webfinger/hcard generation code
this fixes #5143
2015-07-10 01:46:48 +02: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
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
Jonne Haß
1e4224813e
Merge branch 'stable' into develop
2015-07-05 20:50:42 +02:00
Benjamin Neff
b0a9a6342f
add url_to
...
closes #6168
2015-07-05 20:46:18 +02:00
Benjamin Neff
f45e053316
remove unused publics_helper
...
the Subscriber stuff was removed in 2010:
f97218c005
2015-07-05 20:44:24 +02:00
Benjamin Neff
540b8df1b8
don't get url from hcard, is already set from webfinger
...
prepare for federation refactoring
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
Jonne Haß
69974bdc13
Merge pull request #6161 from svbergerem/fix-conversation-modal
...
Fix two modal issues
2015-07-03 20:26:31 +02:00
Steffen van Bergerem
61edda0fca
Aspect creation modal now creates an aspect when pressing enter
2015-07-03 18:20:32 +02:00
Steffen van Bergerem
db00bd1b03
Fix conversation modal on contacts page
2015-07-03 17:44:12 +02:00
Steffen van Bergerem
aeda8e37e3
Remove aspects-dropdown.js
2015-07-03 16:56:25 +02:00
