Age | Commit message (Collapse) | Author |
|
Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc
|
|
Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
conflict because of the poll option limit being different than upstream's
|
|
|
|
Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.
|
|
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
|
|
* Fix being able to follow oneself by moving to an account that was following the old one
* Add specs
* Add spec to catch MoveWorker issue with local followers following both accounts
* Fix move worker breaking when a local account follows both source and target accounts
* Fix migration from remote to local account not sending Undo Follow
* Fix show_reblogs not being preserved for moved account's followers
|
|
Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc
|
|
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3db3c107629a96c60657a615d186e32bb8a5476a to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3cc9ff872f676d7ce56f7cf7875f85f804ea20a9 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 7488a9e1547733a750160b202942c21f27ffeff2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 8568018935adbf5f59d9bf9a64069d7fa9821b04 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5b46467474dd88e1563561bf50643324b4f021e8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `package.json`
|
|
* Inserting wicg-inert in project
* Import wicg-inert in moda_root component
* Update yarn.lock
* Solving code style problems
* Removing package-lock
|
|
run `yarn manage:translations en`
|
|
|
|
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link
But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
|
|
|
|
* Add ability to add oneself to lists
* Change search results to include oneself when searching through followers
* Mark follow relation as optional in ListAccount
|
|
|
|
* Fix remote media descriptions being cut off at 420 chars
Fixes #12258
* Fix tests
|
|
|
|
|
|
|
|
Port 3a929dbedd31ea67723746bdf387e22e66e247cd to glitch-soc
And extend that to collapse button
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 9b36f62df63003419cb2ca08e77f2fa69fed91ad to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a9530e29a2813ed8cf4c8f13fe60dd9fad245466 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port bcf694dce7536d29ede3c0865b00cb84f348b5e1 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f4be89e24d3849de4b543faa37493474e2ee8e02 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 547a5bac9d9c909b306933596bc121b63809d772 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port SCSS changes from aa884e04848a6c06dbf7c27ae7a3fcc7d379792d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fccf83e1f2ecd4e23f7b1faee5330976d17da7b8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
|
|
Port 183fc9d3cbc891be17a1c4be8b262250f9dbb545 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
|
|
|
|
|
|
|
|
* Add download button for audio player
* Add download button for video player
* fix padding for download button in Audio component
|
|
|
|
|
|
* return the new favourites_count
when unfavouriting a status
* Remove trailing whitespace
* revert changes to favourites_controller
* Decrease favourites_count through statuses reducer
* styling fix
* Fix missing trailing comma
|
|
* Add link to search for users connected from the same IP address
Fixes #11949
* Fix missing cell in admin account view table
|
|
Fixes #12156
|
|
|
|
|