Commit graph

16469 commits

Author SHA1 Message Date
cmrd Senya
e30293b9c1 Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser.
closes #6234
2015-07-23 17:02:52 +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
Jonne Haß
dce2101d9d Merge pull request #6232 from svbergerem/fix-default-html
Fix regression for default.html
2015-07-22 22:02:54 +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
Jonne Haß
46fa24f221 Merge pull request #6229 from svbergerem/accessibility-js
Add js for aria-labelledby in conversations
2015-07-22 18:51:44 +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
Steffen van Bergerem
c8f482064c Remove rake_helpers 2015-07-22 09:41:53 +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
Jonne Haß
d6587469e4 Merge pull request #6218 from svbergerem/mobile-entypo
Entypo on mobile website
2015-07-22 00:11:55 +02:00
Steffen van Bergerem
839d76c15e Moar entypo on mobile website 2015-07-21 21:16:46 +02:00
Jonne Haß
2ae1d0215a Merge pull request #6219 from svbergerem/admin-dashboard-improve-wording
Improve wording for admin dashboard
2015-07-21 20:45:56 +02:00
Steffen van Bergerem
8f27e8fae8 Improve wording for admin dashboard 2015-07-21 20:43:18 +02:00
Jonne Haß
dbbaf90c27 Merge pull request #6216 from svbergerem/admin-page-update-notifications
Add dashboard to admin page
2015-07-21 16:55:27 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Jonne Haß
3d6ae08e84 Merge branch 'stable' into develop 2015-07-20 17:49:01 +02:00
Jonne Haß
1dd76d7c60 Merge branch 'release/0.5.2.0' into stable 2015-07-20 17:48:10 +02:00
Jonne Haß
c0a0f5e076 updated 24 locale files [ci skip] 2015-07-20 17:45:09 +02:00
Jonne Haß
7c233aa216 Drop rails-assets-autosize from Gemfile.lock 2015-07-20 17:42:42 +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
b707ec9622 Update jasmine-ajax 2015-07-20 03:52:03 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Steffen van Bergerem
aa75572815 Update perfect-scrollbar 2015-07-20 03:44:48 +02:00
Steffen van Bergerem
7a8269ce05 Update jquery-placeholder 2015-07-20 03:42:58 +02:00
Steffen van Bergerem
60e3b0c55f Update highlightjs 2015-07-20 03:39:08 +02:00
Steffen van Bergerem
032e292e82 Update markdown-it 2015-07-20 03:39:08 +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ß
3e841905ec Merge branch 'stable' into develop 2015-07-20 00:58:33 +02:00
Jonne Haß
ccf2fad903 Start 0.5.3.0 development cycle 2015-07-20 00:57:24 +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
Jonne Haß
00fc14e265 Merge pull request #6204 from svbergerem/fix-profile-visibility-icon
Fix profile visibility icon
2015-07-17 15:39:49 +02:00
Steffen van Bergerem
295c8533a1 Fix profile visibility icon 2015-07-17 14:37:22 +02:00