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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
SansPseudoFix
|
a0eb2f065c
|
Fix capitalize for powered by diaspora - translation
|
2015-07-27 13:47:34 +02:00 |
|
Dennis Schubert
|
51bd0109c8
|
Merge branch 'stable' into develop
|
2015-07-27 02:52:59 +02:00 |
|
Dennis Schubert
|
24f755502d
|
Merge branch 'master' into stable
|
2015-07-27 02:52:52 +02:00 |
|
Dennis Schubert
|
a33eb01c03
|
Fix version number!
Yes. I am insane.
|
2015-07-27 02:52:03 +02:00 |
|
Dennis Schubert
|
9f18225cf3
|
Merge branch 'stable' into develop
|
2015-07-27 02:48:11 +02:00 |
|
Dennis Schubert
|
8a18f587cc
|
Merge branch 'master' into stable
|
2015-07-27 02:47:53 +02:00 |
|
Dennis Schubert
|
d4c4f1035f
|
Bump version
|
2015-07-27 02:47:06 +02:00 |
|
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 |
|