Jenkins
94c5a11cda
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
David Yip
87c1f91505
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
2017-11-17 14:01:23 -06:00
David Yip
45f18b8f49
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
2017-11-17 14:01:23 -06:00
Lynx Kotoura
731c859097
Increase contrast of Admin badges ( #5740 )
...
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17 19:59:53 +01:00
Lynx Kotoura
4a2fc2d444
Increase contrast of Admin badges ( #5740 )
...
To comply WCAG 2.0 guidelines on contrast ratio.
2017-11-17 19:59:53 +01:00
Clworld
6547ebee48
Fix regression #5467 : fixes emoji copy ( #5739 )
2017-11-17 18:22:31 +01:00
Clworld
e1ebf36352
Fix regression #5467 : fixes emoji copy ( #5739 )
2017-11-17 18:22:31 +01:00
Alex Coto
eaf6f94773
Change libinconv download URL to HTTPS ( #5738 )
2017-11-17 18:21:05 +01:00
Alex Coto
ae6dd08121
Change libinconv download URL to HTTPS ( #5738 )
2017-11-17 18:21:05 +01:00
David Yip
bcdd0f8b9d
Update StatusPolicy to check current_account for local_only? toots.
...
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream. This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
2017-11-17 09:07:21 -06:00
David Yip
f6355f6ffb
Update StatusPolicy to check current_account for local_only? toots.
...
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream. This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
2017-11-17 09:07:21 -06:00
unarist
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
unarist
e28b33c89c
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
David Yip
ff4e474bcd
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -06:00
David Yip
2a386ad88d
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -06:00
David Yip
c687853d80
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
2017-11-17 00:14:24 -06:00
David Yip
fbf76feb37
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
2017-11-17 00:14:24 -06:00
David Yip
801ecbfa5a
Throw layout, isWide, navbarUnder back into mapStateToProps.
...
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-17 00:11:01 -06:00
David Yip
392945f9a3
Throw layout, isWide, navbarUnder back into mapStateToProps.
...
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-17 00:11:01 -06:00
kibigo!
bbef750b04
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
4dd19054d6
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
kibigo!
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
David Yip
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi
b80a35092e
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
Yamagishi Kazutoshi
dc6e031364
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
ysksn
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
ysksn
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Eugen Rochko
3df46ce5a8
Fix some rubocop style issues ( #5730 )
2017-11-17 10:06:26 +09:00
Eugen Rochko
3e90987c8b
Fix some rubocop style issues ( #5730 )
2017-11-17 10:06:26 +09:00
Eugen Rochko
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Eugen Rochko
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Renato "Lond" Cerqueira
f366a83c6c
Improve language filter ( #5724 )
...
* Scrub text of html before detecting language.
* Detect language on statuses coming from activitypub.
* Fix rubocop comments.
* Remove custom emoji from text before language detection
2017-11-16 13:51:38 +01:00
Renato "Lond" Cerqueira
ad207456d6
Improve language filter ( #5724 )
...
* Scrub text of html before detecting language.
* Detect language on statuses coming from activitypub.
* Fix rubocop comments.
* Remove custom emoji from text before language detection
2017-11-16 13:51:38 +01:00
ysksn
bf1d4a2cb9
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
2017-11-16 12:13:03 +01:00
ysksn
9e3d24a150
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
2017-11-16 12:13:03 +01:00
Surinna Curtis
96f629193f
Merge pull request #216 from glitch-soc/merge-upstream-ab48f2b
...
Merge upstream at commit ab48f2b
2017-11-16 01:38:26 -06:00
Surinna Curtis
ee560abdbe
Merge pull request #216 from glitch-soc/merge-upstream-3023725
...
Merge upstream at commit 3023725
2017-11-16 01:38:26 -06:00
Surinna Curtis
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
Surinna Curtis
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
ysksn
a766ece166
Add tests for Status#verb ( #5717 )
2017-11-16 15:46:29 +09:00
ysksn
556c07df1f
Add tests for Status#verb ( #5717 )
2017-11-16 15:46:29 +09:00
David Yip
ed9254c4e9
Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env
...
Allow streaming server to take bindhost from HOST env
2017-11-15 23:40:07 -06:00
David Yip
88627fd7aa
Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env
...
Allow streaming server to take bindhost from HOST env
2017-11-15 23:40:07 -06:00
David Yip
235b13498f
Add some examples for Glitch::KeywordMute::TagMatcher. #208 .
2017-11-15 23:31:49 -06:00
David Yip
c2a92dffc9
Add some examples for Glitch::KeywordMute::TagMatcher. #208 .
2017-11-15 23:31:49 -06:00
Daggertooth
3bcaa27a99
Allow streaming server to take bindhost from HOST env
2017-11-15 21:20:35 -06:00
Daggertooth
7e17e764a5
Allow streaming server to take bindhost from HOST env
2017-11-15 21:20:35 -06:00
ysksn
ab48f2b239
Add tests for Status#hidden? ( #5719 )
2017-11-16 11:07:27 +09:00
