FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,305 Commits 3 Branches 0 Tags 211 MiB
Commit Graph

1198 Commits

Author SHA1 Message Date
Quenty31 7445f17571 OC language update (#5905) 
* Update

* update

* Update oc.yml

* bundle exec i18n-tasks normalize

* Update oc.yml
 2017-12-07 15:28:13 +09:00
Jenkins c63e6c9a2c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-07 00:17:14 +00:00
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme 
Advanced Next-Level Flavours And Skins For Mastodon™
 2017-12-06 17:44:07 -05:00
nightpool 9302369aa5 fix weblate for ja (#5906) 2017-12-07 07:08:22 +09:00
David Yip f1cbea77a4
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2017-12-06 15:40:59 -06:00
NCLS fde91988ab
Update ja.yml 2017-12-07 06:10:15 +09:00
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
Marcin Mikołajczak a0047fdca0 i18n: 🇵🇱 (#5903) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-12-07 05:04:35 +09:00
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894) 
* Remove rabl dependency

* Replicate old Oj configuration
 2017-12-06 15:04:49 +09:00
SerCom_KC 12cea76634 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849) 
* i18n: (zh-CN) Add missing translations for multiple PRs.
Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757

* i18n: (zh-CN) Fix translation for #5823 / #5835

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Change `发送者` to `作者`

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

* i18n: (zh-CN) Add missing translation for #5874

* i18n: (zh-CN) Improve translations for keyboard shortcuts
 2017-12-06 00:46:04 +09:00
kibigo! 5bed0f10ed Various fixes 2017-12-04 21:58:10 -08:00
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme 2017-12-04 11:07:01 -06:00
kibigo! 1c74ede69e Fixed a name + localizations 2017-12-04 00:19:39 -08:00
kibigo! bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-02 14:17:11 +00:00
mayaeh 51f2eca887 Add Japanese translations for invite filter. (#5869) 2017-12-02 15:09:56 +01:00
Marcin Mikołajczak b15482ce71 i18n: 🇵🇱 (#5865) 2017-12-02 03:19:30 +09:00
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
kibigo! 541fe9b110 Skins support 2017-11-30 19:29:47 -08:00
Jenkins d020ed1e05 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-29 22:17:13 +00:00
Marcin Mikołajczak 82ab9736d5 i18n: 🇵🇱 (#5851) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-29 20:51:24 +09:00
mayaeh a62039df27 Update Japanese translations. (#5844) 2017-11-29 15:41:21 +09:00
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
Yamagishi Kazutoshi 662b8eefe8 Change navigation link for moderators (#5812) 2017-11-25 05:53:54 +01: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
kibigo! 8812bab687 Minor fixes 2017-11-21 18:17:38 -08: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
kibigo! bdbbd06dad Finalized theme loading and stuff 2017-11-20 22:13:37 -08: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
beatrix bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme 
Glitch/Vanilla themes
 2017-11-18 20:32:17 -05: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
kibigo! a618df7998 Sets default theme to glitch 2017-11-17 19:32:04 -08: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
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
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 546257bc7f Allow specifying STATSD_NAMESPACE (#5700) 2017-11-15 07:22:43 +09: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 27bf9a946e886213e827cd985d4f62419db57534.
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 108c460531196fed6e6d14f93e8d8d047c835ffd.

* 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
MitarashiDango cbbeec05be Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617) 2017-11-07 19:06:30 +01:00
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) 
* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
 2017-11-07 14:49:32 +01:00
Yamagishi Kazutoshi 47b0c61853 Unify file upload to using fog (#5604) 2017-11-07 14:30:31 +01:00
Marcin Mikołajczak d48779cf7b i18n: Improve Polish translation (#5596) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-11-06 07:06:54 +09:00
Yamagishi Kazutoshi 8a588145d5 Update extract-text-webpack-plugin to version 3.0.2 (#5584) 2017-11-05 13:07:59 +01:00
beatrix 254b74c71f
add memorial to production.rb 
in memory of Natalie Nguyen

let her name ring through the ether
 2017-11-03 12:34:50 -04:00
Quenty31 da3adc0a73 l10n Occitan (#5586) 
* Update OC: time format

Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan
Harmonisation words in menu and confirmation windows

* Update for unlisted custum emoji + #5577

* correction subjonctiu

It's either siasque or siague

* Corrections

Any : qual que, in two words, else it means "some".
And "siasque" with S even if I don't pronounce it at all.

* Update oc.json
 2017-11-03 17:42:30 +09:00
MitarashiDango 38d072446b add account search condition (instance domain) (#5577) 2017-11-01 14:46:05 +01:00
Yamagishi Kazutoshi 8ae9bd0eea Upgrade compression-webpack-plugin to version 1.0.1 (#5581) 2017-11-01 14:42:19 +01:00
Nolan Lawson 0692991b54 Add ServiceWorker caching for static assets (#5524) 2017-10-31 12:25:51 +01:00
Yamagishi Kazutoshi a2a4bf4e78 Update dependencies for Ruby (2017-10-30) (#5566) 
* Update better_errors to version 2.4.0

* Update binding_of_caller to version 0.7.3

* Update bootsnap to version 1.1.5

* Update browser to version 2.5.2

* Update capistrano to version 3.10.0

* Update capistrano-bundler to version 1.3.0

* Update capistrano-rbenv to version 2.1.2

* Update capybara to version 2.15.4

* Update cld3 to version 3.2.1

* Update fabrication to version 2.18.0

* Update fog-openstack to version 0.1.22

* Update kaminari to version 1.1.1

* Update lograge to version 0.7.1

* Update nokogiri to version 1.8.1

* Update oj to version 3.3.9

* Update ox to version 2.8.1

* Update parallel_tests to version 2.17.0

* Update pkg-config to version 1.2.8

* Update rspec-rails to version 3.7.1

* Update rubocop to version 0.51.0

* Update scss_lint to version 0.55.0

* Update sidekiq to version 5.0.5

* Update sidekiq-scheduler to version 2.1.10

* Update tzinfo-data to version 1.2017.3

* Update webpacker to version 3.0.2

* bundle update
 2017-10-31 12:22:32 +01:00
SerCom_KC 29609fbb6a Updating Chinese (Simplified) translations (#5508) 
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines

* i18n: (zh-CN) fix punctuation

* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677

* i18n: (zh-CN) Update missing translations

* i18n: (zh-CN) Fixing errors

* i18n: (zh-CN) Fix indent error

* i18n: (zh-CN) Fix language tag

* i18n: (zh-CN) Remove quotes

* i18n: (zh-CN) Update translation (#5485)

* i18n: (zh-CN) Remove whitespaces, x -> ×

* i18n: (zh-CN) Rewording on time distance

* i18n: (zh-CN) Overall improvements

* i18n: (zh-CN) i18n-tasks normalization

* i18n: (zh-CN) Add missing translation
 2017-10-30 12:34:58 +09:00
Alda Marteau-Hardi 4080569c2d Fix a grammatical error in the notifications. (#5555) 2017-10-29 02:08:37 +09:00
Marcin Mikołajczak 2cbb8e8cd1 i18n: Update Polish translation (#5547) 2017-10-28 12:43:20 +09:00
Akihiko Odaki e4080772b5 Use contenthash for ExtractTextWebpackPlugin (#5462) 
[hash] is not documented.
 2017-10-27 23:54:20 +09:00
David Yip 870d71b78b Merge branch 'master' into gs-master 2017-10-27 09:45:25 -05:00
nullkal 781105293c Feature: Unlisted custom emojis (#5485) 2017-10-27 16:11:30 +02:00
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute 
Keyword muting
 2017-10-25 17:37:48 -04:00