nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16493 commits 4 branches 0 tags 121 MiB
Commit graph

1048 commits

Author SHA1 Message Date
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
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
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ß
2cede713b1 Merge pull request #6228 from svbergerem/refactor-publisher-js 
Refactor publisher_view.js
 2015-07-22 20:59:35 +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
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ß
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
Jonne Haß
d6587469e4 Merge pull request #6218 from svbergerem/mobile-entypo 
Entypo on mobile website
 2015-07-22 00:11:55 +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
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
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
Jonne Haß
0e439f6c1c Merge branch 'stable' into develop 2015-07-16 11:12:16 +02:00