Age | Commit message (Collapse) | Author |
|
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.0 to 7.5.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.5.0...v7.5.5)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.0 to 7.1.1.
- [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.0...v7.1.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
* Add translation target for hashtag.
* run `yarn manage:translations en`
|
|
Fixes #11630
|
|
needed (#11656)
|
|
* Fix more visual issues with the audio player
- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded
* Fix code style issue
|
|
|
|
Fix #11643
|
|
|
|
|
|
|
|
|
|
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
|
|
* Restore hashtag suggestions from local tag history
* Append local hashtag suggestions instead of prepending them
* Do not display inaccurate usage statistics for hashtags not retrieved from API
* Fixup
|
|
The reason for unattaching media instead of removing it is to support
delete & redraft functionality, but remote or staff-removed statuses
will never be redrafted, so the media should be deleted immediately
|
|
|
|
(#11631)
|
|
|
|
This is based of 3e095cab83f3e88c5f5f4ca9d7029379ed5b5b56
Related: https://git.pleroma.social/pleroma/pleroma/issues/1191
|
|
Merge upstream changes
|
|
Port b48c7ee059d0e08fff4bdf7fe7b0e09565288252 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Fixes #11627
|
|
Merge upstream changes
|
|
dialog
|
|
Since the textarea is in a modal, now…
|
|
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
|
|
This reverts commit 2e44b81166cab3511fe505b11b8a90cadd773a05.
|
|
|
|
|
|
|
|
|
|
Port 0d13a9cd13def44e10652275fed86d6d6d8e1a99 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 2ca6b2bb6c9e811ad98e3df23e70efbf22882e42 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port d37126fd03e47c32eaf532937dfc843b952d0d5a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 1bea3181975f377bbccfe92691e2cd281b298ec6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port dfe60598899738250fc707db91048b871ab09282 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 28636f43e4b0c04befa243b847c38e81c90f1289 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port 23f7afa562c49b24e979505680463bc712b11d94 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from b348c9b0dbd72f2a9930f9fcbbe72cd1c6b3efd8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f178a01c11a4af077926dd035a0c4c44f6b3985c to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 0e9668051e58b2ff4e48b82fa7cc17d385c7a5c9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
|
|
|
|
Fix #11618
|