treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
4,993 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

4993 Commits (1dc24ece41f2968c78745a0bc14fc139f388e9f7)

Author SHA1 Message Date
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master' 2017-11-19 01:30:29 -06:00
mayaeh 52111769d0 i18n: Update ja translation for moderator badge. (#5731) 
* Update Japanese translation for moderator badge.

* Follows English notation
 2017-11-19 04:16:56 +01:00
ysksn 42cb1425c6 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 8a8bea2e53 Remove translations of default theme (#5741) 2017-11-19 04:15:50 +01:00
ysksn a7d85563bd Add a test for Settings::Extend#settings (#5720) 2017-11-19 04:15:32 +01:00
ysksn c09c37af98 Add tests for Status#title (#5718) 2017-11-19 04:15:17 +01:00
Yamagishi Kazutoshi bffc1b880b 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 34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme 
Glitch/Vanilla themes
 2017-11-18 20:32:17 -05:00
Marcin Mikołajczak 1f5f446f08 i18n: Update Polish translation (#5749) 2017-11-18 21:43:10 +01:00
kibigo! 25361848e3 Enabled vanilla thmee 2017-11-18 11:06:04 -08:00
kibigo! f0aedba604 Public pack fix 2017-11-18 11:05:39 -08:00
kibigo! a8c0c7a2c1 Media styling 2017-11-18 11:05:23 -08:00
kibigo! 0c90d1ab38 Font styles are now packagified 2017-11-18 11:05:00 -08:00
Eugen Rochko b89f614bd7 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 27ca589183 Merge pull request #208 from yipdw/keyword-mute 
Run keyword mutes on hashtags
 2017-11-18 12:06:40 -05:00
Jenkins cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-18 06:17:14 +00:00
SerCom_KC e618b6c136 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 51b2f7d79e Make it possible to bind streming service to 0.0.0.0 (#5744) 2017-11-18 04:44:19 +01:00
kibigo! b8fdcfd55e Sets default theme to glitch 2017-11-17 19:32:04 -08:00
kibigo! 5466150ea4 Removed glitch tests 2017-11-17 19:29:17 -08:00
kibigo! 7c5614c667 Restore vanilla components 2017-11-17 19:29:16 -08:00
kibigo! 68304a6ce5 Forking glitch theme 2017-11-17 19:29:16 -08:00
beatrix 61585f2c42 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 7db0145d21 Merge pull request #224 from yipdw/merge-upstream 
Merge upstream (tootsuite/mastodon#5703)
 2017-11-17 17:58:13 -06:00
David Yip 08751360a0 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 f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
Eugen Rochko e149067561 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 ce27681a76 Merge pull request #222 from yipdw/merge/tootsuite/master 
Merge upstream (5982d57.. 065e238)
 2017-11-17 14:35:16 -06:00
David Yip e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size 2017-11-17 14:28:16 -06:00
beatrix 57e301c5be 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 065e2388ba 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
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
Clworld 6547ebee48 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
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
unarist 5982d570de 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 c687853d80 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
kibigo! bbef750b04 Removes spin theme 2017-11-16 21:54:12 -08:00
kibigo! 5845057adb 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
Yamagishi Kazutoshi b80a35092e 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
Eugen Rochko 3df46ce5a8 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
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
ysksn bf1d4a2cb9 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