about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-06-28Merge branch 'glitch' into productionReverite
2019-06-28Merge pull request #1146 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-28[Glitch] Add categories for custom emojisEugen Rochko
Port front-end changes from e64e6a03dd1e0978fee48f0596dcfbc7fd29958f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-28[Glitch] Fix swiping columns on mobile sometimes failingThibG
Port 072158ee973f8e09a0abd34a825d9bce038a5d68 to glitch-soc
2019-06-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-28Display FTS warning based on actual search term, not the one being typed ↵ThibG
(#11202) Follow-up to #11112
2019-06-28Merge pull request #1145 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-28[Glitch] Add message telling FTS is disabled when no toot can be found ↵ThibG
because of this Port ca8944728f4568bbef8edae99382cd44cbc144d6 to glitch-soc
2019-06-28Add categories for custom emojis (#11196)Eugen Rochko
Fix #7940
2019-06-28Fix swiping columns on mobile sometimes failing (#11200)ThibG
Fixes #9779
2019-06-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-28Change search components classes and styling to match upstreamThibaut Girka
2019-06-27Merge branch 'glitch' into productionReverite
2019-06-27FixReverite
2019-06-27Retryreverite
2019-06-27Add message telling FTS is disabled when no toot can be found because of ↵ThibG
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-27Fix account URI in UpdatePollSerializer (#11194)ThibG
* Fix account URI in UpdatePollSerializer Fixes #11185 * Add specs
2019-06-27Use stretchreverite
2019-06-27Use a redis-cached feed for the DM timelineThibaut Girka
2019-06-27Merge pull request #1142 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-27Fix NameError (#11192)mayaeh
2019-06-26Merge branch 'glitch' into productionReverite
2019-06-26[Glitch] Add option to disable blurhash previewsThibG
Port 3086c645fde2345d34e401bdf3e2f19f19da3294 to glitch-soc
2019-06-26[Glitch] Removed extra pipes from regex.PatOnTheBack
Port 5b20284f6f7ebb2514d81fb27fcaa40f8edf14ff to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-26[Glitch] Apply filters to poll options in WebUIThibG
Port 47ef4a6c7a74072daff8b23c4af3e300bb75ba1a to glitch-soc
2019-06-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-26Add option to disable blurhash previews (#11188)ThibG
* Add option to disable blurhash previews * Update option text * Change options order
2019-06-26Add support for Audio activities (#11189)ThibG
Fixes #11127
2019-06-26Scroll to compose form rather than reply indicator on focus (#11182)ThibG
2019-06-26Scroll to compose form rather than reply indicator on focusThibaut Girka
2019-06-26Removed extra pipes from regex. (#11181)PatOnTheBack
2019-06-25Merge pull request #1138 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-25Bump stringz from 1.0.0 to 2.0.0 (#11168)dependabot-preview[bot]
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-25Fix unnecessary SQL query performed on unauthenticated requests (#11179)Eugen Rochko
2019-06-25Bump eslint from 5.11.1 to 5.16.0 (#11165)dependabot-preview[bot]
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-25Bump derailed_benchmarks from 1.3.5 to 1.3.6 (#11171)dependabot-preview[bot]
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-25Bump aws-sdk-s3 from 1.42.0 to 1.43.0 (#11172)dependabot-preview[bot]
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-25Bump parallel_tests from 2.29.0 to 2.29.1 (#11169)dependabot-preview[bot]
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-25Bump dotenv-rails from 2.7.2 to 2.7.4 (#11170)dependabot-preview[bot]
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-25Bump mini-css-extract-plugin from 0.5.0 to 0.7.0 (#11167)dependabot-preview[bot]
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-25Bump webpack-dev-server from 3.5.1 to 3.7.2 (#11166)dependabot-preview[bot]
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-25Bump babel-loader from 8.0.5 to 8.0.6 (#11164)dependabot-preview[bot]
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-25Apply filters to poll options (#11174)ThibG
* Apply filters to poll options in WebUI Fixes #11128 * Apply filters to poll options server-side * Add poll options to searchable text
2019-06-24Change .env.production.sample to specify that MAX_VIDEO_SIZE also applies to ↵Thibaut Girka
audio files
2019-06-24Use a different icon for audio attachmentsThibaut Girka
2019-06-24[Glitch] Add media description as title to links of unknown media attachmentsEugen Rochko
Port front-end changes from 49ebda4d49af50b375126e4a8285686fb6448a60 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-24[Glitch] Add audio uploadsEugen Rochko
Port front-end changes from f7f23b4a19a84371f44ec5297125e96ba81681a1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-22Merge branch 'glitch' into productionReverite
generated by cgit-pink (git 2.37.1) at 2024-12-23 22:38:11 +0000