about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-07-07Mastodon 3.1.5 / Merge branch 'glitch' into mainStarfall
2020-07-07Merge pull request #1373 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-07-07[Glitch] Add ability to choose media thumbnail in web UIEugen Rochko
Port 06fc6a9cd4c700c450dbe8e8c579a5d5bc4ba732 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07[Glitch] Fix hashtag column options stylingThibG
Port a783bdf4adee3444e9cd32c2eaa0712214ba1230 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.
2020-07-07Fix media attachments enumeration (#14254)Eugen Rochko
* Fix media attachment enumeration * Switch media_attachments id to snowflake ids Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07Change rate limits for various paths (#14253)Eugen Rochko
- Rate limit login attempts by target account - Rate limit password resets and e-mail re-confirmations by target account - Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before
2020-07-07Fix other sessions not being logged out on password change (#14252)Eugen Rochko
While OAuth tokens were immediately revoked, accessing the home controller immediately generated new OAuth tokens and "revived" the session due to a combination of using remember_me tokens and overwriting the `authenticate_user!` method
2020-07-07Fix account note border radius (#14251)Sasha Sorokin
2020-07-07Add ability to choose media thumbnail in web UI (#14244)Eugen Rochko
2020-07-07Change User-Agent of link preview fetching service to include "Bot" (#14248)Eugen Rochko
This forces Twitter to render OpenGraph tags in the response
2020-07-07Bump babel-jest from 25.2.4 to 26.1.0 (#14216)dependabot[bot]
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.4 to 26.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/babel-jest) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07Add test for removing endorsed accounts on account deletion/suspension (#14241)ThibG
2020-07-07Fix hashtag column options styling (#14247)ThibG
* Enable nonces for stylesheets * Pass nonce to react-select
2020-07-07Change design of account notes in web UI (#14208)Eugen Rochko
* Change design of account notes in web UI * Fix `for` -> `htmlFor`
2020-07-06helm: fix default storage values for PVCs (#14245)Alex Dunn
2020-07-07Bump jest-cli from 26.0.1 to 26.1.0 (#14240)dependabot[bot]
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli) from 26.0.1 to 26.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-cli) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07Bump @babel/preset-react from 7.10.1 to 7.10.4 (#14228)dependabot[bot]
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.10.1 to 7.10.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-react) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07Bump @babel/plugin-transform-runtime from 7.10.3 to 7.10.4 (#14217)dependabot[bot]
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.3 to 7.10.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-runtime) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump jest-watcher from 26.0.1 to 26.1.0 (#14231)dependabot[bot]
Bumps [jest-watcher](https://github.com/facebook/jest/tree/HEAD/packages/jest-watcher) from 26.0.1 to 26.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-watcher) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump @babel/plugin-transform-react-inline-elements from 7.10.1 to 7.10.4 ↵dependabot[bot]
(#14236) Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.10.1 to 7.10.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-react-inline-elements) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump jest-leak-detector from 26.0.1 to 26.1.0 (#14233)dependabot[bot]
Bumps [jest-leak-detector](https://github.com/facebook/jest/tree/HEAD/packages/jest-leak-detector) from 26.0.1 to 26.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-leak-detector) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump expect from 26.0.1 to 26.1.0 (#14235)dependabot[bot]
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 26.0.1 to 26.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/expect) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump arrow-key-navigation from 1.1.0 to 1.2.0 (#14222)dependabot[bot]
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases) - [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump diff-lcs from 1.4.3 to 1.4.4 (#14220)dependabot[bot]
Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/halostatue/diff-lcs/releases) - [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md) - [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4.3...v1.4.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump rdf from 3.1.3 to 3.1.4 (#14225)dependabot[bot]
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/ruby-rdf/rdf/releases) - [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md) - [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.3...3.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump omniauth-saml from 1.10.1 to 1.10.2 (#14226)dependabot[bot]
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.1 to 1.10.2. - [Release notes](https://github.com/omniauth/omniauth-saml/releases) - [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md) - [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.1...v1.10.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump json from 2.3.0 to 2.3.1 (#14227)dependabot[bot]
Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump yargs from 15.3.1 to 15.4.0 (#14234)dependabot[bot]
Bumps [yargs](https://github.com/yargs/yargs) from 15.3.1 to 15.4.0. - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs/compare/v15.3.1...v15.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump caniuse-lite from 1.0.30001084 to 1.0.30001094 (#14229)dependabot[bot]
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001084 to 1.0.30001094. - [Release notes](https://github.com/ben-eb/caniuse-lite/releases) - [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md) - [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001084...v1.0.30001094) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump terser-webpack-plugin from 3.0.3 to 3.0.6 (#14238)dependabot[bot]
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.3 to 3.0.6. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.3...v3.0.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump electron-to-chromium from 1.3.475 to 1.3.488 (#14239)dependabot[bot]
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.475 to 1.3.488. - [Release notes](https://github.com/kilian/electron-to-chromium/releases) - [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md) - [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.475...v1.3.488) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump js-base64 from 2.5.2 to 2.6.2 (#14237)dependabot[bot]
Bumps [js-base64](https://github.com/dankogai/js-base64) from 2.5.2 to 2.6.2. - [Release notes](https://github.com/dankogai/js-base64/releases) - [Commits](https://github.com/dankogai/js-base64/compare/2.5.2...2.6.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump @babel/preset-env from 7.10.2 to 7.10.4 (#14218)dependabot[bot]
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.10.2 to 7.10.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-env) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Bump aws-sdk-s3 from 1.72.0 to 1.73.0 (#14219)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06Replace shortNumberFormat with <ShortNumber> (#14061)Sasha Sorokin
This commit introduces new utility component - ShortNumber. It should work almost the same way as original shortNumberFormat function, though it also localizes units and accepts one more prop - renderer. Renderer is a function that takes rendered short formatted number and also ready-to-pluralize number to format display result accordingly. Ready-to-pluralize number allows to correctly select plural for compactly notated numbers, respecting thousands and other units. Issue #12451 accurately describes the issue with using raw numbers when replacing counter with short version. In short, it doesn't work with languages such as Russian, that require different plurals, according to the unit number was compacted to. All previous usages of shortNumberFormat were replaced with new function, and as it became unused, it was removed to avoid misleading.
2020-07-06Fix restored words from "toot" to "status" (#14242)mayaeh
2020-07-05Merge pull request #1371 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-07-05[Glitch] Add color extraction for audio thumbnailsEugen Rochko
Port 99f3a5554074d9a12619797c474b3de4c6085f02 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05[Glitch] Fix audio modals not using blurhash and posterEugen Rochko
Port 162adf61f268beac6e178f6f79f203b213055915 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
2020-07-05Add color extraction for audio thumbnails (#14209)Eugen Rochko
2020-07-03Merge branch 'glitch' into mainStarfall
2020-07-03Filter own toots out of timeline againStarfall
Reverts tootsuite/mastodon#14128
2020-07-03Add commit hash to displayed version numberStarfall
Also includes a few tweaks to the README
2020-07-03Add back a cleaner and leaner .env.production.sample (#14206)Eugen Rochko
2020-07-03Run `bundle exec i18n-tasks normalize` (#14205)Yamagishi Kazutoshi
2020-07-03Fix-up #13749 (#14204)mayaeh
2020-07-03Change the about.instance_actor_flash to be single-line (#14200)ThibG
Some translations of that string are single-line, which somehow seems to make Crowdin issue a blank newline at the end of those translations. This, in turns, leads to different results when running “i18n-tasks normalize” depending on the version of libyaml installed, making the CI fail if it runs a different version than whoever ran “i18n-tasks normalize”. Since there is no real reason for that source string to be multi-line (it is only displayed in HTML, without replacing newlines by <br/> tags), attempt to fix Crowdin export by making the source string single-line.
2020-07-03Fix audio uploads without embedded image (#14203)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-25 22:39:52 +0000