Commit graph

1105 commits

Author SHA1 Message Date
nullkal 1b57d4dd3a Fix account migration feature ()
* 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: 🇵🇱 ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-28 19:30:18 +09:00
Eugen Rochko 706e534455
Add UI for setting up account migration () 2017-11-27 22:47:06 +01:00
mayaeh c6b7c77229 i18n: Update ja translation for consumable invites. ()
* Add Japanese translation for consumable invites.

* Add Japanese translation.

* Update Japanese translation.
2017-11-27 20:23:14 +01:00
Eugen Rochko 740f8a95a9
Add consumable invites ()
* 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
spla d07983b56d Updated Catalan strings ()
* 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 662b8eefe8 Change navigation link for moderators () 2017-11-25 05:53:54 +01:00
mayaeh 7a45d382ea i18n: Update ja translations ()
* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.
2017-11-24 13:14:31 +01:00
Eugen Rochko e84fecb7e9
Add logging of admin actions ()
* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation ()

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

* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 ()

* Add color coding to audit log

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

* Update terminology (e-mail blacklist) ()

* 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
SerCom_KC bc4a726c24 i18n: (zh-CN) Add translations for & () 2017-11-23 02:49:21 +01:00
mayaeh fc2155019b Add Japanese translations. () 2017-11-21 17:11:33 +01:00
Joan Montané 53b7b81b43 Update and fix Catalan translation ()
* 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
mayaeh 08deec4c84 i18n: Update ja translation for moderator badge. ()
* 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 () 2017-11-19 04:15:50 +01:00
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages ()
* 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 () 2017-11-18 21:43:10 +01:00
Eugen Rochko 58cede4808
Profile redirect notes ()
* 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 6be72a3ec6 Updating Chinese (Simplified) translations ()
* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Change `静音` to `隐藏`

* i18n: (zh-CN) Add translations for  & 

* 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 
2017-11-18 14:35:11 +09:00
Eugen Rochko 24cafd73a2
Lists ()
* 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
Yamagishi Kazutoshi dc6e031364 Redirect to reports when moderator () 2017-11-17 03:26:34 +01:00
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red () 2017-11-17 01:22:38 +01:00
mayaeh f6bc6399e2 Add Japanese translation for DM block option. () 2017-11-15 03:57:09 +01:00
Eugen Rochko 546257bc7f Allow specifying STATSD_NAMESPACE () 2017-11-15 07:22:43 +09:00
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow ()
* Add option to block direct messages from people you don't follow

Fix 

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

* i18n: Update Polish translation (for ) ()
2017-11-14 21:12:57 +01:00
SerCom_KC c3ec1e87b8 Updating Chinese (Simplified) translations ()
* 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 ()

* 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 ()
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. () 2017-11-14 15:53:14 +09:00
Marcin Mikołajczak a6682a3000 i18n: fix typo in Polish translation () 2017-11-14 15:52:32 +09:00
Anna e só 0e6c4cb796 l10n: PT-BR translation updated ()
* 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 - Notify too short when abbrev in JA ()
* Fix  - Notify too short when abbrev in JA

Fix  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 ) ()
* i18n: Update Polish translation (for )

* 😑🔫
2017-11-11 22:31:20 +01:00
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions ()
* 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 ()
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 ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-09 14:23:06 +01:00
nullkal 36376b5e23 Translate ja () 2017-11-09 14:22:55 +01:00
Quenty31 eb97bd8af6 i10n OC: Memorial () + ()
* Changed ĩ => ï

* Changed ĩ => ï

* Add ability to disable login and mark accounts as memorial ()
2017-11-08 15:19:49 +01:00
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial ()
Fix 
2017-11-07 19:06:44 +01:00
MitarashiDango cbbeec05be Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) () 2017-11-07 19:06:30 +01:00
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis ()
* 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 () 2017-11-07 14:30:31 +01:00
Marcin Mikołajczak d48779cf7b i18n: Improve Polish translation ()
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 () 2017-11-05 13:07:59 +01:00
Quenty31 da3adc0a73 l10n Occitan ()
* 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 + 

