mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 22:55:07 +01:00
Code Issues Projects Releases Wiki Activity
5,052 Commits 134 Branches 269 Tags 907 MiB
3614912be2
Commit Graph

651 Commits

Author SHA1 Message Date
David Yip
3614912be2
Normalize pl translation. 2017-11-28 12:17:36 -06:00
David Yip
95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master 2017-11-28 11:45:13 -06:00
Yamagishi Kazutoshi
15fab79cfa Show "expired" in invite index (#5838) 
* Show "expired" in invite index

* "Force expire" -> "Deactivate"
 2017-11-28 15:41:02 +01:00
nullkal
1b57d4dd3a Fix account migration feature (#5837) 
* Make removable account migration

* Fix error during update of account migration setting

* Add notice when update account migration setting
 2017-11-28 14:31:23 +01:00
Marcin Mikołajczak
d937a59997 i18n: 🇵🇱 (#5841) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-28 19:30:18 +09:00
David Yip
7463d80ff4
Merge remote-tracking branch 'tootsuite/master' 2017-11-27 22:33:26 -06:00
David Yip
8bad6bdd00
Normalize config/locales/en.yml. 2017-11-27 22:32:31 -06:00
Eugen Rochko
706e534455
Add UI for setting up account migration (#5832) 2017-11-27 22:47:06 +01:00
Jenkins
63d47e04c4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-27 20:17:12 +00:00
mayaeh
c6b7c77229 i18n: Update ja translation for consumable invites. (#5829) 
* Add Japanese translation for consumable invites.

* Add Japanese translation.

* Update Japanese translation.
 2017-11-27 20:23:14 +01:00
David Yip
e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master 2017-11-27 11:29:04 -06:00
Eugen Rochko
740f8a95a9
Add consumable invites (#5814) 
* Add consumable invites

* Add UI for generating invite codes

* Add tests

* Display max uses and expiration in invites table, delete invite

* Remove unused column and redundant validator

- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
  checks invite code validity

* Add admin setting to disable invites

* Add admin UI for invites, configurable role for invite creation

- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to

* Do not remove invites from database, expire them instantly
 2017-11-27 16:07:59 +01:00
Jenkins
5de42665d7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-27 05:17:11 +00:00
spla
d07983b56d 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
Jenkins
86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-25 05:17:15 +00:00
mayaeh
7a45d382ea i18n: Update ja translations (#5804) 
* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.
 2017-11-24 13:14:31 +01:00
Jenkins
167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-24 01:17:20 +00:00
Eugen Rochko
e84fecb7e9
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
Jenkins
41c71565c2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-23 02:17:12 +00:00
SerCom_KC
bc4a726c24 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764) 2017-11-23 02:49:21 +01:00
Jenkins
2a5af9c10c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-21 17:17:11 +00:00
mayaeh
fc2155019b Add Japanese translations. (#5769) 2017-11-21 17:11:33 +01:00
Marcin Mikołajczak
1a07b83c69 i18n: Update Polish translation - back-end (#230) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-21 16:36:22 +01:00
Joan Montané
53b7b81b43 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
David Yip
d083f7741a Merge remote-tracking branch 'tootsuite/master' 2017-11-19 01:30:29 -06:00
mayaeh
08deec4c84 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
Lynx Kotoura
3d1d3d9a20 Remove translations of default theme (#5741) 2017-11-19 04:15:50 +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
Marcin Mikołajczak
b380e9d2cb i18n: Update Polish translation (#5749) 2017-11-18 21:43:10 +01: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
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
David Yip
b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
Eugen Rochko
2151fd3150
Display moderator badge (green), admin badge changed to red (#5728) 2017-11-17 01:22:38 +01:00
Surinna Curtis
35fbdc36f9 Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
mayaeh
f6bc6399e2 Add Japanese translation for DM block option. (#5704) 2017-11-15 03:57:09 +01:00
Eugen Rochko
fbef909c2a
Add option to block direct messages from people you don't follow (#5669) 
* Add option to block direct messages from people you don't follow

Fix #5326

* If the DM responds to a toot by recipient, allow it through

* i18n: Update Polish translation (for #5669) (#5673)
 2017-11-14 21:12:57 +01:00
SerCom_KC
c3ec1e87b8 Updating Chinese (Simplified) translations (#5643) 
* i18n: (zh-CN) Bug fix for note-counter.

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add support.array key for better wording

* Revert "i18n: (zh-CN) Add support.array key for better wording"

This reverts commit 27bf9a946e.
Looks like this commit can't get pass the checks, revert it for now.

* i18n: (zh-CN) Change `客户端` to `应用`

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translations (#5635)

* i18n: (zh-CN) Change `两步验证` to `双重认证`

* i18n: (zh-CN) Improve translations
 2017-11-14 20:44:42 +01:00
Marcin Mikołajczak
8087aa83d4 i18n: Update Polish translation (#5699) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-14 20:36:11 +01:00
mayaeh
249b0fe107 Add Japanese translations for moderator roles and its own admin actions. (#5689) 2017-11-14 15:53:14 +09:00
Marcin Mikołajczak
a6682a3000 i18n: fix typo in Polish translation (#5688) 2017-11-14 15:52:32 +09:00
Anna e só
0e6c4cb796 l10n: PT-BR translation updated (#5681) 
* Improved e-mail messages; delted repeated words

* pt-BR.json translations updated

* Revert "pt-BR.json translations updated"

This reverts commit 108c460531.

* Updated pt-BR.json

* pt-BR.yml updated
 2017-11-14 11:07:38 +09:00
KEINOS
252d0fe020 Fix #5652 - Notify too short when abbrev in JA (#5664) 
* Fix #5652 - Notify too short when abbrev in JA

Fix #5652 of the notification message to be understandable when abbreviated.

* Changed quotes as original

Double quote to single and single quote as none. But I am not convinced of this fix.

* Added a single quote as YAMLlint's suggestion

* `bundle exec i18n-tasks normalize`
 2017-11-12 16:51:47 +09:00
Marcin Mikołajczak
fcb9533549 i18n: Update Polish translation (for #5635) (#5661) 
* i18n: Update Polish translation (for #5635)

* 😑🔫
 2017-11-11 22:31:20 +01:00
Eugen Rochko
7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635) 
* Add moderator role and add pundit policies for admin actions

* Add rake task for turning user into mod and revoking it again

* Fix handling of unauthorized exception

* Deliver new report e-mails to staff, not just admins

* Add promote/demote to admin UI, hide some actions conditionally

* Fix unused i18n
 2017-11-11 20:23:33 +01:00
Matt
e5aa4128f6 Update en.yml (#5648) 
Changed "Toots with replies" to read "Toots and replies"
 2017-11-10 02:58:33 +01:00
Marcin Mikołajczak
cfd7b7a0b7 i18n: Update Polish translation (#5639) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-09 14:23:06 +01:00
nullkal
36376b5e23 Translate ja (#5637) 2017-11-09 14:22:55 +01:00
Quenty31
eb97bd8af6 i10n OC: Memorial (#5615) + #5467 (#5623) 
* Changed ĩ => ï

* Changed ĩ => ï

* Add ability to disable login and mark accounts as memorial (#5615)
 2017-11-08 15:19:49 +01:00
Eugen Rochko
1032f3994f
Add ability to disable login and mark accounts as memorial (#5615) 
Fix #5597
 2017-11-07 19:06:44 +01:00