Age | Commit message (Collapse) | Author |
|
|
|
|
|
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
|
|
|
|
|
|
|
|
Port 46e806cd2f14a5e45d66b4c23040855202818984 to glitch-soc
|
|
Port e02a13f64e5c2c93fa73a67a4ce32a7d1df24760 to glitch-soc
|
|
Port SCSS changes from 364f2ff9aa2b4bf601d68a12bce758aeb5530467
|
|
Port 750c67660de753065ec160b4e389ba0dda2f81cc to glitch-soc
|
|
Port missing parts from 2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 to glitch-soc
|
|
Port 5092d17f2936146fa26e5d8a9b9e391f77010f28 to glitch-soc
|
|
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
Two changes too close to each other
- app/models/media_attachment.rb
New changes too close to glitch-soc only changes.
- app/models/user.rb
Two changes too close to each other.
- app/services/remove_status_service.rb
Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
Two changes too close to each other.
- config/locales/en.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
Reverted upstream's decision of enabling posting application by default.
|
|
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
|
|
Fix #9993
Fix #5654
|
|
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
|
|
* [test] add japanese hashtag testcase
* Only URLs extract with pre-escaped text
( https://github.com/tootsuite/mastodon/issues/9989 )
|
|
IntersectionObserverArticle is made to save on RAM by avoiding fully rendering
items that are far out of view. However, it did not work for items spawned
outside the intersection observer.
|
|
Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases)
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
Fixes #909
|
|
|
|
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
|
|
|
|
view (#9973)
Thanks @wryk for noticing this issue.
|
|
|
|
|
|
* fix large line breaks
* fix ascii art posts
|
|
|
|
|
|
|
|
|
|
|
|
* Add hashtag filter to profiles
GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag
* Display featured hashtags on public profile
* Use separate model for featured tags
* Update featured hashtag counters on-write
* Limit featured tags to 10
|
|
* Add option to overwrite imported data
Fix #7465
* Add import for domain blocks
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Thanks @ariasuni.
|
|
|
|
* Allow drag and drop uploads of multiple files to compose
* Calculate aggregate upload progress for single action
* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
|
|
Some of strings should be translated.
|
|
* Make storing and displaying application used to toot opt-in
* Revert to storing application info, and display it to the author via API
|
|
* Create Redisable
* Use #redis instead of Redis.current
|
|
* Allow unicode characters in URL query strings
Fixes #8408
* Alternative approach to unicode support in urls
Adds PoC/idea to approch this problem.
|
|
* Add WebP support
* Remove the changes to the tooltip
refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
|
|
* Update manifest.json for new Web Share Target API.
* fix code formatting
|
|
Merge upstream changes
|