Dennis Schubert
|
3e76081919
|
Merge branch 'stable' into develop
|
2015-07-27 02:43:02 +02:00 |
|
Dennis Schubert
|
216bf51315
|
Merge branch 'master' into stable
|
2015-07-27 02:42:41 +02:00 |
|
Dennis Schubert
|
ff6f437c21
|
Merge branch 'release/0.5.2.0'
|
2015-07-27 02:41:28 +02:00 |
|
Dennis Schubert
|
1bd2fb3c73
|
Merge branch 'stable' into develop
|
2015-07-27 02:11:45 +02:00 |
|
Dennis Schubert
|
6c610ee587
|
PR #6243 is not included in 0.5.2.0...
|
2015-07-27 02:11:09 +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
|
3c584ce335
|
Add Changelog entry for #6207
[ci skip]
|
2015-07-26 00:13:19 +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 |
|
Jason Robinson
|
671f9498fe
|
Merge pull request #6249 from svbergerem/fix-mobile-polls
Fix percentage on mobile polls
|
2015-07-25 15:23:14 +03: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 |
|
Dennis Schubert
|
1904520d30
|
Merge branch 'stable' into develop
|
2015-07-24 04:17:02 +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 |
|
Jonne Haß
|
2ae8b2f611
|
Load diaspora.yml overrides for test env
|
2015-07-24 03:47:46 +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 |
|
Jonne Haß
|
6eebd5aa4c
|
Merge pull request #6237 from svbergerem/fix-poll-design
Fix poll design (show result)
|
2015-07-23 19:57:05 +02:00 |
|
Steffen van Bergerem
|
79dfdfa224
|
Add integration tests for mobile polls and locations
|
2015-07-23 17:30:53 +02:00 |
|
Jonne Haß
|
f4e0785e96
|
Merge branch 'stable' into develop
|
2015-07-23 17:02:55 +02:00 |
|
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 |
|