alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,096 Commits
9 Branches
0 Tags
183 MiB
Commit Graph

10096 Commits (c4ae7aab6f9f66073b0200a837652df5942e9b7b)

Author SHA1 Message Date
ThibG 84ff393842 Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
ThibG 98c2d2aa46
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-28 22:35:54 +02:00
Eugen Rochko 662252c8f7 [Glitch] Add categories for custom emojis 
Port front-end changes from e64e6a03dd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-28 21:42:37 +02:00
ThibG 4d964398de [Glitch] Fix swiping columns on mobile sometimes failing 
Port 072158ee97 to glitch-soc
 2019-06-28 21:38:34 +02:00
Thibaut Girka 3922b518f7 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
ThibG 4f5b221be2 Display FTS warning based on actual search term, not the one being typed (#11202) 
Follow-up to #11112
 2019-06-28 19:29:11 +02:00
ThibG f7c0e326ab
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-28 19:11:06 +02:00
ThibG 43698e08ca [Glitch] Add message telling FTS is disabled when no toot can be found because of this 
Port ca8944728f to glitch-soc
 2019-06-28 18:54:56 +02:00
Eugen Rochko e64e6a03dd
Add categories for custom emojis (#11196) 
Fix #7940
 2019-06-28 15:54:10 +02:00
ThibG 072158ee97 Fix swiping columns on mobile sometimes failing (#11200) 
Fixes #9779
 2019-06-28 13:52:15 +02:00
Thibaut Girka c8ba75b963 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 12:11:45 +02:00
Thibaut Girka 6ad870a410 Change search components classes and styling to match upstream 2019-06-28 11:13:41 +02:00
ThibG ca8944728f Add message telling FTS is disabled when no toot can be found because of this (#11112) 
* Add message telling FTS is disabled when no toot can be found because of this

Fixes #11082

* Remove info icon and reword message
 2019-06-27 21:12:26 +02:00
ThibG 9a90ec3b3b Fix account URI in UpdatePollSerializer (#11194) 
* Fix account URI in UpdatePollSerializer

Fixes #11185

* Add specs
 2019-06-27 19:41:55 +02:00
Thibaut Girka ca17bae904 Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
ThibG 2f95adc06f
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-27 16:43:55 +02:00
Thibaut Girka 6ab7051b48 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-27 15:48:23 +02:00
mayaeh a02f4b7cd4 Fix NameError (#11192) 2019-06-27 09:16:55 +02:00
ThibG 4175f13155 [Glitch] Add option to disable blurhash previews 
Port 3086c645fd to glitch-soc
 2019-06-26 23:19:26 +02:00
PatOnTheBack 383136d9bb [Glitch] Removed extra pipes from regex. 
Port 5b20284f6f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-26 23:19:26 +02:00
ThibG 5c3171e8ea [Glitch] Apply filters to poll options in WebUI 
Port 47ef4a6c7a to glitch-soc
 2019-06-26 23:19:26 +02:00
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
 2019-06-26 23:19:22 +02:00
ThibG 3086c645fd Add option to disable blurhash previews (#11188) 
* Add option to disable blurhash previews

* Update option text

* Change options order
 2019-06-26 19:33:04 +02:00
ThibG 915c619394 Add support for Audio activities (#11189) 
Fixes #11127
 2019-06-26 19:32:36 +02:00
ThibG 32a4494926 Scroll to compose form rather than reply indicator on focus (#11182) 2019-06-26 14:28:36 +02:00
Thibaut Girka 9ef25877df Scroll to compose form rather than reply indicator on focus 2019-06-26 10:46:11 +02:00
PatOnTheBack 5b20284f6f Removed extra pipes from regex. (#11181) 2019-06-26 02:16:24 +02:00
ThibG ed10ae2693
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-06-25 22:43:33 +02:00
dependabot-preview[bot] 07508b2045 Bump stringz from 1.0.0 to 2.0.0 (#11168) 
Bumps [stringz](https://github.com/sallar/stringz) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 20:51:35 +02:00
Eugen Rochko 6836587117
Fix unnecessary SQL query performed on unauthenticated requests (#11179) 2019-06-25 20:18:15 +02:00
dependabot-preview[bot] 8d57795608 Bump eslint from 5.11.1 to 5.16.0 (#11165) 
Bumps [eslint](https://github.com/eslint/eslint) from 5.11.1 to 5.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.11.1...v5.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:51:57 +09:00
dependabot-preview[bot] 8d56433327 Bump derailed_benchmarks from 1.3.5 to 1.3.6 (#11171) 
Bumps [derailed_benchmarks](https://github.com/schneems/derailed_benchmarks) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/schneems/derailed_benchmarks/releases)
- [Changelog](https://github.com/schneems/derailed_benchmarks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/schneems/derailed_benchmarks/compare/v1.3.5...v1.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:49:44 +09:00
dependabot-preview[bot] 1afb8cac2f Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.42.0 to 1.43.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.42.0...v1.43.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:45:32 +09:00
dependabot-preview[bot] d9ac5b79ae Bump parallel_tests from 2.29.0 to 2.29.1 (#11169) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.0...v2.29.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:39:35 +09:00
dependabot-preview[bot] 864bc0d97a Bump dotenv-rails from 2.7.2 to 2.7.4 (#11170) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.2 to 2.7.4.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.2...v2.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:37:26 +09:00
dependabot-preview[bot] 99ade565b4 Bump mini-css-extract-plugin from 0.5.0 to 0.7.0 (#11167) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.5.0...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:36:57 +09:00
dependabot-preview[bot] f1da937245 Bump webpack-dev-server from 3.5.1 to 3.7.2 (#11166) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.5.1 to 3.7.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:32:58 +09:00
dependabot-preview[bot] e76d2c51c2 Bump babel-loader from 8.0.5 to 8.0.6 (#11164) 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.5 to 8.0.6.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.5...v8.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:24:49 +09:00
ThibG 47ef4a6c7a Apply filters to poll options (#11174) 
* Apply filters to poll options in WebUI

Fixes #11128

* Apply filters to poll options server-side

* Add poll options to searchable text
 2019-06-25 14:45:14 +02:00
Thibaut Girka 81bf43cfdd Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to audio files 2019-06-24 16:27:10 +02:00
Thibaut Girka 598cdc9542 Use a different icon for audio attachments 2019-06-24 16:16:16 +02:00
Eugen Rochko d7eb580053 [Glitch] Add media description as title to links of unknown media attachments 
Port front-end changes from 49ebda4d49 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-24 16:00:42 +02:00
Eugen Rochko 967456b6a9 [Glitch] Add audio uploads 
Port front-end changes from f7f23b4a19 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-24 16:00:42 +02:00
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
 2019-06-24 15:02:59 +02:00
Eugen Rochko 66ac1bd063
Fix unconverted PRs in the changelog (#11155) 2019-06-22 18:13:52 +02:00
Eugen Rochko b5c772c3d4
Bump version to 2.9.2 (#11152) 2019-06-22 17:28:26 +02:00
Eugen Rochko 8fe7116cdf
New Crowdin translations (#11144) 
* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations doorkeeper.en.yml (Catalan)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (Galician)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (German)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations
 2019-06-22 17:26:09 +02:00
Eugen Rochko b927bb3f07
Fix audio-only OGG and WebM files not being processed as such (#11151) 
Also, because Chrome sends audio/mp3 instead of audio/mpeg as it's
supposed to, we need to whitelist that mime type as well
 2019-06-22 16:54:06 +02:00
koyu 6eb5241099 Change camera icon to paperclip icon in upload form (#11149) 2019-06-22 15:29:25 +02:00
Eugen Rochko d61d164685
Add `short_description` and `approval_required` to `GET /api/v1/instance` (#11146) 2019-06-22 12:08:16 +02:00