* 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) () 2017-11-01 14:46:05 +01:00
Yamagishi Kazutoshi 8ae9bd0eea Upgrade compression-webpack-plugin to version 1.0.1 () 2017-11-01 14:42:19 +01:00
Nolan Lawson 0692991b54 Add ServiceWorker caching for static assets () 2017-10-31 12:25:51 +01:00
Yamagishi Kazutoshi a2a4bf4e78 Update dependencies for Ruby (2017-10-30) ()
* 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 ()
* 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 ()

* 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. () 2017-10-29 02:08:37 +09:00
Marcin Mikołajczak 2cbb8e8cd1 i18n: Update Polish translation () 2017-10-28 12:43:20 +09:00
Akihiko Odaki e4080772b5 Use contenthash for ExtractTextWebpackPlugin ()
[hash] is not documented.
2017-10-27 23:54:20 +09:00
nullkal 781105293c Feature: Unlisted custom emojis () 2017-10-27 16:11:30 +02:00
Ratmir Karabut 20fee786b1 Update Russian translation ()
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line

* Update Russian translation (sessions)

* Update Russian translation

* Update Russian translation

* Fix merge conflicts (revert)

* Update Russian translation

* Update Russian translation (fix)

* Update Russian translation (fix quotes)

* Update Russian translation (fix quotes)

* Update Russian translation (fix)

* Update Russian translation

* Add quotes

* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Anna e só 74777599cf l10n: PT-BR translation updated () 2017-10-25 23:11:03 +09:00
Håkan Eriksson c710069c12 Some typos and supplementation in sentence structures ()
* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

* Swedish - Typos and supplementation in sentence structure

* Update simple_form.sv.yml

* Update sv.yml

* Update sv.yml

Rearranged the alphabetical order.
2017-10-18 13:50:52 +02:00
Jeroen 363d0d3a44 Dutch: A few strings I found last minute ()
* Dutch: A few strings I found last minute

* Update simple_form.nl.yml
2017-10-17 23:15:40 +02:00
JeanGauthier 33ea042dec i18n better wording (OC/CA/FR) + string added in FR ()
* Update oc.json

* Update fr.json

* Update ca.json

* Update fr.json

* Update simple_form.fr.yml

* Update ca.json

* Update fr.json

* Update oc.json

* Update oc.json

* Update fr.json
2017-10-17 21:49:39 +02:00
Jakob Kramer e6c9756fa9 Update German translation () 2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi 5050719fac Add Japanese translations ()
* yarn manage:translations

* Add Japanese translation for 

* Add Japanese translation for 
2017-10-17 11:47:05 +02:00
Yamagishi Kazutoshi 989553c69a Normalize locale files () 2017-10-17 11:45:59 +02:00
masarakki 0e0c6b1b4b use-DB_NAME-in-development () 2017-10-17 11:45:37 +02:00
Håkan Eriksson a2b600428c Swedish translation ()
* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete
2017-10-17 13:41:36 +09:00
Jeroen df1a9c5ab5 Small update Dutch (nl) strings ()
* Update Dutch strings

* Update Dutch
2017-10-17 01:00:23 +02:00
Marcin Mikołajczak 3c530d95f6 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16 14:09:51 +02:00
JeanGauthier 1e7b3bf625 i18n ultim hour «More» dropdown title + reduce motion ()
* Correction fem. form

* More dropdown title

* More dropdown title

* More dropdown title

* Add option to reduce motion ()
2017-10-16 14:09:26 +02:00
Nolan Lawson fa0be3f834 Add option to reduce motion ()
* Add option to reduce motion

* Use HOC to wrap all Motion calls

* fix case-sensitive issue

* Avoid updating too frequently

* Get rid of unnecessary change to _simple_status.html.haml
2017-10-16 09:36:15 +02:00
voidSatisfaction 3e2f793948 Add up-to-date korean translation on serverside ()
* chore: add korean translation on ko.yml

* feat: add simple form korean translation up-to-date
2017-10-15 23:08:30 +02:00
JeanGauthier 8eb7d30a6c l10n Occitan: finishing touches ()
* Update oc.json

