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

4642 Commits (df636e03c85cb962475b15fea3263804a51db844)

Author SHA1 Message Date
Akihiko Odaki ce0d30feb7 Do not filter the status collection after muting and blocking (#5815) 
Filtering the status collection wipes out even the profiles of muted and
blocked accounts. However, the behavior is inconsistent with the server-
side behavior.
 2017-11-26 01:45:17 +01:00
SerCom_KC 7cdf02f2d4 i18n: (zh-CN) Add translations for #5746 & #5750 (#5816) 2017-11-26 02:38:40 +09:00
Akihiko Odaki 16a49799cf Allow to open a modal for embedded photo (#5777) 2017-11-25 15:41:45 +01:00
Akihiko Odaki 7df80c9e83 Rename ariaLabel property of Dropdown to title (#5813) 
DropdownMenu has ariaLabel property, but it is actually applied to title
property of IconButton. Keep it consistent.
 2017-11-25 15:41:08 +01:00
spla eddbf2e485 Updated Catalan strings (#5801) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml
 2017-11-25 23:22:59 +09:00
Yamagishi Kazutoshi 6a6e49d032 Change navigation link for moderators (#5812) 2017-11-25 05:53:54 +01:00
Yamagishi Kazutoshi 8fde0aed51 Add Japanese translations (#5810) 
* yarn manage:translations

* Add Japanese translation for #5087

* Add Japanese translation for #5616

* Add Japanese translation for #5746

* Add Japanese translation for #5750
 2017-11-25 03:39:57 +01:00
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789) 
this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.
 2017-11-25 01:36:08 +01:00
Eugen Rochko bf8eab12ba Display list column (#5750) 2017-11-25 00:35:37 +01:00
abcang 3db3ca1258 Fix unnecessary order (#5807) 2017-11-24 18:41:07 +01:00
sdukhovni 019c39bf1d Don't remove originals of boosted toots from timeline (#5479) 
* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline
 2017-11-24 14:43:53 +01:00
ysksn 4dd95c79a5 Add tests for Streamable (#5771) 2017-11-24 14:42:57 +01:00
abcang 17bde15f53 Add index of account and reblog to statuses (#5785) 2017-11-24 14:42:09 +01:00
ysksn 5dd8a36c09 Add tests for AccountRelationshipsPresenter (#5805) 2017-11-24 14:41:04 +01:00
mayaeh 9a930c0623 i18n: Update ja translations (#5804) 
* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.
 2017-11-24 13:14:31 +01:00
Akihiko Odaki 0319b92979 Do not require onClose property in NavigationBar (#5802) 
NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.
 2017-11-24 13:13:17 +01:00
Eugen Rochko efc97d404c Add logging of admin actions (#5757) 
* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation (#5782)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 (#5795)

* Add color coding to audit log

* Change dismiss->resolve, log all outcomes of report as resolve

* Update terminology (e-mail blacklist) (#5796)

* Update terminology (e-mail blacklist)

imho looks better

* Update en.yml

* Fix code style issues

* i18n-tasks normalize
 2017-11-24 02:05:53 +01:00
Devon Blandin cbeb60ffc8 Disable Code Climate maintainability checks (#5798) 
- Migrate `.codeclimate.yml` to version 2 structure
- Disable Code Climate [maintainability checks][]

https://docs.codeclimate.com/docs/advanced-configuration

[maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment

This commit upgrades the Code Climate configuration file and disables
the new maintainability checks.

Once this PR is merged, we can experiment with the new checks via pull
requests (the PR will report new issues) or via the [Code Climate
CLI][cli], which [now also supports the new maintainability
checks][cli-support].

[cli]: https://github.com/codeclimate/codeclimate
[cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c
 2017-11-23 21:38:17 +01:00
SerCom_KC 97bb620b48 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764) 2017-11-23 02:49:21 +01:00
mayaeh 9841d20c97 Add Japanese translations. (#5769) 2017-11-21 17:11:33 +01:00
Joan Montané daec402a58 Update and fix Catalan translation (#5773) 
* Update activerecord.ca.yml

* Update ca.yml

* Update devise.ca.yml

* Update doorkeeper.ca.yml

* Update simple_form.ca.yml

* fix syntax error for ca translation

* fix syntax errors in ca translations

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-21 23:17:28 +09:00
ysksn 4086db0929 Add tests for Remotable (#5768) 2017-11-21 13:59:36 +09:00
abcang 4e409e629d Fixed duplicating URL of photo type of oEmbed (#5763) 2017-11-20 20:45:54 +01:00
abcang ef14321fff Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753) 2017-11-19 15:33:15 +01:00
abcang defb2fd0b0 Fix N+1 at notification (#5752) 2017-11-19 15:32:48 +01: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
Marcin Mikołajczak 1f5f446f08 i18n: Update Polish translation (#5749) 2017-11-18 21:43:10 +01: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
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
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
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
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734) 2017-11-17 15:18:20 +01: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
ysksn a766ece166 Add tests for Status#verb (#5717) 2017-11-16 15:46:29 +09:00
ysksn ab48f2b239 Add tests for Status#hidden? (#5719) 2017-11-16 11:07:27 +09:00
Daniel Hunsaker fc2366daf3 [Nanobox] Apply Release Notes Changes (#5670) 
Apparently I missed some things in earlier commits/releases that needed to be applied to the Nanobox setup. All minor things, nothing that breaks anything, but still best to get them in place.

- Move cron jobs to their own component, so the Sidekiq component can be scaled up to multiple instances without causing issues with running the same cron job multiple times at once.
- Update cron jobs to the latest requirements, removing extraneous ones
- Add new variables to `.env.nanobox`
- Update Nginx to use correct cache header directives
 2017-11-15 16:26:53 +01:00
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706) 
* Move some tests of User into Settings::ScopedSettings

* Add a test for User@settings
 2017-11-15 16:05:20 +01:00