mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 14:16:12 +01:00
Code Issues Projects Releases Wiki Activity
9,832 Commits 133 Branches 269 Tags 893 MiB
46687a3cbd
Commit Graph

9832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
46687a3cbd Shorten status icon tooltip text 2019-07-17 21:35:34 +02:00
Thibaut Girka
572009cf56 Add status icon for local-only toots 2019-07-17 21:35:34 +02:00
Thibaut Girka
7db7cb31b1 Add tooltips to status icons 2019-07-17 21:35:34 +02:00
ThibG
e9cc17bbea
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream 
Cherry-pick changes from upstream
 2019-07-17 16:56:10 +02:00
Eugen Rochko
e91bf82083 [Glitch] Add option to disable real-time updates in web UI 
Port 729723f857 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-16 16:51:08 +02:00
Daigo 3 Dango
c8a47595fb Make puma bind address configurable with BIND env var (#11326) 2019-07-16 16:12:01 +02:00
Eugen Rochko
729723f857 Add option to disable real-time updates in web UI (#9984) 
Fix #9031
Fix #7913
 2019-07-16 16:11:50 +02:00
dependabot-preview[bot]
3598305460 Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
bb7f3e4112 Bump webpack from 4.34.0 to 4.35.3 (#11309) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
22f1ec1b1e Bump lodash from 4.17.13 to 4.17.14 (#11312) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot]
3a1e124f5a Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315) 
Bumps [@babel/runtime](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:19 +02:00
dependabot-preview[bot]
f0d288619c Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:19 +02:00
Eugen Rochko
be053560e9 Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 2019-07-16 16:10:19 +02:00
ThibG
5ccd011cc3
Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream 
Cherry pick changes from upstream
 2019-07-15 01:04:31 +02:00
PatOnTheBack
3ad8c9ea61 Bump handlebars from 4.1.0 to 4.1.2 (#11293) 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
18d2eeeb38 Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.0.1 to 2.2.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.0.1...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
han@highemelry
0442fcdbc8 Change the retry limit in error of web push notification (#11292) 
- Change the maximum count of retry for web push notification (Default -> 5).
   - In case of high load of subscribe server, the retries will be repeated many times.
   - Because the retries occupy the default queue, maximum retry count should be reduced.
 2019-07-15 00:48:50 +02:00
ThibG
99c1f0811b Fix BlockService trying to reject incorrect follow request (#11288) 
Fixes #11148
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
9521cacd40 [Security] Bump lodash from 4.17.11 to 4.17.13 (#11287) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
ThibG
9f67e3b9cc Fix Status.remote scope matching *all* statuses (#11265) 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
c40d47b8e0 Bump faker from 1.9.3 to 1.9.6 (#11259) 
Bumps [faker](https://github.com/stympy/faker) from 1.9.3 to 1.9.6.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.9.3...1.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
2f441876c7 Bump simplecov from 0.16.1 to 0.17.0 (#11260) 
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
23978df143 Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.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/compare/v1.43.0...v1.45.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
4ea8f2189c Bump tzinfo-data from 1.2019.1 to 1.2019.2 (#11258) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.1 to 1.2019.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
16340cb6ef Bump eslint-plugin-react from 7.12.1 to 7.14.2 (#11253) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.12.1 to 7.14.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.12.1...v7.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
9699506dc4 Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 (#11254) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
ed43922483 Bump compression-webpack-plugin from 2.0.0 to 3.0.0 (#11224) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v2.0.0...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
2fa85ead32 Bump intl-relativeformat from 2.2.0 to 6.4.2 (#11255) 
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 2.2.0 to 6.4.2.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@2.2.0...intl-relativeformat@6.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot]
ea0c09e4fb Bump react-redux from 6.0.1 to 7.1.0 (#11256) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.1 to 7.1.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.1...v7.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
ThibG
bd77fd6ff3 Fix BackupService crashing when an attachment is missing (#11241) 
* Fix BackupService crashing when an attachment is missing

For various reasons such as admin error or out-of-sync media and
database backups, it might be possible for local attachments to be lost.

This commit allows the BackupService to continue its work even if some media
file is missing.

* Change error message
 2019-07-15 00:48:49 +02:00
Georg Gadinger
b073008282 Update fuubar dependency to 2.4.1 (#11248) 
See also: thekompanee/fuubar#111
 2019-07-15 00:48:49 +02:00
Thibaut Girka
1b074d2a50 Add link to edit each listed filter 2019-07-15 00:48:28 +02:00
Thibaut Girka
f7fa11c4cd Make some strings translatable 2019-07-15 00:48:28 +02:00
Thibaut Girka
fc8577cf2b Minor refactoring 2019-07-15 00:48:28 +02:00
Thibaut Girka
707b8d7d75 Move the “Show why” button inline 2019-07-15 00:48:28 +02:00
Thibaut Girka
85f3bc1ab3 Implement feature to add filtered phrases to content warnings 2019-07-15 00:48:28 +02:00
Thibaut Girka
42b59b730b Implement option to completely hide filtered toots 2019-07-15 00:48:28 +02:00
Thibaut Girka
16b79a6237 Add options to configure filtering behavior 2019-07-15 00:48:28 +02:00
Thibaut Girka
bde7a415b9 Add a way to know why a status has been filtered, and show it anyway 2019-07-15 00:48:28 +02:00
Thibaut Girka
e9fac2def9 Do not keep polls pre-filled in thread mode 2019-07-15 00:41:09 +02:00
Thibaut Girka
e0bfa685c6 Fix error boundary CSS 2019-07-15 00:28:31 +02:00
Thibaut Girka
0baaee495f Fix report dialog crashing when a toot gets deleted 
Fixes #1155
 2019-07-10 19:53:31 +02:00
ThibG
fce885f271
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-07 22:26:10 +02:00
Thibaut Girka
5ff9970c8d Re-add route for direct timeline 2019-07-07 14:12:41 +02:00
ThibG
64f3bc77ac [Glitch] Only scroll to the compose form if it's not horizontally in the viewport 
Port c07cca4727 to glitch-soc
 2019-07-07 14:03:12 +02:00
ThibG
a0b614f10a Fix support for HTTP proxies (#11245) 
* Disable incorrect check for hidden services in Socket

Hidden services can only be accessed with an HTTP proxy, in which
case the host seen by the Socket class will be the proxy, not the
target host.

Hidden services are already filtered in `Request#initialize`.

* Use our Socket class to connect to HTTP proxies

Avoid the timeout logic being bypassed

* Add support for IP addresses in Request::Socket

* Refactor a bit, no need to keep the DNS resolver around
 2019-07-07 13:53:09 +02:00
Thibaut Girka
7039dca12c Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
 2019-07-07 13:49:31 +02:00
ThibG
c07cca4727 Only scroll to the compose form if it's not horizontally in the viewport (#11246) 
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
 2019-07-06 18:18:08 +02:00
Eugen Rochko
ae003d54f9
Fix option to send e-mail notification about account action always being true (#11242) 2019-07-06 13:54:32 +02:00
ThibG
ed544f3166 Fix HTTP requests to IPv6 hosts (#11240) 2019-07-05 22:03:00 +02:00