* Update oc.yml
2017-10-15 23:07:32 +02:00
Yannick A 7fe1428cc4 Update French translation () 2017-10-15 21:21:05 +09:00
spla f63a40e7c2 Updated Catalan strings ()
* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings
2017-10-14 14:40:35 +02:00
Yannick A c6f76db2e1 Update French translation ()
Update French translation
2017-10-14 14:30:19 +02:00
Masoud Abkenar 2c704ca9c6 l10n: update Persian translation for 2.0 () 2017-10-14 14:28:19 +02:00
Mathias B c1a2707ecf Correct some misspellings ()
* Correct some misspellings 

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'
2017-10-14 03:34:59 +02:00
Anna e só ad917cda10 l10n: PT-BR translation updated ()
* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed
2017-10-13 06:16:43 +09:00
Jeroen f398ad1994 Updating more Dutch strings for 2.0 () 2017-10-12 21:33:37 +02:00
Alda Marteau-Hardi 3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. () 2017-10-12 16:31:14 +02:00
JohnD28 691e9112f3 Update fr.yml ()
* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.
2017-10-12 15:25:34 +02:00
Marcin Mikołajczak 9d84b6e606 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-12 16:56:03 +09:00
JeanGauthier bf0f7e8846 Moderation notes () 2017-10-12 15:28:15 +09:00
nullkal 4817744b87 Update ja.yml ()
* Update ja.yml

* Update simple_form.ja.yml
2017-10-12 12:18:13 +09:00
Sylvhem 3ebe03b729 Fixes and updates for the French translation ()
* Ajout du support des thèmes multiples

Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.

Add translations for the new strings allowing support for multiple themes.

* Mise à jour de la traduction

Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.

Update modified strings and add new translations for the ones who are missing them.

* Remplace « ' » par « ’ »

Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.

Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
2017-10-12 00:58:01 +02:00
JohnD28 fe6941e28e Update doorkeeper.fr.yml () 2017-10-11 22:04:36 +09:00
Nolan Lawson bebaa6eced Remove prop types from external libraries () 2017-10-10 18:44:51 +02:00
Jakob Kramer 616f53eea8 Update German translation () 2017-10-10 23:12:18 +09:00
Jeong Arm 9d97054fe6 Remove timestamps on any option () 2017-10-09 17:52:02 +02:00
unarist 7fd66cf2fe Fix migration failure due to StrongMigrations on production env () 2017-10-09 10:05:35 +02:00
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses ()
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future
2017-10-08 17:34:34 +02:00
m4sk1n f0c939c431 i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-08 16:00:55 +09:00
Jeong Arm ebadfe0ab7 Translate some Esperanto ()
* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format
2017-10-08 14:30:14 +09:00
JeanGauthier 94f15338c3 i18n update Occitan ()
* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json
2017-10-08 14:18:27 +09:00
Nolan Lawson 7de6d269d2 Use ES module build of react-router-dom () 2017-10-08 02:55:58 +02:00
nullkal 633426b261 Add moderation note ()
* Add moderation note

* Add frozen_string_literal

* Make rspec pass
2017-10-07 20:26:43 +02:00
Eugen Rochko f486ef2666 Redesign public hashtag pages () 2017-10-07 20:00:35 +02:00
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub ()
* Encode custom emojis as resolveable objects in ActivityPub

* Improve code style
2017-10-07 17:43:42 +02:00
Jeong Arm 0e0a9e716c Korean translation ()
* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci
2017-10-07 14:16:59 +09:00
m4sk1n 4413d81d7f i18n: Update Polish translation ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-06 22:43:32 +02:00
Eugen Rochko eb5ac23434 Clean up code style of Mastodon::TimestampId module ()
* Clean up code style of Mastodon::TimestampId module

* Update brakeman config
2017-10-06 03:42:21 +02:00
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable () 2017-10-05 23:42:05 +02:00
Lynx Kotoura 32e8a87830 adjust public profile pages 2 () 2017-10-04 22:49:36 +02:00
Jakob Kramer 636acb5712 Update German translation () 2017-10-04 20:03:41 +02:00