Age | Commit message (Collapse) | Author |
|
Merge upstream changes
|
|
Port 5bfd802c571a2793bb59ba4540407a6147e82f88 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 2657765d2a6804f34ce65bfdab7ec96f07d99732 to glitch-soc
|
|
Port 8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b to glitch-soc
|
|
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"
This reverts commit 121d19d7fa239c52ce86352d3fdae0649c892a20.
* Disable Rails/HelperInstanceVariable
|
|
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
|
|
* Scroll to compose form when focus
* Get rid of constructor
|
|
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
|
|
|
|
Fixes #10945
|
|
Merge upstream changes
|
|
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
|
|
|
|
|
|
concern (#10966)
|
|
|
|
* Fix poll API not requiring authentication on non-public polls
That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got
Fix #10959
* Add test
|
|
|
|
|
|
And change some word.
|
|
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver) from 0.5.1 to 0.7.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases)
- [Commits](https://github.com/w3c/IntersectionObserver/commits)
|
|
|
|
Merge upstream changes
|
|
|
|
|
|
Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.1.0 to 3.1.3.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)
|
|
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.6 to 4.0.7.
- [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.0.6...v4.0.7)
|
|
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) from 0.13.0 to 0.13.3.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases)
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.0...v0.13.3)
|
|
|
|
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)
|
|
* Bump @babel/plugin-proposal-object-rest-spread from 7.3.4 to 7.4.4
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [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.3.4...v7.4.4)
* Bump @babel/core from 7.3.4 to 7.4.5
* Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.4.4
* Bump @babel/plugin-proposal-decorators from 7.3.0 to 7.4.4
* Bump @babel/preset-env from 7.3.4 to 7.4.5
* Bump @babel/runtime from 7.3.4 to 7.4.5
|
|
* Bump react from 16.7.0 to 16.8.6
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.7.0 to 16.8.6.
- [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.8.6/packages/react)
* Bump react-dom from 16.7.0 to 16.8.6
* Bump react-test-renderer from 16.7.0 to 16.8.6
|
|
Port e13e4b28db7e066d1f6f21e306aa95b97c3ccd99 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
|
|
Bumps [sass](https://github.com/sass/dart-sass) from 1.20.1 to 1.20.3.
- [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.20.1...1.20.3)
|
|
Bumps [react-intl](https://github.com/yahoo/react-intl) from 2.7.2 to 2.9.0.
- [Release notes](https://github.com/yahoo/react-intl/releases)
- [Commits](https://github.com/yahoo/react-intl/compare/v2.7.2...v2.9.0)
|
|
Added MAX_AUDIO_LENGTH var and documented in .env.production.sample
|
|
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
|
|
Bumps [offline-plugin](https://github.com/NekR/offline-plugin) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/NekR/offline-plugin/releases)
- [Changelog](https://github.com/NekR/offline-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NekR/offline-plugin/compare/v5.0.6...v5.0.7)
|
|
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.8.0/packages/babel-jest)
|