YuruToot

mirror of https://github.com/funamitech/mastodon synced 2024-12-13 06:09:08 +09:00

Author	SHA1	Message	Date
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	2020-01-12 15:57:34 +01:00
ThibG	10f1450bba	Fix ruby 2.7 warnings about keyword parameters (#12824 )	2020-01-11 21:38:02 +01:00
Daigo 3 Dango	206dfd7dad	Clarify keyword arguments with (#12769 ) This change is to suppress the warning below on on ruby-2.7.0: - warning: Using the last argument as keyword parameters is deprecated; maybe should be added to the call https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/	2020-01-11 05:57:05 +09:00
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	2020-01-04 23:04:42 +01:00
Eugen Rochko	f86ee4b59f	Fix IDN mentions not being processed, IDN domains not being rendered (#12715 ) This changes the REST API to return unicode domains in the `acct` attribute instead of punycode, and to render unicode instead of punycode on public HTML pages as well. Fix #7812, fix #12246	2019-12-30 19:20:43 +01:00
Thibaut Girka	abcba5c198	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	2019-12-07 12:28:59 +01:00
Takeshi Umeda	04582e3c3e	Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545 )	2019-12-05 00:50:40 +01:00
Takeshi Umeda	f43f1e0184	Add basic support for group actors (#12071 ) * Show badge on group actor in WebUI * Do not notify in case of by following group actor * If you mention group actor, also mention group actor followers * Relax characters that can be used in username (same as Application) * Revert "Relax characters that can be used in username (same as Application)" This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b. * Delete display_name method	2019-12-04 20:36:33 +01:00
Thibaut Girka	99f1f48741	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-01 12:12:42 +01:00
ThibG	d8f96028c5	Add ability to filter reports by target account domain (#12154 ) * Add ability to filter reports by target account domain * Reword by_target_domain label	2019-11-30 19:53:58 +01:00
Thibaut Girka	c0f7e21685	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-23 19:03:01 +01:00
noiob	5bc4edd078	Fix whitelist federation for subdomains (#12435 )	2019-11-21 11:35:39 +01:00
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	2019-11-20 15:36:09 +01:00
Eugen Rochko	24ea938ce1	Add kn, mr, ur to available locales (#12379 )	2019-11-13 23:36:41 +01:00
ThibG	a2014830c2	Fix broken admin audit log in whitelist mode (#12303 )	2019-11-11 00:05:15 +02:00
Thibaut Girka	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	2019-10-27 12:14:01 +01:00
Takeshi Umeda	a6269b2f83	Split AccountsHelper from StatusesHelper (#12078 )	2019-10-24 22:50:09 +02:00
Thibaut Girka	a84aedb7a7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.	2019-10-03 11:10:12 +02:00
Eugen Rochko	fb45f6d911	Add br, es-AR, et, mk, nn to available locales (#12062 )	2019-10-03 03:59:43 +02:00
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	2019-09-30 12:23:57 +02:00
Eugen Rochko	3ed94dcc1a	Add account migration UI (#11846 ) Fix #10736 - Change data export to be available for non-functional accounts - Change non-functional accounts to include redirecting accounts	2019-09-19 20:58:19 +02:00
Thibaut Girka	5cadb47238	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code	2019-09-18 17:25:56 +02:00
Eugen Rochko	692fe477b4	New Crowdin translations (#11799 ) * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Norwegian Nynorsk) [ci skip] * New translations activerecord.en.yml (Norwegian Nynorsk) [ci skip] * New translations devise.en.yml (Norwegian Nynorsk) [ci skip] * New translations doorkeeper.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Breton) [ci skip] * New translations devise.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations activerecord.en.yml (Breton) [ci skip] * New translations devise.en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations activerecord.en.yml (Asturian) [ci skip] * New translations devise.en.yml (Russian) [ci skip] * New translations activerecord.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations devise.en.yml (Norwegian) [ci skip] * New translations activerecord.en.yml (Norwegian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations devise.en.yml (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations activerecord.en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations activerecord.en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations activerecord.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Georgian) [ci skip] * New translations activerecord.en.yml (Georgian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations devise.en.yml (Croatian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Bulgarian) [ci skip] * New translations activerecord.en.yml (Bulgarian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations devise.en.yml (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations devise.en.yml (Ido) [ci skip] * New translations en.json (Ido) [ci skip] * New translations devise.en.yml (Hebrew) [ci skip] * New translations activerecord.en.yml (Hebrew) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Danish) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-09-16 15:11:01 +02:00
mayaeh	ef0d22f232	Add search and sort functions to hashtag admin UI (#11829 ) * Add search and sort functions to hashtag admin UI * Move scope processing from tags_controller to tag_filter * Fix based on method naming conventions * Fixed not to get 500 errors for invalid requests	2019-09-16 14:27:29 +02:00
Thibaut Girka	74c5b2bd08	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	2019-09-13 18:13:43 +02:00
Eugen Rochko	bc869501f5	Fix name of Portuguese language not including Portugal (#11820 ) Fix #11602	2019-09-13 16:00:19 +02:00
ThibG	17389c63c8	Change /admin/custom_emoji to honor the auto_play_gif setting (#11801 ) Fixes #9535	2019-09-10 20:56:07 +02:00
Thibaut Girka	5088eb8388	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
Eugen Rochko	3221f998dd	Change OpenGraph description on sign-up page to reflect invite (#11744 )	2019-09-03 04:56:54 +02:00
Thibaut Girka	9044a2b051	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.	2019-08-30 13:38:41 +02:00
Eugen Rochko	9871904172	Change layout of public profile directory to be the same as in web UI (#11705 )	2019-08-30 07:41:16 +02:00
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	2019-08-19 21:49:35 +02:00
Eugen Rochko	e5cee8062f	Fix blurhash and autoplay not working on public pages (#11585 )	2019-08-16 19:15:05 +02:00
Thibaut Girka	cad2e6eb7a	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
Eugen Rochko	115dab78f1	Change admin UI for hashtags and add back whitelisted trends (#11490 ) Fix #271 Add back the `GET /api/v1/trends` API with the caveat that it does not return tags that have not been allowed to trend by the staff. When a hashtag begins to trend (internally) and that hashtag has not been previously reviewed by the staff, the staff is notified. The new admin UI for hashtags allows filtering hashtags by where they are used (e.g. in the profile directory), whether they have been reviewed or are pending reviewal, they show by how many people the hashtag is used in the directory, how many people used it today, how many statuses with it have been created today, and it allows fixing the name of the hashtag to make it more readable. The disallowed hashtags feature has been reworked. It is now controlled from the admin UI for hashtags instead of from the file `config/settings.yml`	2019-08-05 19:54:29 +02:00
Thibaut Girka	24968d20a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock	2019-07-30 12:22:33 +02:00
Eugen Rochko	24552b5160	Add whitelist mode (#11291 )	2019-07-30 11:10:46 +02:00
Thibaut Girka	bca3825c17	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00
dependabot-preview[bot]	15de24a425	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316 ) * Bump json-ld-preloaded from 3.0.2 to 3.0.3 Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.2...3.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * use json-ld edge	2019-07-28 13:48:43 +02:00
Thibaut Girka	249991c498	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml	2019-07-19 18:26:49 +02:00
Eugen Rochko	4e8dcc5dbb	Add HTTP signatures to all outgoing ActivityPub GET requests (#11284 )	2019-07-11 14:49:55 +02:00
Eugen Rochko	5d3feed191	Refactor fetching of remote resources (#11251 )	2019-07-10 18:59:28 +02:00
Eugen Rochko	4e92183227	Refactor domain block checks (#11268 )	2019-07-09 03:27:35 +02:00
Eugen Rochko	b851456139	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247 )	2019-07-07 16:16:51 +02:00
Thibaut Girka	1b0ff4cd69	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb	2019-06-10 18:59:53 +02:00
Eugen Rochko	20dda5cca0	Change full logo to use primary text color of the given theme (#10994 ) * Change full logo to use primary text color of the given theme * Fix colors of public layout header in light theme	2019-06-08 15:30:06 +02:00
Thibaut Girka	3d73d76e55	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +02:00
Eugen Rochko	8d5dcc9301	Use `<use />` to render transparent SVG logo instead of inserting it (#10845 )	2019-05-27 03:33:39 +02:00
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	2019-04-10 09:16:08 +02:00
Eugen Rochko	46cb36fd2c	Add invite request to pending account notification e-mail (#10528 ) Fix sorting of the pending accounts page	2019-04-10 00:36:01 +02:00
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	2019-04-08 15:57:56 +02:00
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491 ) * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit `120544067f`. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit `62bafa20a1`. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	2019-04-07 04:59:13 +02:00
Thibaut Girka	050efbc126	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	2019-03-28 13:01:33 +01:00
Eugen Rochko	f1bc90ab50	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401 ) Also, fix some n+1 queries Resolve #10365	2019-03-28 04:44:59 +01:00
Eugen Rochko	08ec7435ce	Add order options to relationship manager UI (#10404 )	2019-03-28 02:16:01 +01:00
Thibaut Girka	b9f314bba7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	2019-03-26 16:02:54 +01:00
Eugen Rochko	e117964325	Change icons of features on admin dashboard to remove bias (#10366 ) Red crosses implied that it was bad/unexpected that certain features were not enabled. In reality, they are options, so showing a green or grey power-off icon is more appropriate. Add status of timeline preview as well Fix sample accounts changing too frequently due to wrong query Sample accounts are intended to be sorted by popularity	2019-03-26 01:24:19 +01:00
Thibaut Girka	1d6152f440	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	2019-03-20 13:54:00 +01:00
Eugen Rochko	9d9b6e3543	Add missing locales (bn, ga, hi) (#10295 )	2019-03-18 21:55:21 +01:00
Thibaut Girka	291012ec0c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.	2019-03-18 18:03:27 +01:00
Eugen Rochko	b8e4c85e69	Add dormant filter to relationship manager, rename other filters (#10308 ) Rename "abandoned" to "moved", and "active" to "primary"	2019-03-18 03:53:17 +01:00
Thibaut Girka	4df3b7cb06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.	2019-03-16 14:14:20 +01:00
Eugen Rochko	1c113fd72d	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ysksn	782b622f5f	Add specs for action log helper (#9605 ) * Add specs for ActionLogHelper * Make some methods private methods below never referenced from outside of their module: - #linkable_log_target - #log_target_from_history	2019-03-16 00:57:23 +09:00
Thibaut Girka	07eb31eeac	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.	2019-03-14 17:17:20 +01:00
Eugen Rochko	51e154f5e8	Admission-based registrations mode (#10250 ) Fix #6856 Fix #6951	2019-03-14 05:28:30 +01:00
Thibaut Girka	02062aab55	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb	2019-03-13 15:16:02 +01:00
Eugen Rochko	9f5b55ad4f	Fix poll update handler calling method was that was not available (#10246 ) * Fix poll update handler calling method was that was not available Fix regression from #10209 * Refactor VoteService * Refactor ActivityPub::DistributePollUpdateWorker and optimize it * Fix typo * Fix typo	2019-03-12 22:58:59 +01:00
Eugen Rochko	65fffeac3f	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	2019-03-05 19:23:16 +01:00
ThibG	df5924a1db	Do not error out on unsalvageable errors in FetchRepliesService (#10175 ) * Do not error out on unsalvageable errors in FetchRepliesService Fixes #10152 * Fix FetchRepliesWorker erroring out on deleted statuses	2019-03-05 15:21:14 +01:00
Eugen Rochko	a198add83b	Fix various issues in polls (#10165 ) * Fix ActivityPub poll results being serialized even with hide_totals * Fix poll refresh button having a different font size * Display poll in OpenGraph description * Fix NoMethodError when serializing votes Regression from #10158 * Fix polls on public pages being broken for non-logged-in users * Do not show time remaining if poll has no expiration date	2019-03-05 03:51:18 +01:00
Thibaut Girka	0158937fc2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `f13ebd02c9`. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	2019-02-26 17:04:44 +01:00
ThibG	9dd54ffb1c	Avoid redundant HTTP request on some error cases (#10115 )	2019-02-25 15:54:17 +01:00
Aditoo17	57483f2ffb	I18n: Add language options for Kazakh and Lithuanian (#10104 )	2019-02-23 22:20:35 +01:00
Thibaut Girka	ff0576cc2b	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-19 20:18:40 +01:00
ThibG	6840a77711	Add domain search/filter to the "Federation" (/admin/instances) page (#10071 )	2019-02-18 14:59:19 +01:00
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-15 18:02:45 +01:00
Aditoo17	7750416597	I18n: Update Czech pluralization and fix some language names (#10015 ) * I18n: Update Czech pluralization * I18n: Fix some language names * I18n: Fix some language names	2019-02-13 18:53:01 +01:00
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-12 20:32:48 +01:00
Eugen Rochko	c0a564feaa	Add available locales for lv, ms, sq (#10008 )	2019-02-11 13:19:06 +01:00
Thibaut Girka	e87bd6d94a	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	2019-02-01 16:12:20 +01:00
Clar Charr	6513f6c953	Replace unlock-alt icon with unlock (#9952 )	2019-01-31 13:45:15 +01:00
Thibaut Girka	eff1c94744	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
ThibG	4fb94c758e	Add attachment list fallback to public pages (#9780 ) * Add attachment list fallback to public pages Fixes #6714 * Refactor attachments lists	2019-01-13 09:23:54 +00:00
Thibaut Girka	a2a64ecd3e	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.	2019-01-10 21:00:30 +01:00
Eugen Rochko	1c6588accc	Redesign admin instances area (#9645 )	2019-01-08 13:39:49 +01:00
Thibaut Girka	571d219bb9	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	2019-01-02 15:36:53 +01:00
Thibaut Girka	115b1abb6e	Rename hide_followers_count helper to hide_followers_count?	2018-12-28 20:05:47 +01:00
Aboobacker MK	fd16502ae4	Add support for Malayalam in language filter (#9624 )	2018-12-25 18:29:30 +01:00
Thibaut Girka	3e686beaea	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.	2018-12-23 11:28:28 +01:00
Eugen Rochko	3c033c4352	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	2018-12-22 20:02:09 +01:00
ysksn	bd4ee732c2	Remove MailerHelper does nothing (#9604 )	2018-12-22 02:35:55 +01:00
Thibaut Girka	bc113927d6	Move hide_followers_count logic to an helper	2018-12-20 14:51:12 +01:00
Thibaut Girka	bd23288a52	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.	2018-12-20 14:51:12 +01:00
Thibaut Girka	a1c56fcef1	Add admin setting to disable followers count	2018-12-20 14:51:12 +01:00
Thibaut Girka	65e994b29b	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.	2018-12-15 10:45:53 +01:00
ThibG	7c48688d85	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	2018-12-14 20:34:18 +01:00
ThibG	cf6ee4ff24	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	2018-12-11 19:28:03 +01:00
Thibaut Girka	e7f1bfdc2d	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.	2018-12-09 16:08:04 +01:00
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	2018-12-06 17:36:11 +01:00
Thibaut Girka	f8e07ca5cd	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).	2018-11-27 13:23:02 +01:00
Eugen Rochko	73faadad28	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	2018-11-26 15:53:27 +01:00
Thibaut Girka	dcded13a99	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.	2018-10-22 17:51:38 +02:00
Eugen Rochko	22de24b8ca	Fix missing protocol in dns-prefetch, improve code style (#8963 ) Regression from #8942	2018-10-12 02:19:10 +02:00
Thibaut Girka	8f720be9f3	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	2018-10-11 14:12:36 +02:00
Eugen Rochko	da7705b274	Add dns-prefetch if using different host for assets or uploads (#8942 )	2018-10-10 01:31:10 +02:00
Thibaut Girka	00fcdebed7	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.	2018-10-05 15:23:57 +02:00
Eugen Rochko	e645ae9561	Change admin accounts default sort to most recent (#8813 )	2018-10-04 16:05:38 +02:00
Thibaut Girka	c91d9b7389	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	2018-10-01 12:43:20 +02:00
Eugen Rochko	3d7f68c273	Revert Font Awesome 5 upgrade (#8810 ) * Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit `3f9ec3de82`. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit `8bae14591b`. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit `b9c727a945`. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit `17af4d27da`. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit `4b794e134d`.	2018-09-28 02:11:14 +02:00
Naoki Kosaka	8bae14591b	Migrate to font-awesome 5.0. (#8799 )	2018-09-27 17:08:56 +02:00
ThibG	c39183cc62	Refactor active_nav_class for use with multiple paths (#8757 )	2018-09-23 20:42:13 +02:00
Thibaut Girka	91bef4759f	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	2018-09-19 21:46:01 +02:00
Eugen Rochko	f4d549d300	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	2018-09-18 16:45:58 +02:00
Eugen Rochko	011437dcb5	Group reports by target account (#8674 ) * Group reports by target account * Improve CSS	2018-09-13 03:44:08 +02:00
Thibaut Girka	cd99255698	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.	2018-09-11 16:51:26 +02:00
Aditoo17	8c96fd4967	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	2018-09-05 08:50:06 +09:00
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	2018-09-03 14:33:06 +02:00
Eugen Rochko	14a300b428	Enable ro and ta locales in Rails (#8583 ) * Enable ro and ta locales in Rails * Add Tamil and Romanian to language dropdown	2018-09-02 22:31:53 +02:00
Eugen Rochko	e926811724	Fix nil error in admin_account_link_to helper (#8578 ) Fix #8573	2018-09-02 19:10:32 +02:00
Thibaut Girka	a74a7d5fe3	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-01 17:23:46 +02:00
ThibG	45c0f5433c	Do not show follow button on moved or memorial accounts (#8546 ) This restores the logic from before the public profile redesign. Fixes #8503	2018-08-31 20:33:01 +02:00
Thibaut Girka	6f75a9001f	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	2018-08-31 19:10:57 +02:00
Eugen Rochko	562250246c	Add Welsh language option (#8536 )	2018-08-31 18:16:19 +09:00
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	2018-08-27 18:09:28 +02:00
M Somerville	b31449cd77	Better singulars of account followers/toots. (#8471 )	2018-08-26 21:30:53 +02:00
Thibaut Girka	5eb3b8522e	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:39:16 +02:00
Eugen Rochko	6c9be61f57	Fix regression from #8439 (#8455 ) Missing no-reduce-motion/reduce-motion body class	2018-08-26 14:29:58 +02:00
Thibaut Girka	36393e1d2b	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.	2018-08-26 14:23:24 +02:00
Eugen Rochko	22e46ebad8	Add theme identifier to body classes for easier custom CSS styling (#8439 ) Add forgotten custom CSS admin setting strings	2018-08-25 22:55:25 +02:00
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
ThibG	56f882aed6	Avoid deleted attributes when building a Status from action log (fixes #8371 ) (#8373 )	2018-08-22 20:55:50 +02:00
Eugen Rochko	802cf6a4c5	Improve federated ID validation (#8372 ) * Fix URI not being sufficiently validated with prefetched JSON * Add additional id validation to OStatus documents, when possible	2018-08-22 20:55:14 +02:00
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +02:00
Eugen Rochko	19b07ba260	Make unfollow button light up red when hovered (#8286 ) Fix #8284	2018-08-19 03:28:43 +02:00
Thibaut Girka	bfeac6747a	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.	2018-08-18 18:04:49 +02:00
Eugen Rochko	78fa926ed5	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	2018-08-18 03:03:12 +02:00
Dachi Natsvlishvili	bf1bde5d6a	Add Georgian language translation (#8250 ) * Add Georgian language translation * i18n-tasks normalize	2018-08-18 01:00:01 +09:00
Thibaut Girka	280d7b1df8	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).	2018-08-17 17:43:54 +02:00
ThibG	106fa28a00	Prevent actions log from crashing when displaying deleted status (fixes #8133 ) (#8219 )	2018-08-16 20:05:26 +02:00
Thibaut Girka	84a2587d44	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-11 15:45:42 +02:00
Nathaniel Ekoniak	84e2446d26	i18n: fix Slovak language name (#8169 )	2018-08-11 14:52:05 +09:00
Thibaut Girka	e5a603206d	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.	2018-08-10 16:22:31 +02:00
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146 )	2018-08-09 09:56:53 +02:00
Thibaut Girka	c1c514ca70	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”.	2018-08-01 00:18:13 +02:00
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068 )	2018-07-28 19:25:33 +02:00
Thibaut Girka	6141c2a035	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-26 21:22:43 +02:00
Yamagishi Kazutoshi	b62ec00d87	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	2018-07-24 20:47:13 +02:00
Thibaut Girka	f26f1145ac	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	2018-07-16 14:50:42 +02:00
Eugen Rochko	2a176514be	Display full acct on public status pages, always (#8011 )	2018-07-14 04:07:47 +02:00
Thibaut Girka	d392020da6	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.	2018-07-09 07:13:59 +02:00
Eugen Rochko	1f6ed4f86a	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	2018-07-05 18:31:35 +02:00
Renato "Lond" Cerqueira	b2051a6256	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	2018-07-05 21:50:16 +09:00
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	2018-05-19 22:41:10 +02:00
Eugen Rochko	9422b3e0d8	Fix double-encoding of display name in title and e-mails (#7534 )	2018-05-18 15:56:57 +02:00
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
Yamagishi Kazutoshi	2226d987f9	Add Slovene language (#7475 )	2018-05-14 12:52:25 +02:00
ThibG	0f2fbf7d05	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	2018-05-12 17:44:15 +02:00
ThibG	7467361d70	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.	2018-05-12 16:48:32 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Eugen Rochko	95595ccd21	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	2018-05-07 01:34:19 +02:00
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374 ) Follow-up to #6124	2018-05-06 11:48:51 +02:00
David Yip	c816701550	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	2018-05-03 17:23:44 -05:00
Yamagishi Kazutoshi	7495a3470e	Add el and te (#7332 ) * Add el and te * Add missing locale files	2018-05-03 15:54:10 +02:00
Eugen Rochko	cb5b5cb5f7	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	2018-05-02 18:58:48 +02:00
Surinna Curtis	dc786c0cf4	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	2018-05-02 12:40:24 +02:00
Yamagishi Kazutoshi	36b6631c12	Add Basque language support (#7267 )	2018-04-26 13:56:45 +02:00
Eugen Rochko	9d4710ed00	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	2018-04-25 02:10:02 +02:00
Eugen Rochko	a9c440637c	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	2018-04-20 02:28:48 +02:00
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-11 00:50:09 +00:00
Emelia Smith	219a4423d8	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	2018-04-10 09:16:06 +02:00
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-03 19:17:20 +00:00
Emelia Smith	e85cffb236	Feature: Report improvements (#6967 ) (#7000 ) * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	2018-04-02 22:04:14 +02:00
Emelia Smith	e7a1716701	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )	2018-04-02 13:45:07 +02:00
David Yip	f61aa8e0f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	2018-03-27 10:26:47 -05:00
Akihiko Odaki	40e5d2303b	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.	2018-03-26 14:02:10 +02:00
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Akihiko Odaki	54b273bf99	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.	2018-03-24 12:49:54 +01:00
David Yip	ab04be2f84	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: config/i18n-tasks.yml	2018-03-18 20:21:17 -05:00
Eugen Rochko	a568e3ca8e	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...	2018-03-18 20:33:07 +01:00
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
Eugen Rochko	ff44b2e92d	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	2018-03-09 00:35:07 +01:00
Akihiko Odaki	ef44c62d17	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.	2018-03-04 20:29:49 +01:00
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	2018-01-28 22:45:17 -06:00
Eugen Rochko	79bc3d5845	Add direction tags to HTML e-mails for RTL languages (#6373 )	2018-01-29 00:22:20 +01:00
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	2018-01-21 16:26:50 -06:00
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	2018-01-22 05:02:23 +09:00
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-20 10:45:43 -06:00
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	2018-01-20 03:49:06 +01:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256 ) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	2018-01-16 03:29:11 +01:00
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
Eugen Rochko	e4a241abef	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	2018-01-08 05:00:23 +01:00
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-04 23:17:11 +00:00
Yamagishi Kazutoshi	3c18964256	Fallback default thumbnail in instance status API (#6177 )	2018-01-04 15:36:55 +01:00
Eugen Rochko	02e3e1ec09	Fix nil error in log_target_from_history helper (#6173 )	2018-01-04 10:56:23 +09:00
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146 ) Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	2018-01-02 20:39:12 +09:00
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133 ) * Adding Serbian translation * i18n-tasks normalize	2017-12-31 17:28:20 +09:00
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-17 03:17:14 +00:00
Peter	f38e6a14f2	Add Slovak translation (#6052 ) * Add Slovak translation * Slovak translation: i18n-normalize	2017-12-17 11:26:42 +09:00
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 18:17:16 +00:00
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003 )	2017-12-13 13:28:31 +01:00
Eugen Rochko	20a6584d2d	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	2017-12-13 12:15:10 +01:00
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
Yamagishi Kazutoshi	6e3f176b8e	Add Galician language support (#5955 )	2017-12-10 04:19:07 +01:00
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859 )	2017-12-06 11:41:57 +01:00
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862 )	2017-12-01 16:40:02 +01:00
Jenkins	ad46bc9772	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-30 03:17:12 +00:00
Eugen Rochko	4c6b5dbe96	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	2017-11-30 04:06:20 +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
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
Eugen Rochko	3e90987c8b	Fix some rubocop style issues (#5730 )	2017-11-17 10:06:26 +09:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	2017-11-16 01:21:16 -06: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
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
David Yip	870d71b78b	Merge branch 'master' into gs-master	2017-10-27 09:45:25 -05:00
puckipedia	0cb329f63a	Allow ActivityPub Note's tag and attachment to be single objects (#5534 )	2017-10-27 16:10:36 +02:00
David Yip	4fa2f7e82d	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.	2017-10-21 14:54:36 -05:00
Håkan Eriksson	a2b600428c	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	2017-10-17 13:41:36 +09:00
nullkal	633426b261	Add moderation note (#5240 ) * Add moderation note * Add frozen_string_literal * Make rspec pass	2017-10-07 20:26:43 +02:00
Akihiko Odaki	63f0979799	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.	2017-10-04 01:13:48 +02:00
Eugen Rochko	1e02ba111a	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	2017-09-23 14:47:32 +02:00
Akihiko Odaki	48d77ea1eb	Fix filterable_languages method of SettingsHelper (#4966 )	2017-09-16 14:59:41 +02:00
Eugen Rochko	8f8e677630	Clean up and improve generated OpenGraph tags (#4901 ) - Return all images as og:image - Return videos as og:image (preview) and og:video - Return profile:username on profiles	2017-09-12 05:39:38 +02:00
Eugen Rochko	1caf11ddcc	Fix language filter codes (#4841 ) * Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name	2017-09-08 12:32:22 +02:00
Adam Thurlow	6994664a13	swift-enable the paperclip! 📎 (#2322 )	2017-09-05 23:17:06 +02:00
Eugen Rochko	e95bdec7c5	Update status embeds (#4742 ) - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	2017-08-30 10:23:43 +02:00
Eugen Rochko	0d5d11eeff	Add _:inReplyToAtomUri to ActivityPub (#4702 )	2017-08-26 19:55:10 +02:00
Eugen Rochko	00840f4f2e	Add handling of Linked Data Signatures in payloads (#4687 ) * Add handling of Linked Data Signatures in payloads * Add a way to sign JSON, fix canonicalization of signature options * Fix signatureValue encoding, send out signed JSON when distributing * Add missing security context	2017-08-26 13:47:38 +02:00
unarist	5927b43c0f	Ignore empty response in ActivityPub::FetchRemoteStatusService (#4661 ) * Ignore empty response in ActivityPub::FetchRemoteStatusService This fixes `NoMethodError: undefined method `[]' for nil:NilClass` error. * Check json.nil? in JsonLdHelper#supported_context?	2017-08-22 20:00:49 +02:00
Eugen Rochko	72bb3e03fd	Support more variations of ActivityPub keyId in signature (#4630 ) - Tries to avoid performing HTTP request if the keyId is an actor URI - Likewise if the URI is a fragment URI on top of actor URI - Resolves public key, returns owner if the owner links back to the key	2017-08-21 22:57:34 +02:00
Yamagishi Kazutoshi	10e9a9a3f9	Use URI.join even when S3 enabled (#4652 )	2017-08-21 12:42:16 +02:00
nightpool	efec02f153	use existing inflections instead of custom helper (#4624 ) * use existing inflections instead of custom helper * use ActiveSupport versions	2017-08-17 23:20:50 +02:00
nullkal	075d6a1e13	Show what protocol is used for accounts in admin/accounts#index (#4622 ) * Show what protocol used for in admin/accounts#index * Add frozen_string_literal	2017-08-17 17:52:40 +02:00
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608 ) * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	2017-08-16 17:12:58 +02:00
Eugen Rochko	4e75f0d889	Hook up URL-based resource look-up to ActivityPub (#4589 )	2017-08-14 02:29:36 +02:00
Eugen Rochko	dd7ef0dc41	Add ActivityPub inbox (#4216 ) * Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests	2017-08-08 21:52:15 +02:00
Yamagishi Kazutoshi	bb96ba13cf	Fallback to site_hostname when site_title is empty (#4394 )	2017-07-27 15:13:49 +02:00
Eugen Rochko	a390abdefb	Use the same emoji data on the frontend and backend (#4284 ) * Use the same emoji data on the frontend and backend * Move emoji.json to repository, add tests This way you don't need to install node dependencies if you only want to run Ruby code	2017-07-21 04:27:40 +02:00
Eugen Rochko	c2c93f8cd6	Fix deprecation warning for non-pipeline assets (#4267 )	2017-07-19 12:00:05 +02:00
Eugen Rochko	8c45cd0e36	Improve ActivityPub representations (#3844 ) * Improve webfinger templates and make tests more flexible * Clean up AS2 representation of actor * Refactor outbox * Create activities representation * Add representations of followers/following collections, do not redirect /users/:username route if format is empty * Remove unused translations * ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better URL/URI generation * Add ActivityPub::TagManager#to * Represent all attachments as Document instead of Image/Video specifically (Because for remote ones we may not know for sure) Add mentions and hashtags representation to AP notes * Add AP-resolvable hashtag URIs * Use ActiveModelSerializers for ActivityPub * Clean up unused translations * Separate route for object and activity * Adjust cc/to matrices * Add to/cc to activities, ensure announce activity embeds target status and not the wrapper status, add "id" to all collections	2017-07-15 03:01:39 +02:00
Eugen Rochko	1618b68bfa	HTTP signatures (#4146 ) * Add Request class with HTTP signature generator Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06 * Add HTTP signature verification concern * Add test for SignatureVerification concern * Add basic test for Request class * Make PuSH subscribe/unsubscribe requests use new Request class Accidentally fix lease_seconds not being set and sent properly, and change the new minimum subscription duration to 1 day * Make all PuSH workers use new Request class * Make Salmon sender use new Request class * Make FetchLinkService use new Request class * Make FetchAtomService use the new Request class * Make Remotable use the new Request class * Make ResolveRemoteAccountService use the new Request class * Add more tests * Allow +-30 seconds window for signed request to remain valid * Disable time window validation for signed requests, restore 7 days as PuSH subscription duration (which was previous default due to a bug)	2017-07-14 20:41:49 +02:00
Eugen Rochko	e2685ccc81	Fix #4149 , fix #1199 - Store emojis as unicode (#4189 ) - Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore	2017-07-14 19:47:53 +02:00
のら	2d6128672f	Togglable filter links (#4021 ) * Togglable filter links * Rename is_selected to selected?	2017-07-07 00:48:09 +02:00

... 3 4 5 6 7 ...

633 Commits