luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity
6179 commits 1 branch 0 tags 248 MiB
Commit graph

6179 commits

This branch
This branch
All branches
Author SHA1 Message Date
mayaeh 1c293086a1 i18n: Add Japanese translations for #7000 (#7022) 
* run yarn manage:translations.

* run i18n-tasks add-missing ja.

* Update Japanese translations.
 2018-04-03 18:21:33 +09:00
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000) 
* Implement Assignment of Reports (#6967)

* Change translation of admin.report.comment.label to "Report Comment" for clarity

As we'll soon add the ability for reports to have comments on them, this clarification makes sense.

* Implement notes for Reports

This enables moderators to leave comments about a report whilst they work on it

* Fix display of report moderation notes

* Allow reports to be reopened / marked as unresolved

* Redirect to reports listing upon resolution of report

* Implement "resolve with note" functionality

* Add inverse relationship for report notes

* Remove additional database querying when loading report notes

* Fix tests for reports

* Fix localisations for report notes / reports
 2018-04-02 22:04:14 +02:00
David Yip 1f5bdd8445
Merge pull request #410 from ThibG/glitch-soc/fixes/compose-disable 
[Glitch] Fix: Prevent submission using same logic as submit button disabling
 2018-04-02 14:42:09 -05:00
Thibaut Girka ca9f022a80 [Glitch] Fix: Prevent submission using same logic as submit button disabling. 
Port 6a895e1ab3 to glitch-soc
 2018-04-02 20:04:18 +02:00
Eugen Rochko 36eac8ba90
Do not default SMTP verify mode to "peer", default to "none" (#6996) 2018-04-02 19:19:51 +02:00
unarist 2c51bc0ca5 Add missing rejection handling for Promises (#7008) 
* Add eslint-plugin-promise to detect uncaught rejections

* Move alert generation for errors to actions/alert

* Add missing rejection handling for Promises

* Use catch() instead of onReject on then()

Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though.
 2018-04-02 14:51:02 +02:00
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) 2018-04-02 13:45:07 +02:00
Emelia Smith 4fd71accd4 Fix issues with sending direct messages from user profile (#6999) 
* Clear compose textarea when starting a new direct message

Previous behaviour resulted in potentially misdirected direct messages.

* Hide search when starting to compose a direct message
 2018-04-02 13:44:19 +02:00
Yamagishi Kazutoshi 3f51c6efaa Weblate translations (2018-04-02) (#7007) 
* Translated using Weblate (Galician)

Currently translated at 100.0% (587 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (587 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (587 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Arabic)

Currently translated at 76.4% (449 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Slovak)

Currently translated at 92.3% (542 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 92.3% (542 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (58 of 58 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Polish)

Currently translated at 98.9% (581 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/

* Translated using Weblate (French)

Currently translated at 99.6% (585 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (586 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Persian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (French)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (586 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (587 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/

* Translated using Weblate (Arabic)

Currently translated at 76.6% (450 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (587 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Slovak)

Currently translated at 92.6% (544 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/

* Translated using Weblate (Arabic)

Currently translated at 82.9% (487 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 98.6% (74 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/

* Translated using Weblate (Slovak)

Currently translated at 93.6% (550 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 95.4% (560 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/

* Translated using Weblate (Korean)

Currently translated at 100.0% (58 of 58 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Korean)

Currently translated at 99.8% (586 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (280 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (Arabic)

Currently translated at 82.9% (487 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 99.2% (278 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Arabic)

Currently translated at 87.3% (513 of 587 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 99.6% (279 of 280 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* bundle exec i18n-tasks normalize && yarn manage:translations

* revert
 2018-04-02 13:43:30 +02:00
Evgeny Petrov b04f73ce66 Russian language updated (#7005) 
* Russian language updated

* Small fixes for RU language

* bundle exec i18n-tasks normalize
 2018-04-02 19:49:06 +09:00
luzi82 24611d8deb i18n: update zh-HK translation (#7004) 
* i18n: update zh-HK translation

* i18n: update zh-HK translation

* i18n-tasks normalize
 2018-04-02 19:11:37 +09:00
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
 2018-04-01 20:24:50 -05:00
Eugen Rochko f890d2a766
Support all ActivityPub actor types (#6997) 
Fix #6973
 2018-04-02 02:10:53 +02:00
Eugen Rochko 33513753b9
Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124) 
Federate custom emojis with accounts
 2018-04-01 23:55:42 +02:00
Yamagishi Kazutoshi f464f98fd3 Update Ruby to version 2.4.4 (#6964) 
https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/

> This release includes some bug fixes and some security fixes.
>
> - CVE-2017-17742: HTTP response splitting in WEBrick
> - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir
> - CVE-2018-8777: DoS by large request in WEBrick
> - CVE-2018-8778: Buffer under-read in String#unpack
> - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket
> - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir
> - Multiple vulnerabilities in RubyGems
 2018-04-01 23:43:08 +02:00
Emelia Smith 6a895e1ab3 Fix: Prevent submission using same logic as submit button disabling. (#6993) 
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
 2018-04-01 22:19:43 +02:00
luzi82 993ce0e5a7 improve zh-HK localization by referring zh-TW and zh-CN (#6988) 2018-04-01 21:57:26 +09:00
Marcin Mikołajczak 929f58f180 i18n: Update Polish translation (#6985) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-04-01 10:31:38 +02:00
mayaeh b7d633c1bb i18n: Add Japanese translations for domain blocks (#6979) 
* run yarn manage:translations

* Update Japanese translations for domain blocks.
 2018-03-31 21:09:39 +09:00
Daniel Hunsaker 3886bfb5eb [Nanobox] Enable ElasticSearch support by default (#6977) 
Admins can still disable the feature by adding `ES_ENABLED=false` to their environment, if they prefer not to use it. Be sure to set the variable before you deploy!
 2018-03-31 13:17:25 +02:00
unarist fb3dc00dda Ignore AbortError when cancelled sharing (#6978) 
`navigator.share()` rejects Promise if user cancelled sharing, and it may
print it as an error on JavaScript console.

This patch ignores it and prints other errors on the console.
 2018-03-31 13:16:38 +02:00
Jenkins f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
beatrix 01bad04efd
Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js 
Add “public” pack to admin controller, as it is included in upstream …
 2018-03-30 14:50:19 -04:00
beatrix 3304cb681d
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 
Port #6628 to glitch-soc flavour
 2018-03-30 14:50:02 -04:00
David Yip 257146c960
Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes 
Backport dropdown menu fixes from Mastodon
 2018-03-30 11:29:26 -05:00
David Yip 9248d1e3a7
Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page 
Fix migration page style
 2018-03-30 11:27:57 -05:00
Thibaut Girka b305e7452a Add “public” pack to admin controller, as it is included in upstream admin layout 
Fixes CW unfolding in moderation
 2018-03-30 18:16:47 +02:00
ThibG e573bb0990 Fix compatibility with PeerTube (#6968) 
* Support fetching objects of convertible types by URL (fixes #6924)

* Ignore invalid hashtags
 2018-03-30 15:44:54 +02:00
Thibaut Girka 167a2ecde0 Fix migration page style 2018-03-30 15:26:12 +02:00
Thibaut Girka 48bcf4d6e8 [Glitch] Remove pointer events on the entire UI when a dropdown menu is open 
Port 913a38111f to glitch-soc
 2018-03-30 12:45:23 +02:00
ThibG a6c129ddbd Add some UI for user-defined domain blocks (#6628) 
* Keep list of blocked domains

Might be overkill, but I'm trying to follow the same logic as for blocked users

* Add basic domain block UI

* Add the domain blocks UI to Getting Started

* Fix undefined URL in `fetchDomainBlocks`

* Update all known users' domain_blocking relationship instead of just one's
 2018-03-30 12:38:00 +02:00
Thibaut Girka 2871a82fcc [Glitch] Place dropdown menu top if it is closer to the bottom of the viewport 
Port f6a8d835d3 to glitch-soc
 2018-03-30 12:31:29 +02:00
Thibaut Girka 218cc261d1 Add the domain blocks UI to Getting Started Misc 2018-03-30 10:07:33 +02:00
Thibaut Girka afa813d71f Add basic domain block UI 2018-03-30 10:07:33 +02:00
Thibaut Girka 482ad7d7c4 Keep list of blocked domains 
Might be overkill, but I'm trying to follow the same logic as for blocked users
 2018-03-30 10:07:33 +02:00
Thibaut Girka 79da0ad7a2 Update all known users' domain_blocking relationship instead of just one's 2018-03-30 10:07:33 +02:00
Thibaut Girka 937ace10d9 Fix undefined URL in fetchDomainBlocks 2018-03-30 10:07:33 +02:00
Pierre-Morgan Gate 47cee7cc8e Upgrade charlock_holmes to version 0.7.6 (#6966) 
This version fixes compilation errors when trying to build its native extension with ICU 61.
 2018-03-30 09:52:44 +02:00
takayamaki 947eedcab2 update ja locale (#6965) 
related https://github.com/tootsuite/mastodon/pull/6956
 2018-03-30 10:04:04 +09:00
Emelia Smith d1f34151ae Feature: Direct message from menu (#6956) 
* Implement ability to send direct messages from the user menu

* Implement message warning users that direct messages are visible to all mentioned users

* Update locales
 2018-03-29 19:08:34 +02:00
David Yip 1bd12cf8eb
Merge pull request #404 from ThibG/glitch-soc/features/moved-note 
[Untested] [Glitch] Profile redirect notes
 2018-03-29 09:26:31 -05:00
Thibaut Girka b5948044b3 [Glitch] Display unfollow button even if account moved 
Backport 3987bd18a4 to glitch-soc
 2018-03-29 14:59:20 +02:00
Thibaut Girka a59c146bf8 [Glitch] Profile redirect notes 
Port WebUI changes from 58cede4808
 2018-03-29 14:59:20 +02:00
unarist f1f846045f Fix ReferenceError when Cache API is missing (#6953) 
Cache API is not supported on Safari 11.0 / iOS 11.

Since those caching is optional, this patch simply ignores it.
 2018-03-29 14:57:02 +02:00
unarist 41452e8302 Fix TypeError on follow notification (#6950) 
`notification.status` may not be present, e.g. follow notification.
 2018-03-29 12:59:12 +02:00
ThibG 9ed5eebd7c Do not ignore unknown media attachments, only skip them (#6948) 
That way, they are displayed in a list below the corresponding toot.
 2018-03-29 00:52:24 +02:00
David Yip 4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents 
Render toots with empty contents
 2018-03-28 16:39:12 -05:00
David Yip d37a79adce
Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup 
Fix attachment lists
 2018-03-28 16:38:53 -05:00
Thibaut Girka 7db431eac6 Fix attachment lists 2018-03-28 22:19:36 +02:00