Jonne Haß
|
24d9be2e68
|
Merge branch 'stable' into develop
|
2015-08-27 21:03:16 +02:00 |
|
augier
|
2ce7a1e185
|
Mobile subdomain
closes #6354
|
2015-08-27 21:01:36 +02:00 |
|
Jonne Haß
|
a30ba5697e
|
Merge pull request #6290 from Raven24/pod_test
test pods for connectivity
|
2015-08-27 11:38:18 +02:00 |
|
Steffen van Bergerem
|
b4a5819aa8
|
Merge pull request #6349 from Faldrian/beautify-blocked-persons
Beautify ignored people list and add diaspora handle for identification
|
2015-08-27 11:00:56 +02:00 |
|
Dennis Schubert
|
6b863defa3
|
Merge branch 'stable' into develop
|
2015-08-27 05:25:51 +02:00 |
|
Steffen van Bergerem
|
3c370ea56e
|
Remove unused js code (stream widget and dropdowns)
closes #6279
|
2015-08-25 04:26:17 +02:00 |
|
Jonne Haß
|
2bf6c87964
|
Merge branch 'stable' into develop
|
2015-08-23 22:49:51 +02:00 |
|
theworldbright
|
6e74ee7d21
|
Make PostPresenter inherit from BasePresenter
closes #6315
|
2015-08-23 22:49:45 +02:00 |
|
Steffen van Bergerem
|
eddfa7cb5c
|
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
Left and right navbar polishing
|
2015-08-23 11:29:51 +02:00 |
|
Jonne Haß
|
e54208d39b
|
Merge branch 'stable' into develop
|
2015-08-23 11:13:47 +02:00 |
|
Steffen van Bergerem
|
a7287f4f93
|
Disable the handlebars auto-indent feature
closes #6339
|
2015-08-23 11:13:42 +02:00 |
|
Steffen van Bergerem
|
40ef382a6e
|
Merge branch 'stable' into develop
|
2015-08-22 01:35:32 +02:00 |
|
Anton Tkachov
|
ef6c8a5448
|
Issue #6180: Update stream faces block if somebody was blocked
closes #6320
|
2015-08-22 01:35:23 +02:00 |
|
Jonne Haß
|
d396d5555f
|
Merge branch 'stable' into develop
|
2015-08-21 14:23:46 +02:00 |
|
Benjamin Neff
|
663835ed3a
|
remove old webfinger/hcard code
closes #6310
|
2015-08-21 14:23:08 +02:00 |
|
Jonne Haß
|
bd707c0d12
|
Merge pull request #6293 from svbergerem/typeahead
Replace jquery.autocomplete with typeahead.js
|
2015-08-12 15:05:46 +02:00 |
|
Jonne Haß
|
25be9ecfd2
|
Merge branch 'stable' into develop
|
2015-08-09 18:35:44 +02:00 |
|
theworldbright
|
d7c92431ae
|
Extract service from comments controller
closes #6307
|
2015-08-09 18:35:11 +02:00 |
|
Jonne Haß
|
480384a077
|
Merge branch 'stable' into develop
|
2015-08-06 22:56:30 +02:00 |
|
Steffen van Bergerem
|
dc576fb0d6
|
Check if person is nil in person_image_tag
closes #6286
|
2015-08-06 22:55:41 +02:00 |
|
Steffen van Bergerem
|
0aa453e437
|
Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile
Use entypo icons on mobile posts
|
2015-08-06 18:00:03 +02:00 |
|
Steffen van Bergerem
|
633d65fe27
|
Merge branch 'stable' into develop
|
2015-08-06 14:42:28 +02:00 |
|
Anton Tkachov
|
f1d6e9440b
|
Issue #6281: add url to hovercard avatar
closes #6297
|
2015-08-06 14:42:14 +02:00 |
|
Jonne Haß
|
85f9a0eaa9
|
Merge branch 'stable' into develop
|
2015-08-04 10:41:43 +02:00 |
|
Mikica Ivosevic
|
78b0fbbee6
|
Refactor HomeController#toggle_mobile
closes #6260
|
2015-08-04 10:41:21 +02:00 |
|
Steffen van Bergerem
|
b9db891fef
|
Merge pull request #6283 from AugierLe42e/clean-images
Suppress useless images
|
2015-08-02 23:26:46 +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 |
|
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 |
|
Steffen van Bergerem
|
922d700d92
|
Merge pull request #6233 from Flaburgan/improve-mobile-drawer-transition
Rework mobile drawer transition
|
2015-07-29 17:34:47 +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ß
|
99f7e2fc52
|
Merge pull request #6261 from svbergerem/remove-mbp-helper
Remove mbp helper and refactor mobile publisher js
|
2015-07-29 00:26:20 +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 |
|
Steffen van Bergerem
|
9fdc1bd9c5
|
Merge pull request #6254 from SansPseudoFix/Fix-6241-Capitalize-Powered
Fix capitalize for powered by diaspora - translation
|
2015-07-28 15:36:21 +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 |
|
Dennis Schubert
|
3c584ce335
|
Add Changelog entry for #6207
[ci skip]
|
2015-07-26 00:13:19 +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 |
|