augier
|
5087f47e44
|
Suppress useless images
|
2015-08-02 21:42:09 +02:00 |
|
Jonne Haß
|
b7864a9976
|
Merge branch 'stable' into develop
|
2015-08-02 16:58:07 +02:00 |
|
theworldbright
|
cae5f94af0
|
Refactor status messages controller
closes #6280
|
2015-08-02 16:58:01 +02:00 |
|
Steffen van Bergerem
|
8e99a240c9
|
Use css spinner instead of gif
|
2015-08-01 13:00:48 +02:00 |
|
Steffen van Bergerem
|
bc89f73179
|
Add Bootstrap classes to mobile getting started input fields
|
2015-07-30 14:44:14 +02:00 |
|
Jonne Haß
|
4442616b0d
|
Merge branch 'stable' into develop
|
2015-07-30 12:01:35 +02:00 |
|
Steffen van Bergerem
|
536d1fe0e7
|
Move nsfw-shield to status-message
closes #6270
|
2015-07-30 12:00:48 +02:00 |
|
Steffen van Bergerem
|
bdfbbdc3eb
|
Merge branch 'stable' into develop
|
2015-07-30 04:20:26 +02:00 |
|
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 |
|