f24e258692
I18n: Update Czech pluralization and fix some language names ( #10015 )
...
* I18n: Update Czech pluralization
* I18n: Fix some language names
* I18n: Fix some language names
6 years ago
de60ff3809
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
d25756990a
Add available locales for lv, ms, sq ( #10008 )
6 years ago
aaf98669a5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
Two changes too close to each other, took both changes
6 years ago
4fb1d8129d
Replace unlock-alt icon with unlock ( #9952 )
6 years ago
ff721e2d49
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bb2dbd681f
Add attachment list fallback to public pages ( #9780 )
...
* Add attachment list fallback to public pages
Fixes #6714
* Refactor attachments lists
6 years ago
a78447a6a4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .eslintrc.yml
Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
Minor code cleanup when porting one of our features.
- app/models/account.rb
Note length validation has changed upstream.
We now use upstream's validation (dropped legacy glitch-soc
account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
Upstream has added support for scheduled toots, refactoring
the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
Not a real conflict, changes too close.
6 years ago
f2ec1803cb
Redesign admin instances area ( #9645 )
6 years ago
44f2224606
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
6 years ago
41676bb021
Rename hide_followers_count helper to hide_followers_count?
6 years ago
7eab6acc42
Add support for Malayalam in language filter ( #9624 )
6 years ago
48e6b2360d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/routes.rb
Upstream changed some admin routes, conflict was because of an added :show
action for statuses on our side. Kept it.
6 years ago
2e0d617b8b
Add moderation warnings ( #9519 )
...
* Add moderation warnings
Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.
Additionally, there are warning presets you can configure to save
time when performing the above.
* Use Account#local_username_and_domain
6 years ago
c2efe52de7
Remove MailerHelper does nothing ( #9604 )
6 years ago
ae7d5ee768
Move hide_followers_count logic to an helper
6 years ago
cabf2772ea
Add a per-user setting to hide followers count
...
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
6 years ago
20418dc7a7
Add admin setting to disable followers count
6 years ago
04204427d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb
Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
6 years ago
70da16b375
Make avatar and headers respect `auto_play_gif` ( #9515 )
...
* Do not animate account header art if user's GIF autoplay setting is off
Fixes #9472
* Honour currently logged-in user's GIF autoplay setting for account avatars
Fixes #9467
* Fix avatar display on some public pages when data is stored on a different host
* Use ternary operator instead of if/else for avatar/header URL
6 years ago
5548049e71
Add admin ability to remove an user's header image ( #9495 )
...
* Fix markup in admin/accounts/:id table for avatar
* Add admin ability to remove an user's header image
6 years ago
b62953b3d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
6 years ago
fd8ca11f19
Add profile directory ( #9427 )
...
Fix #5578
6 years ago
478abe3a58
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
6 years ago
305556274a
Redesign admin accounts index ( #9340 )
...
* Improve overview of accounts in admin UI
- Display suspended status, role, last activity and IP prominently
- Default to showing local accounts
- Default to not showing suspended accounts
* Remove unused strings
* Fix tests
* Allow filtering accounts by IP mask
6 years ago
46259a36d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
6 years ago
3ede0e8b95
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
...
Regression from #8942
6 years ago
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
6 years ago
c227151023
Add dns-prefetch if using different host for assets or uploads ( #8942 )
6 years ago
f627ea99e4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
6 years ago
1ae62b87ed
Change admin accounts default sort to most recent ( #8813 )
6 years ago
f5eaefc485
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
6 years ago
ad0670fe87
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit c8a1e945d9#8799 )"
This reverts commit ae20afbc80#8792 )"
This reverts commit 30b1bb0704#8776 )"
This reverts commit 84bcf89764#8484 )"
This reverts commit cc784f3c16
6 years ago
ae20afbc80
Migrate to font-awesome 5.0. ( #8799 )
6 years ago
5a049410f2
Refactor active_nav_class for use with multiple paths ( #8757 )
6 years ago
ae5c237607
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
6 years ago
d3105031f8
Redesign forms, verify link ownership with rel="me" ( #8703 )
...
* Verify link ownership with rel="me"
* Add explanation about verification to UI
* Perform link verifications
* Add click-to-copy widget for verification HTML
* Redesign edit profile page
* Redesign forms
* Improve responsive design of settings pages
* Restore landing page sign-up form
* Fix typo
* Support <link> tags, add spec
* Fix links not being verified on first discovery and passive updates
6 years ago
50978383f9
Group reports by target account ( #8674 )
...
* Group reports by target account
* Improve CSS
6 years ago
4dd208f482
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/oauth/authorizations_controller.rb
Just two changes being too close to one another.
Took both.
6 years ago
97be484888
Add Czech language option and locale data ( #8594 )
...
* Added Czech language option
* Added Czech language option
* Add Czech locale data
* Delete duplicate locale-data/cs.js
Duplicate locale-data is ignored in Mastodon.
see https://github.com/tootsuite/mastodon/blob/v2.5.0/config/webpack/generateLocalePacks.js#L25-L35
6 years ago
7134c1f522
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
6 years ago
9768e9f6ab
Enable ro and ta locales in Rails ( #8583 )
...
* Enable ro and ta locales in Rails
* Add Tamil and Romanian to language dropdown
6 years ago
696d73931c
Fix nil error in admin_account_link_to helper ( #8578 )
...
Fix #8573
6 years ago
65e4345a48
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
b13f1d470a
Do not show follow button on moved or memorial accounts ( #8546 )
...
This restores the logic from before the public profile redesign. Fixes #8503
6 years ago
daa6110ce7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml
Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
6 years ago
2eac55cb3a
Add Welsh language option ( #8536 )
6 years ago
4f4908311d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
6 years ago
9fe24fbf4b
Better singulars of account followers/toots. ( #8471 )
6 years ago
21641e9a82
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
f27c511e1c
Fix regression from #8439 ( #8455 )
...
Missing no-reduce-motion/reduce-motion body class
6 years ago
ae4240d236
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
6 years ago
660475198b
Add theme identifier to body classes for easier custom CSS styling ( #8439 )
...
Add forgotten custom CSS admin setting strings
6 years ago
86d2a9d480
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
653f3d822c
Avoid deleted attributes when building a Status from action log ( fixes #8371 ) ( #8373 )
6 years ago
bb7dce98a0
Improve federated ID validation ( #8372 )
...
* Fix URI not being sufficiently validated with prefetched JSON
* Add additional id validation to OStatus documents, when possible
6 years ago
c043697caa
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a68079e6ee
Make unfollow button light up red when hovered ( #8286 )
...
Fix #8284
6 years ago
767cc06fe2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
.circleci/config.yml
app/controllers/authorize_follows_controller.rb
app/javascript/packs/public.js
Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
6 years ago
273e8f0474
Add remote interaction dialog for toots ( #8202 )
...
* Add remote interaction dialog for toots
* Change AuthorizeFollow into AuthorizeInteraction, support statuses
* Update brakeman.ignore
* Adjust how interaction buttons are display on public pages
* Fix tests
6 years ago
e568124315
Add Georgian language translation ( #8250 )
...
* Add Georgian language translation
* i18n-tasks normalize
6 years ago
334f478db1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/status.rb
db/migrate/20180528141303_fix_accounts_unique_index.rb
db/schema.rb
Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
6 years ago
c97c032ae6
Prevent actions log from crashing when displaying deleted status ( fixes #8133 ) ( #8219 )
6 years ago
03ac196126
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
8254b9fb19
i18n: fix Slovak language name ( #8169 )
6 years ago
5ed6f6db1d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
6 years ago
6e3cb11f3c
Public profile endorsements (accounts picked by profile owner) ( #8146 )
6 years ago
1159490f00
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
6 years ago
13df3889f0
Redesign public profiles and toots ( #8068 )
6 years ago
3a4a87d9c0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2629ffb68a
Weblate translations (2018-07-25) ( #8065 )
...
* Translated using Weblate (Italian)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Danish)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Slovak)
Currently translated at 97.2% (625 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Czech)
Currently translated at 5.1% (5 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Italian)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 83.5% (537 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Esperanto)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Galician)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Japanese)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Persian)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Japanese)
Currently translated at 98.7% (654 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.0% (656 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.2% (657 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Danish)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Danish)
Currently translated at 77.9% (516 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 74.1% (46 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Slovak)
Currently translated at 95.6% (633 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (658 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 96.2% (637 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Occitan)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Occitan)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Galician)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Added translation using Weblate (Asturian)
* Translated using Weblate (Danish)
Currently translated at 78.1% (518 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (German)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Asturian)
Currently translated at 4.0% (27 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Translated using Weblate (Asturian)
Currently translated at 19.6% (130 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Translated using Weblate (Italian)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Arabic)
Currently translated at 94.5% (627 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (German)
Currently translated at 96.9% (643 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Arabic)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Slovenian)
Currently translated at 1.0% (1 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sl/
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
* Add Asturian
6 years ago
4ec907e413
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
6 years ago
6cd4b45ec0
Display full acct on public status pages, always ( #8011 )
6 years ago
cf8121376b
Merge branch 'master' into glitch-soc/tentative-merge
...
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
6 years ago
34fdf77f48
Add more granular OAuth scopes ( #7929 )
...
* Add more granular OAuth scopes
* Add human-readable descriptions of the new scopes
* Ensure new scopes look good on the app UI
* Add tests
* Group scopes in screen and color-code dangerous ones
* Fix wrong extra scope
6 years ago
607654572a
Weblate translations (2018-07-05) ( #7950 )
...
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.5% (620 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 97.2% (606 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.5% (608 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Finnish)
Currently translated at 96.6% (602 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Translated using Weblate (Danish)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/da/
* Added translation using Weblate (Danish)
* Translated using Weblate (Danish)
Currently translated at 81.6% (58 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Danish)
Currently translated at 58.0% (36 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Danish)
Currently translated at 73.6% (56 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Added translation using Weblate (Swedish)
* Translated using Weblate (Swedish)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Danish)
Currently translated at 80.7% (248 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 37.2% (232 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Danish)
Currently translated at 78.9% (60 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Danish)
Currently translated at 87.0% (67 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Persian)
Currently translated at 98.7% (625 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Danish)
Currently translated at 81.1% (249 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Slovak)
Currently translated at 94.8% (73 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Arabic)
Currently translated at 96.1% (74 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 97.4% (75 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Korean)
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Galician)
Currently translated at 100.0% (633 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (634 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Slovak)
Currently translated at 96.1% (74 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Persian)
Currently translated at 99.6% (631 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (German)
Currently translated at 99.3% (629 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Danish)
Currently translated at 94.8% (73 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Danish)
Currently translated at 92.1% (283 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 40.9% (259 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Italian)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 84.5% (535 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (634 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Danish)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Danish)
Currently translated at 86.8% (66 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sl/
* Translated using Weblate (Arabic)
Currently translated at 96.2% (610 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Slovenian)
Currently translated at 29.0% (18 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sl/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (632 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Greek)
Currently translated at 98.1% (622 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Danish)
Currently translated at 98.3% (302 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Danish)
Currently translated at 63.4% (402 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 62.9% (39 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (618 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Added translation using Weblate (Greek)
* Added translation using Weblate (Greek)
* Translated using Weblate (Danish)
Currently translated at 70.6% (448 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Galician)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (French)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Greek)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/
* Translated using Weblate (Greek)
Currently translated at 61.2% (38 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/
* Translated using Weblate (Danish)
Currently translated at 98.6% (303 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Greek)
Currently translated at 72.5% (45 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.4% (618 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/
* Added translation using Weblate (Greek)
* Translated using Weblate (Greek)
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Danish)
Currently translated at 66.1% (41 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Greek)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/
* Added translation using Weblate (Greek)
* Translated using Weblate (Greek)
Currently translated at 14.2% (11 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Arabic)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 96.3% (611 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Greek)
Currently translated at 53.2% (41 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 55.8% (43 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 57.1% (44 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 61.0% (47 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
* Add Danish language
6 years ago
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
7 years ago
48d2312c1a
Fix double-encoding of display name in title and e-mails ( #7534 )
7 years ago
efd2441d1f
Merge branch 'master' into glitch-soc/merge
7 years ago
4d5bec8a75
Add Slovene language ( #7475 )
7 years ago
4072475241
Improvements to toots display in admin view ( #7452 )
...
* Distinguish boosts from original statuses in the admin panel (fixes #7449 )
* Show the “show more” button in admin view to make CWs clearer (fixes #7451 )
* Make content warnings swag
7 years ago
74c2a46423
Fetch boosted statuses on behalf of a follower ( fixes #7426 ) ( #7459 )
...
When an ActivityPub Announce is processed and the boosted toot is not known,
fetch it on behalf of one of the booster's followers. This is to allow
fetching self-boosts of previously-unknown private toots.
If fetching on behalf of a user fails, try fetching it anonymously: the
selected follower of a boosting user may be banned by the boosted toot's
author.
7 years ago
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
93553c17c8
Add Corsican localization ( #7390 )
...
* Added Corsican localization
* Declaring Corsican localization
* Fixed activerecord locale
* Added a missing translation and switched to French-style apostrophes
* Fixed a (predictable) mistake made while bulk-replacing apostrophes
* More fixing
* i18n-tasks normalize
7 years ago
4055ce490c
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
7 years ago
5bd8cda844
Add el and te ( #7332 )
...
* Add el and te
* Add missing locale files
7 years ago
ca1c696dbd
Slightly reduce RAM usage ( #7301 )
...
* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts
7 years ago
72793b3fc7
Support Actors/Statuses with multiple types ( #7305 )
...
* Add equals_or_includes_any? helper in JsonLdHelper
* Support arrays in JSON-LD type fields for actors/tags/objects.
* Spec for resolving accounts with extension types
* Style tweaks for codeclimate
7 years ago
31af463590
Add Basque language support ( #7267 )
7 years ago
24330e4fa7
Add RSS feeds for end-users ( #7259 )
...
* Add RSS feed for accounts
* Add RSS feeds for hashtags
* Fix code style issues
* Fix code style issues
7 years ago
354a6e4026
Improve report layout ( #7188 )
...
* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue
7 years ago
e4e0aa5d21
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
765bfd0cf5
Feature: Allow staff to change user emails ( #7074 )
...
* Admin: Show unconfirmed email address on account page
* Admin: Allow staff to change user email addresses
* ActionLog: On change_email, log current email address and new unconfirmed email address
7 years ago
62ce70f28c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
5373b138e8
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
7 years ago
0408944627
Implement the ability for an Administrator or Moderator to remove an account avatar ( #6998 )
7 years ago
7cdf2b05b6
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
7 years ago
acece7a2e6
Validate HTTP response length while receiving ( #6891 )
...
to_s method of HTTP::Response keeps blocking while it receives the whole
content, no matter how it is big. This means it may waste time to receive
unacceptably large files. It may also consume memory and disk in the
process. This solves the inefficency by checking response length while
receiving.
7 years ago
ae55717f50
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
11c19f6cc9
Close http connection in perform method of Request class ( #6889 )
...
HTTP connections must be explicitly closed in many cases, and letting
perform method close connections makes its callers less redundant and
prevent them from forgetting to close connections.
7 years ago
b0993a5fdf
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
config/i18n-tasks.yml
7 years ago
b95c3ef3ee
Revert #6479 , hide sensitive text/images from OpenGraph previews ( #6818 )
...
Display summary of attachments in description, and mark up content
warning if present, e.g.:
Attached: 3 images · Content warning: Dota 2
When text is not supposed to be hidden, it looks more like:
Attached: 3 images
Here is the text of the toot
With #6817 , multilinguagility should be assured...
7 years ago
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
83384e5390
Add missing meta description to profiles, some other SEO stuff ( #6706 )
...
- Add missing meta description to profiles
- Add canonical rel link to landing page
- Remove linebreaks from title tags
- Add username to profile title
- Add toots/following/followers to profile description tags
- Add next/prev rel links to profiles
- Do not index follower/following variants of profiles
7 years ago
a497940b0f
Do not default site_title with site_hostname in InstanceHelper ( #6624 )
...
site_title is "Mastodon" by default configuration, and there is no need to
default site_title with site_hostname in InstanceHelper.
7 years ago
87517e2dd8
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
7 years ago
6278ffdba3
Add direction tags to HTML e-mails for RTL languages ( #6373 )
7 years ago
db052e79ad
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
62e47f7041
armenian translations initial commit ( #6320 )
...
* adding armenian translations
* updating config files for armenian translations
* armenian translation fix
* fixing spaces
7 years ago
03f157f6da
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
9c6dba3999
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )
7 years ago
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
7 years ago
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
7 years ago
f10ce3f003
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d4e0d2563c
Fix bad URL schemes being accepted ( #6219 )
...
* Fix actors accepting invalid URI schemes or different host between URI and URL
* Fix statuses accepting invalid URI scheme or different host to actor
* Adjust tests to new requirements
* Improve readability of mismatching_origin?/invalid_origin? methods
7 years ago
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
f92399cfe7
Fallback default thumbnail in instance status API ( #6177 )
7 years ago
73e1c12daa
Fix nil error in log_target_from_history helper ( #6173 )
7 years ago
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1c4142da5b
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
9dd76b5b41
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c9c63c2232
Add Slovak translation ( #6052 )
...
* Add Slovak translation
* Slovak translation: i18n-normalize
7 years ago
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
7 years ago
aea3d0814b
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
7 years ago
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
07030db7ad
Add Galician language support ( #5955 )
7 years ago
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fba46b6072
Using double splat operator ( #5859 )
7 years ago
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1447ef1d44
Add invite filter ( #5862 )
7 years ago
a7a59f927d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
cfe67ba832
Add semi-support for Video/Image objects in ActivityPub ( #5848 )
...
* Add semi-support for Video/Image objects in ActivityPub
Video and Image objects will create corresponding status records
with manually crafted text contents (title + URL)
* Extract html-url-finding logic into JsonLdHelper
* Fallback to id when url missing, extract supported object types
7 years ago
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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
7 years ago
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
3df46ce5a8
Fix some rubocop style issues ( #5730 )
7 years ago
02ae609d9a
Merge tootsuite/master at ab48f2b239
7 years ago
97178b6d86
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
7 years ago
19f82492ab
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
7 years ago
2aec3c073b
Merge branch 'master' into gs-master
7 years ago
2c06b21883
Allow ActivityPub Note's tag and attachment to be single objects ( #5534 )
7 years ago
ebfec40698
Set up /settings/keyword_mutes. #164 .
...
This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like. We can always take it out if it turns out we
don't need it.
7 years ago
c06052b7cf
Swedish translation ( #5406 )
...
* 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
7 years ago
81489970fb
Add moderation note ( #5240 )
...
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
7 years ago
2e6db37776
Validate id of ActivityPub representations ( #5114 )
...
Additionally, ActivityPub::FetchRemoteStatusService no longer parses
activities.
OStatus::Activity::Creation no longer delegates to ActivityPub because
the provided ActivityPub representations are not signed while OStatus
representations are.
7 years ago
da257754b5
Add emoji autosuggest ( #5053 )
...
* Add emoji autosuggest
Some credit goes to glitch-soc/mastodon#149
* Remove server-side shortcode->unicode conversion
* Insert shortcode when suggestion is custom emoji
* Remove remnant of server-side emojis
* Update style of autosuggestions
* Fix wrong emoji filenames generated in autosuggest item
* Do not lazy load emoji picker, as that no longer works
* Fix custom emoji autosuggest
* Fix multiple "Custom" categories getting added to emoji index, only add once
7 years ago
Aditoo17
Thibaut Girka
Eugen Rochko
Clar Charr
Aboobacker MK
ysksn
Naoki Kosaka
M Somerville
Dachi Natsvlishvili
Nathaniel Ekoniak
Yamagishi Kazutoshi
Renato "Lond" Cerqueira
David Yip
Surinna Curtis
Jenkins
Emelia Smith
Akihiko Odaki
Norayr Chilingarian
Branko Kokanovic
Peter
nullkal
puckipedia
Håkan Eriksson