ysksn
2590aac863
Add tests for AccountInteractions ( #5751 )
...
* Add tests for class methods of AccountInteractions
* Add tests for instance methods of AccountInteractions
2017-11-19 04:16:14 +01:00
Lynx Kotoura
3d1d3d9a20
Remove translations of default theme ( #5741 )
2017-11-19 04:15:50 +01:00
ysksn
8f638a2bf2
Add a test for Settings::Extend#settings ( #5720 )
2017-11-19 04:15:32 +01:00
ysksn
9d9b1aff1e
Add tests for Status#title ( #5718 )
2017-11-19 04:15:17 +01:00
Yamagishi Kazutoshi
bfdcf76a64
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
2017-11-19 04:13:57 +01:00
beatrix
bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
2017-11-18 20:32:17 -05:00
kibigo!
321fa41930
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
2017-11-18 15:18:00 -08:00
kibigo!
a9ed857171
WIP static themeing
2017-11-18 15:12:52 -08:00
Marcin Mikołajczak
b380e9d2cb
i18n: Update Polish translation ( #5749 )
2017-11-18 21:43:10 +01:00
kibigo!
92cc79be72
Enabled vanilla thmee
2017-11-18 11:06:04 -08:00
kibigo!
08a01dd037
Public pack fix
2017-11-18 11:05:39 -08:00
kibigo!
672ace5a20
Media styling
2017-11-18 11:05:23 -08:00
kibigo!
f51f7b0e06
Font styles are now packagified
2017-11-18 11:05:00 -08:00
Eugen Rochko
58cede4808
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
2017-11-18 19:39:02 +01:00
beatrix
dec960c828
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
2017-11-18 12:06:40 -05:00
Jenkins
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-18 06:17:14 +00:00
SerCom_KC
6be72a3ec6
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
2017-11-18 14:35:11 +09:00
Baptiste Gelez
2864e5e077
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
2017-11-18 04:44:19 +01:00
kibigo!
a618df7998
Sets default theme to glitch
2017-11-17 19:32:04 -08:00
kibigo!
fc2c8b50dd
Removed glitch tests
2017-11-17 19:29:17 -08:00
kibigo!
e19fc6a9f8
Restore vanilla components
2017-11-17 19:29:16 -08:00
kibigo!
45c44989c8
Forking glitch theme
2017-11-17 19:29:16 -08:00
beatrix
5a9982b425
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
...
Make character limit configurable (from tootsuite/mastodon#5697 )
2017-11-17 19:02:40 -05:00
David Yip
284e2cde81
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
2017-11-17 17:58:13 -06:00
David Yip
130aa90d55
Update annotations on Follow, FollowRequest, and Mute.
...
Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.
2017-11-17 17:41:15 -06:00
David Yip
1ab12ba38e
Merge remote-tracking branch 'origin/master' into merge-upstream
2017-11-17 17:40:00 -06:00
Eugen Rochko
24cafd73a2
Lists ( #5703 )
...
* Add structure for lists
* Add list timeline streaming API
* Add list APIs, bind list-account relation to follow relation
* Add API for adding/removing accounts from lists
* Add pagination to lists API
* Add pagination to list accounts API
* Adjust scopes for new APIs
- Creating and modifying lists merely requires "write" scope
- Fetching information about lists merely requires "read" scope
* Add test for wrong user context on list timeline
* Clean up tests
2017-11-18 00:16:48 +01:00
David Yip
6f8ccbfcdf
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (e28b33c.. 94c5a11
2017-11-17 14:35:16 -06:00
David Yip
dc16d73bf5
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
2017-11-17 14:28:16 -06:00
beatrix
b006bb82af
Merge pull request #221 from glitch-soc/local-only-policy
...
Update StatusPolicy to check current_account for local_only? toots.
2017-11-17 15:17:49 -05:00
Jenkins
94c5a11cda
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00: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
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
e1ebf36352
Fix regression #5467 : fixes emoji copy ( #5739 )
2017-11-17 18:22:31 +01:00
Alex Coto
ae6dd08121
Change libinconv download URL to HTTPS ( #5738 )
2017-11-17 18:21:05 +01: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
e28b33c89c
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
David Yip
2a386ad88d
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
2017-11-17 00:24:22 -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
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!
4dd19054d6
Removes spin theme
2017-11-16 21:54:12 -08:00
kibigo!
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi
dc6e031364
Redirect to reports when moderator ( #5733 )
2017-11-17 03:26:34 +01:00
ysksn
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Eugen Rochko
3e90987c8b
Fix some rubocop style issues ( #5730 )
2017-11-17 10:06:26 +09: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
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
9e3d24a150
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
2017-11-16 12:13:03 +01: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
