5958 Commits (a0a8203a0baf7250f0bffa298e520de39a921ffe)

Author	SHA1	Message	Date
ThibG	28b482874a	Improvements to signature verification (#9667) ... * Refactor signature verification a bit * Rescue signature verification if recorded public key is invalid Fixes #8822 * Always re-fetch AP signing key when HTTP Signature verification fails But when the account is not marked as stale, avoid fetching collections and media, and avoid webfinger round-trip. * Apply stoplight to key/account update as well as initial key retrieval	6 years ago
kedama	cf3c0fc38c	Stop gifv timeline preview explicitly when open the media gallery. (#9749)	6 years ago
Eugen Rochko	5654535728	Change remote interaction dialog to use specific actions (#9743) ... * Change remote interaction dialog to use specific actions Instead of just "interact", use different strings based on whether it's a reply, reblog or favourite. Add explanation why the step is necessary in the first place * Remove obsolete strings	6 years ago
Eugen Rochko	43c61bca60	Add locale param to sign-up API (#9747) ... Fix #9627	6 years ago
0xflotus	57c91fbbed	refactored account.js (#9739)	6 years ago
Eugen Rochko	bd5a8c7765	Fix embed play icons regression from #9715 (#9731)	6 years ago
Eugen Rochko	5dbe186585	Add cache to custom emojis API (#9732) ... Fix #9729	6 years ago
Eugen Rochko	86f27b178c	Fix deleting a scheduled status immediately deleting media attachments (#9728)	6 years ago
ash lea	dc501c4134	add list title editing	6 years ago
Eugen Rochko	1cbdf8d218	Fix wrong param name in scheduled statuses and return params in API (#9725) ... The database column and API param are called in_reply_to_id, not in_reply_to_status_id, so it makes no sense to encode it that way	6 years ago
Eugen Rochko	8ad57a0426	Fix PublishScheduledStatusWorker being queued with no arguments (#9724)	6 years ago
Thibaut Girka	7baf15675f	Add local setting to disable swipe-to-change-columns	6 years ago
Eugen Rochko	a49d43d112	Add scheduled statuses (#9706) ... Fix #340	6 years ago
Eugen Rochko	b17b2f25ac	Follow new account before unfollowing the old one during move (#9719)	6 years ago
Naoki Kosaka	fae32634b1	Use Contact User as Relay, Report, Subscribe. (#9661) ... * Use Contact User as Relay, Report, Subscribe. * Use Account.representative to fetch contact user. * Use find_local. * No reason to use Account.representative in subscribe_service. * Don't required representative! * Fallback is included in Account.representative method.	6 years ago
Eugen Rochko	45899cfa69	Change note length validation to ignore mention domains and URLs (#9717) ... Fix #4419	6 years ago
Eugen Rochko	92daf7cd37	Fix unreadable text color in report modal for some statuses (#9716) ... Fix #9697	6 years ago
ThibG	6f9a7bd02c	Add quick links to the admin interface in the WebUI (#8545) ... * Allow to show a specific status in the admin interface * Let the front-end know the current account is a moderator * Add admin links to status and account menus If the current logged-in user is an admin, add quick links to the admin interface in account and toot dropdown menu. Suggestion by @ashkitten * Use @statuses.first instead of @statuses[0]	6 years ago
Eugen Rochko	1512af2811	Display fallback link card thumbnail when none is given (#9715)	6 years ago
Eugen Rochko	664bb7bb72	Add preview cards to non-detailed statuses on public pages (#9714)	6 years ago
Eugen Rochko	c39c112ced	Fix admin UI view of local followers (#9712) ... Regression from #9700	6 years ago
Eugen Rochko	82ef5c0461	Fix list of local followers showing remote followers in admin UI (#9700)	6 years ago
ysksn	19abf4ef0b	Add specs for UnreservedUsernameValidator (#9698) ... * Add specs for UnreservedUsernameValidator * Use instance variable	6 years ago
Thibaut Girka	e77ceb1b29	[Glitch] Update dependencies for Node.js (2018-12-31) ... Port compatibility changes from 8f5fdab5bf to glitch-soc	6 years ago
Thibaut Girka	1464620ddb	[Glitch] Improve admin UI for account view ... Port SCSS changes from 6e49907ecf to glitch-soc	6 years ago
Thibaut Girka	9b606cb24c	[Glitch] Update emoji codepoint mappings to v11.0 ... Port 2ee779dcd3 to glitch-soc	6 years ago
Thibaut Girka	bb96a74637	Revert "Add handler for Move activity (#9629)" ... This reverts commit 0f938ff29c.	6 years ago
Thibaut Girka	1b35ca17a9	Fix some image paths in SCSS files	6 years ago
Thibaut Girka	eb481c9049	Fix syntax errors in win95 SCSS file	6 years ago
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	6 years ago
Eugen Rochko	66436d0895	Improve e-mail digest (#9689) ... - Reduce time-to-digest from 20 to 7 days - Fetch mentions starting from +1 day since last login - Fix case when last login is more recent than last e-mail - Do not render all mentions, only 40, but show number in subject - Do not send digest to moved accounts - Do send digest to silenced accounts	6 years ago
Yamagishi Kazutoshi	dc84899fff	Upgrade ESLint to v5.x (#9694)	6 years ago
ThibG	70be301d69	Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687) ... * Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order * Add specs for Block causing unfollow and for out-of-order Block + Undo	6 years ago
ThibG	f04f3ee436	Fix icon alignment in onboarding interaction screen (#9686)	6 years ago
Eugen Rochko	7fc7437d05	Add CSV export for lists and domain blocks (#9677) ... Fix #6893 Fix #9268	6 years ago
ThibG	1d4215be77	Restore ReplyDistributionWorker to allow existing jobs to be processed (#9676)	6 years ago
Eugen Rochko	e3dc8870bf	Remove visible timestamps for notifications (#9675) ... Revert #9423. Issues with line breaks / clutter.	6 years ago
Yamagishi Kazutoshi	8f5fdab5bf	Update dependencies for Node.js (2018-12-31) (#9669) ... * Update react-* to v16.7.0 * Upgrade react-hotkeys to v1.1.4 * Update react-intl to v2.7.2 * Update react-select to v2.2.0 * Update react-swipeable-views to v0.13.0 * Upgrade react-textarea-autosize to v7.1.0 * Upgrade redux to v4.0.1 * Upgrade reselect to v4.0.0 * Update raf to v3.4.1 * Update enzyme to v3.8.0 * Update rails-ujs to v5.2.2 * Update axios to v0.18.0 * Update http-link-header to v1.0.2 * Update rellax to v1.7.1 * Update intersection-observer to v0.5.1 * Update stringz to v1.0.0 * Upgrade babel-eslint to v10.0.1 * Update @babel/* to v7.2.x * Update babel-plugin-react-intl to v3.0.1 * Update babel-plugin-transform-react-remove-prop-types to v0.4.21 * Upgrade dotenv to v6.2.0 * Update express to v4.16.4 * Update webpack to v4.28.3 * Upgrade autoprefixer to v9.4.3 * Update babel-loader to v8.0.4 * Upgrade css-loader to v2.1.0 * Upgrade file-loader to v3.0.1 * Update marky to v1.2.1 * Update mini-css-extract-plugin to v0.5.0 * Update offline-plugin to v5.0.6 * Update style-loader to v0.23.1 * Update eslint-plugin-jsx-a11y to v6.1.2 * yarn upgrade * fix * Replace webpack-manifest-plugin to webpack-assets-manifest * Replace node-zopfli to @gfz/zopfli * Remove monkey-patch for http-link-header	6 years ago
kodai	6a090db4c9	Fix links not being verified (#9673) ... Fix #9365	6 years ago
Jeong Arm	511231ce57	Skip full text search if failed (#9654) ... * Skip full text search if failed * Move rescue block to "perform_statuses_search!"	6 years ago
ThibG	6fb6a53938	Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker (#9660)	6 years ago
ThibG	b2f4114550	Do not ignore federated reports targetting already-reported accounts (#9534)	6 years ago
ThibG	6a7a36fcdd	Immediately go back in browser history upon successfully sending toot (#9663) ... Avoids possible misleading delay before redirection during which the composer would be cleared and redrawn.	6 years ago
Takeshi Umeda	1340460c85	If it is disabled, remove the link of the profile directory (#9665)	6 years ago
ThibG	e74c99edf5	Fix crash when clearing uninitialized timeline (#9662)	6 years ago
Thibaut Girka	b300948526	Fix crash when clearing uninitialized timeline ... Fixes #875	6 years ago
Thibaut Girka	d126240129	Immediately go back in browser history upon successfully sending toot	6 years ago
ThibG	290932602b	Reduce usage of LD signatures (#9659) ... * Do not LDS-sign Follow, Accept, Reject, Undo, Block * Do not use LDS for Create activities of private toots * Minor cleanup * Ignore unsigned activities instead of misattributing them * Use status.distributable? instead of querying visibility directly	6 years ago
ysksn	05edec6917	Add specs for BlackListedEmailValidator (#9651) ... * Add specs for BlackListedEmailValidator * Use instance variable	6 years ago
ysksn	4725aeec9f	Add specs for DisallowedHashtagsValidator (#9653) ... In order to implement tests easier, `#select_tags` created.	6 years ago
Eugen Rochko	0f938ff29c	Add handler for Move activity (#9629)	6 years ago
Thibaut Girka	115b1abb6e	Rename hide_followers_count helper to hide_followers_count?	6 years ago
Thibaut Girka	374bae0abe	Do not leak followers count on public pages ... Fixes #873	6 years ago
ysksn	ccb9c1b952	Add pending specs for StatusLengthValidator (#9647) ... * Add pending specs of StatusLengthValidator * Use instance variable	6 years ago
mayaeh	c1693827ae	Change the icon to "reply-all" when reply to other accounts (#9378)	6 years ago
Eugen Rochko	6e49907ecf	Improve admin UI for account view (#9643)	6 years ago
chr v1.x	c3465f699e	Add local followers page to admin account UI (#9610) ... * Add local followers page to admin account UI For moderation, I often find myself wondering who, locally, is following a remote user. Currently, to see this, I have to go back to the web UI, paste in their full handle, click their profile, and go to the "Followers" tab (plus, this information is incidental, and if mastodon ever decides to resolve all of the follower information, there will be no place local followers are shown). This PR adds a new page which is accessible via the "following" count on the admin's account view page, which shows the local followers. (It has filter parameters for account location to indicate that only local followers are shown, and leave room for expansion if mastodon ever decides to store the entire remote follow list). * Normalize en.yml	6 years ago
Renato "Lond" Cerqueira	b41f715180	Weblate translations (2018-12-27) (#9642) ... * Translated using Weblate (Occitan) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (French) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Arabic) Currently translated at 97.5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Greek) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Corsican) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Arabic) Currently translated at 98.6% (349 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 78.2% (277 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ * Translated using Weblate (Basque) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Dutch) Currently translated at 93,8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 92,9% (329 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Galician) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Corsican) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Korean) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Tamil) Currently translated at 14.4% (51 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/ * Translated using Weblate (Russian) Currently translated at 85.6% (303 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ * Translated using Weblate (Italian) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Occitan) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Spanish) Currently translated at 88.1% (312 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (German) Currently translated at 93.5% (331 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Hungarian) Currently translated at 63.0% (223 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Portuguese) Currently translated at 65.0% (230 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Hebrew) Currently translated at 61.9% (219 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 92.9% (329 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Dutch) Currently translated at 94.9% (336 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Corsican) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Dutch) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (698 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (German) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Added translation using Weblate (Hindi) * Translated using Weblate (Corsican) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (French) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (German) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 98.3% (705 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Polish) Currently translated at 90.3% (84 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Normalize translations * Add missing plurals, remove unused translations	6 years ago
Eugen Rochko	ee1ba59692	Add exclude_reblogs option to account statuses API (#9640) ... Fix #9606	6 years ago
Eugen Rochko	9b8c7a9aad	Redirect to reports overview instead of report after account action (#9639)	6 years ago
Quentí	f63a0134d7	[i18n] OC/CAT/FR «crop» => «change preview» (#9636) ... * Rename "crop" to "change preview" (tootsuite#9616) * Rename "crop" to "change preview" (tootsuite#9616) * Rename "crop" to "change preview" (tootsuite#9616)	6 years ago
ThibG	4423999609	Fix account unsilencing and unsuspension (#9637) ... Fix regression from 3c033c4352	6 years ago
Eugen Rochko	aa9a20cde0	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	6 years ago
Eugen Rochko	17cd91c777	Fix signature verification stoplight triggering on non-timeout errors (#9617)	6 years ago
Thibaut Girka	f349fe2159	Fix account unsilencing and unsuspension ... Fix regression from 3c033c4352	6 years ago
ysksn	a8ba291beb	Fix scope latest of ReportNote (#9630)	6 years ago
ysksn	0c1e4bb969	Create DomainNormalizable#normalize_domain (#9631)	6 years ago
Takeshi Umeda	bf70e5cfda	Add error message with invalid email confirmation (#9625)	6 years ago
ysksn	6641a1cac9	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	6 years ago
Aboobacker MK	fd16502ae4	Add support for Malayalam in language filter (#9624)	6 years ago
Eugen Rochko	5d2fc6de32	Add REST API for creating an account (#9572) ... * Add REST API for creating an account The method is available to apps with a token obtained via the client credentials grant. It creates a user and account records, as well as an access token for the app that initiated the request. The user is unconfirmed, and an e-mail is sent as usual. The method returns the access token, which the app should save for later. The REST API is not available to users with unconfirmed accounts, so the app must be smart to wait for the user to click a link in their e-mail inbox. The method is rate-limited by IP to 5 requests per 30 minutes. * Redirect users back to app from confirmation if they were created with an app * Add tests * Return 403 on the method if registrations are not open * Require agreement param to be true in the API when creating an account	6 years ago
Eugen Rochko	acf9358c52	Rename "crop" to "change preview" (#9616)	6 years ago
Eugen Rochko	2ee779dcd3	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
ThibG	5f387995d9	Limit maximum visibility of local silenced users to unlisted (#9583) ... Fixes #9580	6 years ago
Thibaut Girka	cb98e7dbd3	[Glitch] Add moderation warnings ... Port SCSS changes from 3c033c4352 to glitch-soc	6 years ago
Thibaut Girka	82088f0d7d	[Glitch] Remove links to bridge.joinmastodon.org (non-functional) ... Port bb62827c16 to glitch-soc	6 years ago
Thibaut Girka	c5c4450fdd	Remove file added by error	6 years ago
Thibaut Girka	22dedb676b	[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached ... Port 8389b496ba to glitch flavour	6 years ago
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.	6 years ago
ThibG	e25947db4a	Sanitize and sandbox toot embeds (#9552)	6 years ago
Eugen Rochko	bb62827c16	Remove links to bridge.joinmastodon.org (non-functional) (#9608) ... Add link to profile directory	6 years ago
Eugen Rochko	59e333385b	Show 40 profiles per directory page instead of 30 (#9609) ... To better align with the list of hashtags	6 years ago
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	6 years ago
Quentí	00862dcaff	[i18n] Occitan update (#9607) ... * Update for new On Board messages * Update oc.json	6 years ago
ysksn	bd4ee732c2	Remove MailerHelper does nothing (#9604)	6 years ago
Thibaut Girka	1a3088364f	Fix composer not getting focus after reply confirmation dialog ... The modal-handling code gives back focus to the element focused when the modal opened. However, in the case of reply confirmation, it would do so *after* the composer code itself requested focus.	6 years ago
Thibaut Girka	0605c004a5	Fix incorrect and duplicate onConfirm callback	6 years ago
Thibaut Girka	6166751f9e	[Glitch] Fix that translation is not applied to "joining hashtags" ... Port bfec030a4e to glitch-soc	6 years ago
Thibaut Girka	3611ea02e2	[Glitch] Deep compare tags for hashtag column reload ... Port 4fdefffb99 to glitch-soc	6 years ago
Thibaut Girka	4be7313298	[Glitch] Allow joining several hashtags in a single column ... Port 4c03e05a4e to glitch-soc This introduces new requirements in the API: `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none` It now returns status matching tag :tag or any of the :any, provided that they also include all tags in `all` and none of `none`.	6 years ago
Marcin Mikołajczak	aa0e1ff286	i18n: Update Polish translation (#9594) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
ThibG	a6079a42b6	Fix composer not getting focus after reply confirmation dialog (#9602) ... The modal-handling code gives back focus to the element focused when the modal opened. However, in the case of reply confirmation, it would do so *after* the composer code itself requested focus.	6 years ago
Thibaut Girka	6073195a7d	[Glitch] Display customized mascot in web UI ... Port relevant parts of 9d4541c612 to glitch-soc	6 years ago
Thibaut Girka	fb63941c47	Make drawer markup and styling closer to upstream ... WARNING: This may break some custom skins! `.drawer > .contents` has been moved to `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved from `.drawer > .contents` to `.drawer__inner__mastodon`!	6 years ago
Thibaut Girka	5eaf2c9e02	[Glitch] Back to the getting-started when pins the timeline ... Port 5bf100f87b to glitch-soc	6 years ago
Thibaut Girka	bc113927d6	Move hide_followers_count logic to an helper	6 years ago
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.	6 years ago
Thibaut Girka	9e04b2e8a4	Per-user followers count display in profile directory	6 years ago
Thibaut Girka	1b18eb49e3	Hide negative follower counts from glitch flavour	6 years ago
Thibaut Girka	a1c56fcef1	Add admin setting to disable followers count	6 years ago
Thibaut Girka	0cd367e295	Refactor followers_accounts_controller	6 years ago
Eugen Rochko	108b2139cd	Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573) ... Fix #7087 The same data is available over the ActivityPub outbox, RSS, and Atom, so there is little benefit to keeping it limited in this method.	6 years ago
ThibG	8389b496ba	Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581) ... Fixes #9568	6 years ago
Thibaut Girka	e8d5affe06	Restore oops.gif animation for user who have auto_play_gif set	6 years ago
Thibaut Girka	0c2d48b60a	Replace animated oops.gif by a non-animated image ... Fixes #6060	6 years ago
Renato "Lond" Cerqueira	af37f4a70f	Weblate translations (2018-12-19) (#9578) ... * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Japanese) Currently translated at 97.5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Korean) Currently translated at 100.0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.9% (709 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 97.8% (91 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Corsican) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Arabic) Currently translated at 96.8% (90 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 96.8% (694 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100,0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Italian) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Czech) Currently translated at 99,9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Catalan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100,0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Occitan) Currently translated at 100,0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 99,7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (German) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99,9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Japanese) Currently translated at 97,5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Korean) Currently translated at 100,0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Czech) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Normalize translations * Normalize translations, remove unused, add missing plurals	6 years ago
Thibaut Girka	2228655848	[Glitch] Improved appearance of notification filter on safari ... Port 2e1b5edfea to glitch-soc	6 years ago
Thibaut Girka	add74816a5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mayaeh	ff472d2cfb	Update Japanese translations. (#9574)	6 years ago
Hinaloe	2e1b5edfea	improved appearance of notification filter on safari (#9564)	6 years ago
ThibG	e70e496e29	Clean up dead code in public timeline code (#9565)	6 years ago
Thibaut Girka	655da1be20	Reword confirm_before_clearing_draft description	6 years ago
Thibaut Girka	9a7201f2ee	Allow disabling the reply confirmation dialog	6 years ago
Thibaut Girka	056a8a8ee4	Allow disabling media confirmation from the confirmation dialog itself	6 years ago
Thibaut Girka	490d8fff0b	Remove dead code	6 years ago
Thibaut Girka	82b01a6c9f	[Glitch] Put "Media Only" option in column settings instead of content area headline ... Port 4f42238c29 to glitch-soc	6 years ago
Thibaut Girka	9fc7ad7b9c	[Glitch] Always display tab navigation on local/federated timeline even when empty ... Port 90b64c0069 to glitch-soc	6 years ago
Thibaut Girka	c644e6ea89	Do not replace history state ... This is both for consistency with account timelines and to not mess with the logic used to decide whether going back in the browser's history is going to make us leave the WebUI.	6 years ago
Thibaut Girka	200a8bdd3a	[Glitch] Enable media timeline ... Port 8182b61518 to glitch-soc	6 years ago
Thibaut Girka	a693d6e2f2	[Glitch] Hide section headline for timelines in production ... Port 4eeda67727 to glitch-soc	6 years ago
Thibaut Girka	593f88acb1	[Glitch] Change column params on pinned timeline ... Port 06252ec71e to glitch-soc	6 years ago
Thibaut Girka	c03cbb9471	[Glitch] Save onlyMedia prop when pinning column ... Port 5ea643b279 to glitch-soc	6 years ago
Thibaut Girka	1a9e78b9bc	[Glitch] Add exact attribute to WrappedRoute for community timeline ... Port 46061dc041 to glitch-soc	6 years ago
Thibaut Girka	1fb4bf87f7	[Glitch] Add media timeline ... Port 7403e5d306 to glitch-soc	6 years ago
Thibaut Girka	0ef2c1415a	[Glitch] Make notifications quick-filter use consistent style with profile tabs ... Port 12ab15e584 to glitch-soc	6 years ago
Thibaut Girka	06a7c07eda	[Glitch] Add notification quick-filter bar in the frontend app ... Port 13dce12665 to glitch-soc	6 years ago
Thibaut Girka	a18a46ca6e	[Glitch] Responsive design for profile directory ... Port SCSS changes from 087e118971 to glitch flavour	6 years ago
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	6 years ago
kedama	5bf100f87b	Back to the getting-started when pins the timeline. (#9561)	6 years ago
jomo	2c1a6f746f	fix CSP / X-Frame-Options for media embeds (#9558)	6 years ago
Thibaut Girka	36d27e2891	Sandbox toot embeds in the embed modal ... It should not be necessary thanks to our Content Security Policy, but best be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about loading remote scripts.	6 years ago
Thibaut Girka	30de4e4dfc	[Glitch] Minor scrollable list fixes ... * Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator Port 4ede51743e to glitch-soc	6 years ago
Eugen Rochko	12ab15e584	Make notifications quick-filter use consistent style with profile tabs (#9554)	6 years ago
ThibG	e709b8da0d	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510) ... * Add failing test for windows-1251 link cards * Ignore low-confidence CharlockHolmes guesses Fixes #9466 * Fix no method error when charlock holmes cannot detect charset	6 years ago
ThibG	4ede51743e	Minor scrollable list fixes (#9551) ... * Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator	6 years ago
Thibaut Girka	8266d224ef	Split out is_changing_upload from is_submitting ... Fixes #855	6 years ago
ysksn	3281df0df1	Move #set_user to Admin::BaseController (#9470) ... * Move #set_user to Admin::BaseController * Rename Admin::TwoFactorAuthenticationsController from `#set_user` to `#set_target_user` .	6 years ago
Eugen Rochko	9cb26bb56b	Add new first-time tutorial (#9531) ... * Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraph	6 years ago
Eugen Rochko	adaf249700	Fix regression in #9539 (#9541)	6 years ago
Eugen Rochko	087e118971	Remove "most popular" tab from profile directory, add responsive design (#9539) ... * Remove "most popular" tab from profile directory, add responsive design * Remove unused translations	6 years ago
Eugen Rochko	628da11e38	Do no retry web push workers if the server returns a 4xx response (#9434) ... Add timeout of 10s to web push requests	6 years ago
ThibG	4297de34cf	Split out is_changing_upload from is_submitting (#9536) ... There is no reason to disable the composer textarea when some media metadata is being modified, nor is there any reason to focus the textarea when some media metadata has been modified (prevents clicking one image's description field right after having modified another).	6 years ago
Thibaut Girka	7238e4ea5f	[Glitch] Fix padding on select elements in preferences ... Port c58c00651b to glitch-soc	6 years ago
Thibaut Girka	89e4ac67c8	[Glitch] Make animated header resoect `auto_play_gif` ... Port part of 7c48688d85 to glitch-soc	6 years ago
Paweł Ngei	13dce12665	Add notification quick-filter bar in the frontend app (#9399) ... * create FilterBar componer and its container, unstyled * introduce basic styling for FilterBar * add selection css * allow FilterBar to display active CSS with js * connect the FilterBar to the Redux state * change getNotifications to use filter * remove temporary comments * add an option to turn the FilterBar off in settings * fix showFilterBar data type to boolean * fix eslint errors * add English and Polish translations * allowed filter bar overflow to accomodate for longer languages * fix mispelled translation key * add unified CSS look * replace text in FilterBar with icons * add tooltips * replace text @ with an icon * introduce simple and advanced filtering view * add ability to toggle the advanced view * add Polish translations * change Advanced View description to be more clear * make each filter flush notifications and load new ones, fixing pagination * simplify getNotifications once frontend filtering is not needed for FilterBar * add a semicolon * Revert "simplify getNotifications once frontend filtering is not needed for FilterBar" This reverts commit 9f4be7857135b0327814bd22a3e8a4e7b546f7cc. * reset filter to 'all' when turning off FilterBar	6 years ago
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.	6 years ago
Thibaut Girka	f0505a5b2e	On mobile, go back in browser history upon posting, unless threaded mode is enabled	6 years ago
ThibG	aa7a8a3031	When posting in mobile mode, go back to previous history location (#9502) ... Fixes #7112	6 years ago
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	6 years ago
Sumit Khanna	769c2d2680	Error message for avatar image that's too large. #9204 (#9518) ... * Error message for avatar image that's too large. #9204 * Code climate/formatting * Removed avatar error message * Moved valid image dimentions check to update service * removed unnescessary begin block * code climate formatting * code climate indent fix	6 years ago