about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-11-13Only display 1 trending tagReverite
2019-11-13Merge branch 'glitch' into productionReverite
2019-11-07[Glitch] Minor improvements to poll composing UIThibaut Girka
Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc
2019-11-07[Glitch] Fix WebUI allowing to upload more items than the limitThibG
Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's
2019-11-07Fix relationship caches being broken as result of a follow request (#12299)ThibG
2019-11-07Fix WebUI allowing to upload more items than the limit (#12300)ThibG
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.
2019-11-07Minor improvements to poll composing UI (#12319)ThibG
- Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width
2019-11-07Fix various issues with account migration (#12301)ThibG
* 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
2019-11-06[Glitch] Fix notification message for own pollThibaut Girka
Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc
2019-11-06[Glitch] fix: support KaiOS arrow navigation on public pagesNolan Lawson
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Fix filtered out items being counted as pending itemsThibG
Port 3db3c107629a96c60657a615d186e32bb8a5476a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Use inert polyfillGabriel Rubens
Port 3cc9ff872f676d7ce56f7cf7875f85f804ea20a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Add support for submitting media description with ctrl+enterThibG
Port 7488a9e1547733a750160b202942c21f27ffeff2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] dont crash with null-refHinaloe
Port 8568018935adbf5f59d9bf9a64069d7fa9821b04 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Fix an issue where polls with 'expires_at' not set expiredTakeshi Umeda
Port 5b46467474dd88e1563561bf50643324b4f021e8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-11-04Use inert polyfill (#12209)Gabriel Rubens
* Inserting wicg-inert in project * Import wicg-inert in moda_root component * Update yarn.lock * Solving code style problems * Removing package-lock
2019-11-04Integrate own poll's translation into own_poll. (#12231)mayaeh
run `yarn manage:translations en`
2019-11-04fix: support KaiOS arrow navigation on public pages (#12251)Nolan Lawson
2019-11-04Fix code referencing wrong class (#12263)ThibG
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.
2019-11-04Fix filtered out items being counted as pending items (#12266)ThibG
2019-11-04Add abilityto add oneself to lists (#12271)ThibG
* Add ability to add oneself to lists * Change search results to include oneself when searching through followers * Mark follow relation as optional in ListAccount
2019-11-04Fix notification filters not applying to poll options (#12269)ThibG
2019-11-04Fix remote media descriptions being cut off at 420 chars (#12262)ThibG
* Fix remote media descriptions being cut off at 420 chars Fixes #12258 * Fix tests
2019-11-04Add support for submitting media description with ctrl+enter (#12272)ThibG
2019-11-04dont crash with null-ref (#12274)Hinaloe
2019-10-28Merge branch 'glitch' into productionReverite
2019-10-28Fix download button icon colorThibaut Girka
2019-10-27[Glitch] Replace fav icon animation with CSSThibG
Port 3a929dbedd31ea67723746bdf387e22e66e247cd to glitch-soc And extend that to collapse button Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Add download button to audio and video playersNima Boscarino
Port 9b36f62df63003419cb2ca08e77f2fa69fed91ad to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Unliking a post updates like count on front endNima Boscarino
Port a9530e29a2813ed8cf4c8f13fe60dd9fad245466 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Fix volume slider in chromium 🤷ThibG
Port bcf694dce7536d29ede3c0865b00cb84f348b5e1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Improve swipe experienceumonaca
Port f4be89e24d3849de4b543faa37493474e2ee8e02 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] don't show outline of full-screen videoHinaloe
Port 547a5bac9d9c909b306933596bc121b63809d772 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Fix batch actions being hidden from mobile viewThibG
Port SCSS changes from aa884e04848a6c06dbf7c27ae7a3fcc7d379792d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27[Glitch] Add noopener and/or noreferrerBSKY
Port fccf83e1f2ecd4e23f7b1faee5330976d17da7b8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27Fix notification message for own poll (#12219)Yamagishi Kazutoshi
2019-10-27Fix an issue where polls with 'expires_at' not set expired (#12222)Takeshi Umeda
2019-10-27Change message of public timeline for local only (#12224)Yamagishi Kazutoshi
2019-10-27[Glitch] Bump react-select from 2.4.4 to 3.0.5dependabot-preview[bot]
Port 183fc9d3cbc891be17a1c4be8b262250f9dbb545 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-10-26Fix media components being croppedThibaut Girka
2019-10-26Hide overflowing characters from reply indicator tooThibaut Girka
2019-10-26Avoid toot text bleeding out of the content divThibaut Girka
2019-10-25Add download button to audio and video players (#12179)Nima Boscarino
* Add download button for audio player * Add download button for video player * fix padding for download button in Audio component
2019-10-24Add setting for whether to crop images in unexpanded toots (#12126)Faye Duxovni
2019-10-24Split AccountsHelper from StatusesHelper (#12078)Takeshi Umeda
2019-10-24Unliking a post updates like count on front end (#12140)Nima Boscarino
* 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
2019-10-24Add link to search for users connected from the same IP address (#12157)ThibG
* Add link to search for users connected from the same IP address Fixes #11949 * Fix missing cell in admin account view table