djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,944 Commits 69 Branches 20 Tags 380 MiB
be4849c083
Commit Graph

10944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
be4849c083 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
 2019-12-12 15:40:06 +01:00
dependabot-preview[bot]
d08a497946 Bump aws-sdk-s3 from 1.57.0 to 1.59.0 (#12581) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.57.0 to 1.59.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.57.0...v1.59.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:39:11 +09:00
dependabot-preview[bot]
c7a9e14c46 Bump yargs from 13.3.0 to 15.0.2 (#12574) 
Bumps [yargs](https://github.com/yargs/yargs) from 13.3.0 to 15.0.2.
- [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/v13.3.0...v15.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:37:37 +09:00
dependabot-preview[bot]
5ff2d8c247 Bump es6-symbol from 3.1.2 to 3.1.3 (#12577) 
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.2...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:37:08 +09:00
dependabot-preview[bot]
c2fa1b9ca9 Bump eslint-plugin-import from 2.18.2 to 2.19.0 (#12580) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.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.18.2...v2.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:36:28 +09:00
dependabot-preview[bot]
c89a686ea4 Bump @babel/core from 7.7.4 to 7.7.5 (#12578) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [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.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:32:52 +09:00
dependabot-preview[bot]
cc87e9ec70 Bump @babel/runtime from 7.7.4 to 7.7.6 (#12579) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.6/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:32:26 +09:00
dependabot-preview[bot]
5c0113b34e Bump @babel/plugin-transform-runtime from 7.7.4 to 7.7.6 (#12575) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.7.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:31:53 +09:00
dependabot-preview[bot]
a45ba1c701 Bump react from 16.10.2 to 16.12.0 (#12573) 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.10.2 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:31:03 +09:00
dependabot-preview[bot]
fa8ce9da81 Bump terser-webpack-plugin from 2.2.1 to 2.2.2 (#12576) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.2.1 to 2.2.2.
- [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/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 01:03:00 +01:00
dependabot-preview[bot]
ba2eac8824 Bump strong_migrations from 0.4.2 to 0.5.0 (#12583) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.2 to 0.5.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.4.2...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 00:55:03 +01:00
dependabot-preview[bot]
0b0abe20f7 Bump sidekiq-unique-jobs from 6.0.15 to 6.0.18 (#12582) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.15 to 6.0.18.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.15...v6.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 00:52:43 +01:00
Eugen Rochko
77e7b33dea
Revert "Fix an eslint warning (#12426)" (#12596) 
This reverts commit 054ef83fc5.
 2019-12-10 19:39:02 +01:00
Eugen Rochko
17159625b3
Add S3_OVERRIDE_PATH_STYLE environment variable (#12594) 
To support Exoscale
 2019-12-10 07:40:01 +01:00
Eugen Rochko
7ee6f51b78
Fix missing error templates for non-HTML requests (#12593) 2019-12-10 07:39:54 +01:00
Sasha Sorokin
ab91e7480b Use codeblock for native redirect URI (#12570) 
This commit changes how doorkeeper.applications.help.native_redirect_uri
string is being formatted to use <code> tag for native_redirect_uri
placeholder. This makes the URI look more distinguishable.
 2019-12-09 04:30:58 +01:00
Eugen Rochko
d7bcc0930c
Fix error handling in tootctl media remove-orphans (#12571) 2019-12-09 04:26:00 +01:00
ThibG
246addd5b3
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-12-08 21:27:36 +01:00
Eugen Rochko
f3d232381d
Add tootctl media remove-orphans (#12568) 2019-12-08 15:37:12 +01:00
Thibaut Girka
49027ee948 Fix erroneous inclusion of upstream code 2019-12-07 15:53:04 +01:00
Hinaloe
d4c22d48df [Glitch] Highlight border when focusing poll-form footer 
Port eb551c480d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Takeshi Umeda
510e527663 [Glitch] Add basic support for group actors 
Port f43f1e0184 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
c6ba870f00 [Glitch] Fix poll options not being selectable via keyboard 
Port c05ed8a625 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
1e1293e3c8 [Glitch] Add follow_request notification type 
Port 911cc14481 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Shlee
176f1da267 [Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2 
Port f92ed32df4 to glitch-soc

Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 12:54:27 +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
Eugen Rochko
6d7daf6154
Fix generic HTTP 500 error on duplicate records (#12563) 
Fix #12551
Fix #12547
 2019-12-06 22:40:06 +01:00
trwnh
1653ae91ce Fix account search with no query (#12549) 
* Fix account search with no query

Modeled after #12541. Fix #12548

* fix codeclimate
 2019-12-06 19:44:23 +01:00
dependabot-preview[bot]
0465d2a3ce [Security] Bump puma from 4.2.0 to 4.3.1 (#12559) 
Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 19:44:09 +01:00
Hinaloe
eb551c480d Highlight border when focusing poll-form footer (#12544) 2019-12-05 00:51:07 +01:00
Jeong Arm
76adde4fe2 Fix media open hotkey (#12546) 2019-12-05 00:50:51 +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
Shlee
f92ed32df4 upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543) 
* Update stream.js

* Update package.json

* Update yarn.lock

Co-authored-by: hina <hina@hinaloe.net>
 2019-12-04 20:45:49 +09:00
ThibG
f682387aae Fix old migration failing with new status default scope (#12493) 2019-12-04 04:34:31 +01:00
Eugen Rochko
bbf926b1c0
Fix error when using search API with no query (#12541) 
Fix #12462
 2019-12-04 04:34:08 +01:00
trwnh
4354936a39 Return discoverable via REST API (fix #12507) (#12508) 2019-12-03 19:56:34 +01:00
ThibG
c05ed8a625 Fix poll options not being selectable via keyboard (#12538) 
* Fix poll options not being selectable via keyboard

Fixes #12384

* Improve styling of poll option checkboxes/radio buttons

* Use more appropriate ARIA roles for poll options

* Allow switching between single and multiple choice from keyboard

* Coding style

* Avoid using .bind()
 2019-12-03 19:53:16 +01:00
tateisu
f1ef777d40 add S3_OPEN_TIMEOUT environment variable (#12459) 2019-12-02 21:05:27 +01:00
Yamagishi Kazutoshi
e598ce0bd9 Move rspec examples to tmp dir (#12539) 2019-12-02 19:55:08 +01:00
dependabot-preview[bot]
5097a8d12c Bump faker from 2.7.0 to 2.8.0 (#12531) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 02:38:17 +09:00
dependabot-preview[bot]
ce642d636b Bump brakeman from 4.7.1 to 4.7.2 (#12530) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.7.1...v4.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 02:37:54 +09:00
dependabot-preview[bot]
307f123808 Bump autoprefixer from 9.6.1 to 9.7.3 (#12519) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.6.1 to 9.7.3.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.1...9.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 02:37:22 +09:00
Yamagishi Kazutoshi
6be16d02cb Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
ThibG
27d5d02925 Fix blocking/unblocking users from status dropdown menu (#12535) 
Fixes #12511
 2019-12-02 18:25:24 +01:00
dependabot-preview[bot]
c7da6db28d Bump eslint-plugin-react from 7.16.0 to 7.17.0 (#12524) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.16.0 to 7.17.0.
- [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.16.0...v7.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 00:55:32 +09:00
dependabot-preview[bot]
f61d8da9f4 Bump blurhash from 1.0.0 to 1.1.3 (#12411) 
Bumps [blurhash](https://github.com/woltapp/blurhash) from 1.0.0 to 1.1.3.
- [Release notes](https://github.com/woltapp/blurhash/releases)
- [Commits](https://github.com/woltapp/blurhash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 23:18:59 +09:00
dependabot-preview[bot]
f64a132396 Bump aws-sdk-s3 from 1.55.0 to 1.57.0 (#12528) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.55.0 to 1.57.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.55.0...v1.57.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 23:03:46 +09:00
dependabot-preview[bot]
c54e04d1b2 Bump arrow-key-navigation from 1.0.2 to 1.1.0 (#12523) 
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases)
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.0.2...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 22:59:12 +09:00
dependabot-preview[bot]
c9249fbb15 Bump tty-prompt from 0.19.0 to 0.20.0 (#12529) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.19.0 to 0.20.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.19.0...v0.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 22:58:07 +09:00