about summary refs log tree commit diff
path: root/app/controllers/media_controller.rb
AgeCommit message (Collapse)Author
2023-02-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
2023-02-21Autofix Rubocop Rails/FindById (#23762)Nick Schonning
2022-12-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
2022-12-15Fix single name variables on controller folder (#20092)David Vega
Co-authored-by: petrokoriakin1 <116151189+petrokoriakin1@users.noreply.github.com> Co-authored-by: petrokoriakin1 <116151189+petrokoriakin1@users.noreply.github.com> Co-authored-by: Effy Elden <effy@effy.space>
2021-10-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.
2021-10-13Fix error when rendering public pages with media attachments (#16763)Claire
* Add tests * Fix error when rendering public pages with media attachments * Add tests * Fix tests * Please CodeClimate
2020-08-12Fix embedded playerThibaut Girka
(broken because I forgot to adapt it to glitch-soc's theming system)
2020-06-19Fix functional user requirements in whitelist mode (#14093)ThibG
Fixes #14092
2020-05-03Add more tests for ActivityPub controllers (#13585)Eugen Rochko
2019-09-28Fix redirecting non-functional accounts on public pages (#11978)Eugen Rochko
Fix #11969
2019-07-30Add whitelist mode (#11291)Eugen Rochko
2019-07-08Refactor controllers for statuses, accounts, and more (#11249)Eugen Rochko
2019-06-19Add audio uploads (#11123)Eugen Rochko
* Add audio uploads Fix #4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads. * Improve code style
2019-06-10Fix login sometimes redirecting to paths that are not pages (#11019)Eugen Rochko
Fix #11016
2018-12-18fix CSP / X-Frame-Options for media embeds (#9558)jomo
2018-02-16Save video metadata and improve video OpenGraph tags (#6481)Eugen Rochko
* Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test
2017-05-29Extract authorization policy for viewing statuses (#3150)Jack Jennings
2017-04-17Media controller specs (#2022)Matt Jankowski
* Add spec for media controller * Add MediaAttachment.attached scope * Simplify methods in media controller
2017-01-06Fix #416 - Generate random unique 14-byte (19 characters) shortcodesEugen Rochko
for local attachments, use them in URLs. Check status privacy before redirecting to actual file.
2016-12-21Fix #249 - use window.location hack to let people login from sandboxed iOS ↵Eugen Rochko
homescreen
2016-11-15Fix rubocop issues, introduce usage of frozen literal to improve performanceEugen Rochko
2016-09-22Uploading/undoing media modifies status text. Also: status text trimmed ↵Eugen Rochko
before validation
2016-09-17Adding media controller, 1 webm/compose form allowed, previews generatedEugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-06-29 14:46:00 +0000