Commit graph

11678 commits

Author SHA1 Message Date
ThibG
3db3c10762 Fix filtered out items being counted as pending items (#12266) 2019-11-04 13:02:16 +01:00
ThibG
65e13cfacf Add abilityto add oneself to lists (#12271)
* Add ability to add oneself to lists

* Change search results to include oneself when searching through followers

* Mark follow relation as optional in ListAccount
2019-11-04 13:02:01 +01:00
ThibG
1a12943924 Fix notification filters not applying to poll options (#12269) 2019-11-04 13:01:50 +01:00
Scott Sweeny
1018097c40 Fix crowdin badge display in CONTRIBUTING.md (#12273)
* Fix crowdin badge display in CONTRIBUTING.md

The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string.

* Make Crowdin badge a link to the Mastodon project
2019-11-04 13:01:37 +01:00
ThibG
650820d62d Fix remote media descriptions being cut off at 420 chars (#12262)
* Fix remote media descriptions being cut off at 420 chars

Fixes #12258

* Fix tests
2019-11-04 13:00:16 +01:00
ThibG
7488a9e154 Add support for submitting media description with ctrl+enter (#12272) 2019-11-04 12:59:17 +01:00
Hinaloe
8568018935 dont crash with null-ref (#12274) 2019-11-04 12:58:19 +01:00
David Caldwell
3b609da9bd Dockerfile: put back EXPOSE directive (#12279)
[Rkt](https://coreos.com/rkt) doesn't allow ports to be exposed to containers unless they are declared in the container manifest. Re-adding EXPOSE back in (removed in 1dbf993bce) allows the container to be used on rkt based systems.
2019-11-04 12:56:21 +01:00
Nathaniel Suchy
23ed9303b8 Add tootctl media lookup command (#12283)
* Add a lookup tool to the media cli

* Improved lookup logic

* Clarified wording in the output

* Code style changes

* Code style changes

* Code style changes

* Code style changes

* Add error handling code incase an attachment isn't found

* Code style changes

* Code style changes

* Make requested changes

* Fix styling issues

* Handle other media types

* Remove an inadvertently added log

* Make requested changes

* Make the code safe no matter what the path, S3 or not

* Code style changes

* Code style changes

* Replace select method with Ruby Enumerable grep method
2019-11-04 12:55:20 +01:00
Nathaniel Suchy
71cd41aebf Update .gitignore (#12287) 2019-11-04 12:54:08 +01:00
dependabot-preview[bot]
685b0db882 Bump aws-sdk-s3 from 1.48.0 to 1.52.0 (#12250)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.48.0 to 1.52.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.48.0...v1.52.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:58:11 +09:00
dependabot-preview[bot]
741a85c064 Bump annotate from 2.7.5 to 3.0.2 (#12100)
Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.5 to 3.0.2.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.5...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:04:00 +09:00
dependabot-preview[bot]
0745fa8449 [Security] Bump simple_form from 4.1.0 to 5.0.1 (#12099)
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.1.0 to 5.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.1.0...v5.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-30 19:00:41 +09:00
dependabot-preview[bot]
291106e11c Bump rspec-rails from 3.8.2 to 3.9.0 (#12241)
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 19:40:52 +09:00
dependabot-preview[bot]
52c9044ea9 Bump dotenv from 8.0.0 to 8.2.0 (#12235)
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 11:12:05 +09:00
dependabot-preview[bot]
008d15d2cd Bump terser-webpack-plugin from 1.4.1 to 2.2.1 (#12233)
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.4.1 to 2.2.1.
- [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/v1.4.1...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:59:12 +09:00
dependabot-preview[bot]
e551274897 Bump strong_migrations from 0.4.1 to 0.4.2 (#12242)
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.1 to 0.4.2.
- [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.1...v0.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:55:56 +09:00
dependabot-preview[bot]
0caa707726 Bump active_record_query_trace from 1.6.2 to 1.7 (#12243)
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.2 to 1.7.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md)
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.2...v1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:55:07 +09:00
ThibG
00793a86bc
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-10-28 16:25:55 +01:00
dependabot-preview[bot]
254ddfc08a Bump pkg-config from 1.3.9 to 1.4.0 (#12239)
Bumps [pkg-config](https://github.com/ruby-gnome/pkg-config) from 1.3.9 to 1.4.0.
- [Release notes](https://github.com/ruby-gnome/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome/pkg-config/compare/1.3.9...1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:48:08 +09:00
dependabot-preview[bot]
4ecfd4308d Bump faker from 2.5.0 to 2.6.0 (#12244)
Bumps [faker](https://github.com/faker-ruby/faker) from 2.5.0 to 2.6.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.5.0...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:47:14 +09:00
dependabot-preview[bot]
da67b1fa37 Bump webpack-bundle-analyzer from 3.5.2 to 3.6.0 (#12237)
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.5.2 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.5.2...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:46:31 +09:00
dependabot-preview[bot]
3565fc1a00 Bump eslint-plugin-react from 7.14.3 to 7.16.0 (#12234)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.14.3 to 7.16.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.14.3...v7.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:42:47 +09:00
dependabot-preview[bot]
91b02afe4a Bump sass from 1.23.0 to 1.23.1 (#12238)
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.23.0...1.23.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:37:40 +09:00
dependabot-preview[bot]
7be994e0a9 Bump @babel/plugin-proposal-decorators from 7.4.4 to 7.6.0 (#12232)
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel) from 7.4.4 to 7.6.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.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:04:24 +09:00
Thibaut Girka
046cd05a83 Fix download button icon color 2019-10-28 11:41:26 +01:00
ThibG
2ed48037ea [Glitch] Replace fav icon animation with CSS
Port 3a929dbedd to glitch-soc

And extend that to collapse button

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 21:10:24 +01:00
Nima Boscarino
bde35e7878 [Glitch] Add download button to audio and video players
Port 9b36f62df6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 15:41:22 +01:00
Nima Boscarino
ebe34ed529 [Glitch] Unliking a post updates like count on front end
Port a9530e29a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:44:27 +01:00
ThibG
957eb4241a [Glitch] Fix volume slider in chromium 🤷
Port bcf694dce7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:42:44 +01:00
umonaca
dd810a9405 [Glitch] Improve swipe experience
Port f4be89e24d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:41:37 +01:00
Hinaloe
9840e1ad75 [Glitch] don't show outline of full-screen video
Port 547a5bac9d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:38:49 +01:00
ThibG
a4dc0d2c27 [Glitch] Fix batch actions being hidden from mobile view
Port SCSS changes from aa884e0484 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:37:17 +01:00
BSKY
59946f9231 [Glitch] Add noopener and/or noreferrer
Port fccf83e1f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 14:36:25 +01:00
Yamagishi Kazutoshi
a4301b5202 Fix notification message for own poll (#12219) 2019-10-27 12:46:35 +01:00
Takeshi Umeda
5b46467474 Fix an issue where polls with 'expires_at' not set expired (#12222) 2019-10-27 12:45:55 +01:00
Yamagishi Kazutoshi
7512f3a3e0 Change message of public timeline for local only (#12224) 2019-10-27 12:45:33 +01:00
dependabot-preview[bot]
4a0281d8c4 [Glitch] Bump react-select from 2.4.4 to 3.0.5
Port 183fc9d3cb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27 12:25:15 +01:00
Thibaut Girka
41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
Thibaut Girka
18c07738a6 Fix media components being cropped 2019-10-26 17:51:22 +02:00
Thibaut Girka
318362758b Hide overflowing characters from reply indicator too 2019-10-26 17:51:22 +02:00
Thibaut Girka
a24b954baa Avoid toot text bleeding out of the content div 2019-10-26 17:51:22 +02:00
Eugen Rochko
4988ebba4e
Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
Nima Boscarino
9b36f62df6 Add download button to audio and video players (#12179)
* Add download button for audio player

* Add download button for video player

* fix padding for download button in Audio component
2019-10-25 11:48:20 +02:00
Eugen Rochko
91945aa78a
Create stale.yml (#12207) 2019-10-25 11:47:40 +02:00
Faye Duxovni
48f75b86ae Add setting for whether to crop images in unexpanded toots (#12126) 2019-10-24 22:51:41 +02:00
Takeshi Umeda
a6269b2f83 Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
Nima Boscarino
a9530e29a2 Unliking a post updates like count on front end (#12140)
* return the new favourites_count
when unfavouriting a status

* Remove trailing whitespace

* revert changes to favourites_controller

* Decrease favourites_count through statuses reducer

* styling fix

* Fix missing trailing comma
2019-10-24 22:49:45 +02:00
ThibG
15c192ce40 Add link to search for users connected from the same IP address (#12157)
* Add link to search for users connected from the same IP address

Fixes #11949

* Fix missing cell in admin account view table
2019-10-24 22:49:26 +02:00
ThibG
bcf694dce7 Fix volume slider in chromium 🤷 (#12158)
Fixes #12156
2019-10-24 22:49:12 +02:00