tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
10,988 Commits 20 Branches 113 Tags 222 MiB
7d2b1dc094
Commit Graph

10988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasha Sorokin
7d2b1dc094 [Glitch] Improve report page structure 
Port 34aa5c7cb2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-19 14:37:12 +01:00
Thibaut Girka
ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
 2019-12-19 13:52:54 +01:00
Sasha Sorokin
902c6bed5a Use different strings on exports page (#12569) 
Currently the page re-uses strings from other contexts which doesn't fit
very well - strings incorrectly lowercase-d and pluralized, when they
don't need to be, because it's a table.

This commit changes page to re-use accounts.posts_tab_heading for toots,
and admin.accounts for "Following" and "Follows". This all should look
more aesthetically pleasing.
 2019-12-19 12:47:55 +01:00
ThibG
dc0750abc3 Fix manual scrolling issue on Firefox/Windows (#12648) 
Fixes #12607

`will-change: transform` apparently makes manual scrolling impossible on
Firefox/Windows. While this should probably be considered a Firefox bug,
`will-change: transform` seem like a very aggressive performance hint that
may possibly make the browser consume more resources than needed, especially
in multiple-column mode.

This was originally added to improve scrolling performances on mobile, but
I think this isn't necessary anymore, because of the two following reasons:
- `contain: paint` (which is implied by `contain: strict`, which we apply
  whenever the browser supports grids) should have similar effects
- in single-column mode, the scrolling container is the root element, which
  I believe is optimized in at least Chromium

Keep in mind that I have not been able to make in-depth benchmarks, and
especially not been able to try on mobile, so performances should probably
be investigated further…
 2019-12-19 12:47:19 +01:00
Marcin Mikołajczak
a90258dbe9 fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
dependabot-preview[bot]
4dbf0a91b2 [Security] Bump rack from 2.0.7 to 2.0.8 (#12654) 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 07:21:51 +09:00
Eugen Rochko
1afbe083fd
Fix unsafe column type change in migration (#12653) 2019-12-18 19:04:43 +01:00
ThibG
c0ed53b810 Fix custom emoji category creation silently erroring out on duplicate category (#12647) 
Instead, just re-use the existing category if any.

Fixes #12608
 2019-12-18 16:56:59 +01:00
ThibG
fb9137752a Remove unused translatable strings (#12643) 
* Remove unused “salmon_url” string

* Remove more unused translatable strings

The following strings all used to be on the admin account page
but aren't used anymore: profile_url, outbox_url, followers_url, feed_url
 2019-12-18 16:56:39 +01:00
ThibG
b364175e1b Fix link crawler not specifying accepted content-type (#12646) 
The link crawler expects HTML documents, so set the `Accept`
header accordingly.

Fixes #12618
 2019-12-18 16:56:06 +01:00
Takeshi Umeda
68070e82cc Add signature to exported status (#12649) 2019-12-18 16:55:21 +01:00
Bèr Kessels
8a347f4937 Fix typo in login feature-test. (#12651) 2019-12-18 16:54:29 +01:00
Takeshi Umeda
a391eaf4d8 Fix an error when ActivityPub::FetchRemoteStatusService url is called with nil (#12652) 2019-12-18 16:54:03 +01:00
dependabot-preview[bot]
45f8968404 Bump rails from 5.2.3 to 5.2.4 (#12584) 
* Bump rails from 5.2.3 to 5.2.4

Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* sprockets ~> 3.7
 2019-12-18 08:58:53 +09:00
dependabot-preview[bot]
c436367c3c Bump json-ld-preloaded from 3.0.4 to 3.0.6 (#12361) 
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.4 to 3.0.6.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.4...3.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:04:30 +09:00
dependabot-preview[bot]
9dc2fc9ec6 Bump react-redux from 7.1.1 to 7.1.3 (#12626) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.1 to 7.1.3.
- [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/v7.1.1...v7.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:54:42 +09:00
dependabot-preview[bot]
b2aeb0061a Bump webpacker from 4.2.0 to 4.2.2 (#12632) 
Bumps [webpacker](https://github.com/rails/webpacker) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.2.0...v4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:53:15 +09:00
dependabot-preview[bot]
08f48cbeb4 Bump eslint-plugin-import from 2.19.0 to 2.19.1 (#12622) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.19.0 to 2.19.1.
- [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.19.0...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:42:25 +09:00
dependabot-preview[bot]
b6b2757fc7 Bump copy-webpack-plugin from 5.0.5 to 5.1.1 (#12621) 
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 5.0.5 to 5.1.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v5.0.5...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:42:02 +09:00
dependabot-preview[bot]
80fb452446 Bump css-loader from 3.2.0 to 3.3.2 (#12624) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:41:49 +09:00
dependabot-preview[bot]
49d1190a97 Bump array-includes from 3.0.3 to 3.1.0 (#12627) 
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/es-shims/array-includes/releases)
- [Changelog](https://github.com/es-shims/array-includes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/array-includes/compare/v3.0.3...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:40:34 +09:00
dependabot-preview[bot]
99adf00d11 Bump doorkeeper from 5.2.2 to 5.2.3 (#12630) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:36:49 +09:00
dependabot-preview[bot]
d5fe624992 Bump stackprof from 0.2.13 to 0.2.14 (#12631) 
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.13 to 0.2.14.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.13...v0.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:34:20 +09:00
dependabot-preview[bot]
71b4e2dcbb Bump parallel_tests from 2.29.2 to 2.30.0 (#12634) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.2 to 2.30.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.2...v2.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:32:51 +09:00
Thibaut Girka
66ab1f83b0 Fix various issues caused by wrong unread key being updated 2019-12-17 15:55:10 +01:00
ThibG
7fe45e7c03 Changes to tootctl statuses remove (#11267) 
* Fix comments in statuses_cli

The comment for the part of query keeping statuses which have replies was
incorrect, explaining the part of the query kept favourited statuses instead

* Keep statuses favourited by local users in tootctl statuses remove

* Do delete old replies that are not direct interactions with local users

* Skip reblogs of local statuses instead of all reblogs

* Optimize some queries

* Keep old statuses with recent reblogs

* Add option to clear toots from followed accounts too
 2019-12-17 13:33:36 +01:00
ThibG
2ee5a9d9c3 Clean up OStatus-related codepaths (#12173) 
* Remove “protocol” argument and return value, as only ActivityPub is supported

* Remove FetchRemoteAccountService, only use ActivityPub::FetchRemoteAccountService

* Fix tests
 2019-12-17 13:32:57 +01:00
ThibG
da2143b308 Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436) 
* Revert "Fix ignoring whole status because of one invalid hashtag (#11621)"

This reverts commit dff46b260b.

* Fix statuses being rejected because of invalid hashtag names

* Add spec for invalid hashtag names in statuses

* Add test for featured tags controller
 2019-12-17 13:31:56 +01:00
scd31
3830c0b741 Increase max backup size (#12602) 
* Increased max backup size

* partially reverted schema.rb
 2019-12-17 13:30:58 +01:00
dependabot-preview[bot]
0aaedcd66f Bump @babel/preset-env from 7.7.4 to 7.7.6 (#12623) 
Bumps [@babel/preset-env](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-17 10:20:49 +09:00
dependabot-preview[bot]
7e736d77dd Bump compression-webpack-plugin from 3.0.0 to 3.0.1 (#12620) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/v3.0.1/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 10:19:58 +09:00
dependabot-preview[bot]
ed015e2e3d Bump faker from 2.8.0 to 2.8.1 (#12633) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.8.0 to 2.8.1.
- [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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 10:19:20 +09:00
Alice Gaudon
668f698077 Admin setting to disable default follows (#12566) 2019-12-16 23:55:50 +01:00
Thomas Citharel
8094955461 Add Event activity-type support (#12637) 
This adds support for Event AP type in Mastodon. Events are converted
into toots by taking their title (AS name) and their URL (AP ID). Event
picture is also brought in if available.

Testable by fetching event content from https://test.mobilizon.org

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-16 23:55:28 +01:00
Sasha Sorokin
34aa5c7cb2 Improve report page structure (#12615) 
* Move resolved button to the heading

This is one of the commits on improving overall reports page structure.
It changes where resolved button is located, moving it to the heading,
right next to the "Report #n" header, so-called "hot-place" to look at.

To accomplish this we have to declare one more content variable, change
admin dashboard template to respect it and CSS files for minor styling,
so buttons are inlined and centrally aligned according to the heading.

* Move actions buttons below the report table

I believe that actions to react on report should not be located at the
top of the page, instead they should be either after the table or
reporter's comment. This is just a logical sign that you should not
react to the report without reading all the details first.
 2019-12-16 23:55:16 +01:00
Acid Chicken (硫酸鶏)
09a72add0e Fix tooltip messages of multiple poll switcher are reversed (#12616) 2019-12-16 23:55:02 +01:00
dependabot-preview[bot]
f4906f2cac [Security] Bump excon from 0.62.0 to 0.71.0 (#12638) 
Bumps [excon](https://github.com/excon/excon) from 0.62.0 to 0.71.0. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 23:53:38 +01:00
Bèr Kessels
d53330f65b Ignore development specfic env file (#12606) 2019-12-13 08:04:57 -05:00
Sasha Sorokin
d5b7a4b116 Avoid using pluralize on moderation pages (#12589) 
Pluralize function from Rails framework does not work with other
languages than English, moreover it does not even work properly with
English [1]. Not that the latest applies to this context, it's just
a sign that we best to avoid this function, especially when there are
more reliable ways.

This commit changes how reports pages generated in order to avoid usage
of pluralize function, replacing it with default translation function,
called with given counter. On top of that, we have to make strings
pluralizable, so have to change locale files.

[1]: https://medium.com/@anna7/b3927de2ca8e#6a60
 2019-12-12 19:50:23 +01:00
trwnh
1c10283217 Fix typo in tootctl statuses remove (#12603) 2019-12-12 19:50:08 +01:00
dependabot-preview[bot]
fb17814d4a Bump nokogiri from 1.10.5 to 1.10.7 (#12586) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.5 to 1.10.7.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.5...v1.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 02:57:44 +09:00
dependabot-preview[bot]
bc6141b085 Bump rubocop from 0.76.0 to 0.77.0 (#12585) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.76.0 to 0.77.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.76.0...v0.77.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-13 02:57:32 +09:00
Thibaut Girka
6a1b4c3452 Fix edit filter link in filtered “Show why” dialog 2019-12-12 16:32:47 +01:00
ThibG
c1befd3909
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-12-12 16:10:58 +01:00
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