about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-03-08[Glitch] Change GIF label to be displayed even when autoplay is enabled in ↵koyu
web UI Port e69a3f54a10e58d32d7e46c494d98be948dde4b3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Change the string "Hide everything from …" to "Block domain …" ↵ThibG
in web UI Port 39453de232e068f58a711b2c052fe74fdd0c40b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08[Glitch] Add tooltips to audio/video player buttonsMélanie Chauvel (ariasuni)
Port 036ba3f51065a96cb9203a9ac5aa71d7d6edeebe to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
2020-03-08Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)dependabot-preview[bot]
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.2.3 to 5.3.1. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.2.3...v.5.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-03-08Fix public posts from silenced accounts not being changed to unlisted ↵ThibG
visibility (#13096)
2020-03-08Add support for links to statuses in announcements to be opened in web UI ↵ThibG
(#13212) * Add support for links to public statuses in announcements to be opened in WebUI * Please CodeClimate
2020-03-08Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)Mélanie Chauvel (ariasuni)
2020-03-08Change wording of media display preferences to be more intuitive (#13198)Mélanie Chauvel (ariasuni)
2020-03-08Update nginx.conf (#13066)Shlee
2020-03-08Add submit button to the top of preferences pages (#13068)guigeekz
* Move submit button to the top of the edit page * Duplicate save button on long form * Fix click submit on profile spec
2020-03-08Code style improvements in JavaScript (#13159)Bèr Kessels
* JS-linter: fix trailing comma's * Configure eslinter to ignore this onchange error.
2020-03-08Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)tateisu
* Add skip_media_remove option to tootctl statuses remove * Add skip_media_remove option to tootctl statuses remove Co-authored-by: tateisu <tateisu@juggler.jp>
2020-03-08Add ability to delete files uploaded for settings in admin UI (#13192)ThibG
* Allow deleting site uploads * Refactor and move links into hints * Fix i18n tests * Fix HTML output of site_upload_delete_hint
2020-03-08Change description of privacy levels to be more intuitive in web UI (#13197)Mélanie Chauvel (ariasuni)
* Improve description of privacy levels in compose interface * Change strings in defaultMessage and source as well as english Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-03-08Set BUNDLE_PATH in CircleCI (#13214)David Cook
2020-03-08Fix error when searching for URLs that contain the mention syntax (#13151)ThibG
Fixes #13150
2020-03-08Add sorting by username, creation and last activity in moderation view (#13076)ThibG
* Add ability to order accounts in moderation view * Display last status date in “Most recent activity” for remote users
2020-03-08Fix text area above/right of emoji picker being accidentally clickable in ↵Mélanie Chauvel (ariasuni)
web UI (#13148)
2020-03-08Add specific rate limits for posting and following (#13172)Eugen Rochko
2020-03-06Fix too large announcements not being scrollable in web UI (#13211)ThibG
2020-03-06Change GIF label to be displayed even when autoplay is enabled in web UI ↵koyu
(#13209)
2020-03-06Remove useless `respond_to` calls (#13208)Eugen Rochko
2020-03-05Change the string "Hide everything from …" to "Block domain …" in web UI ↵Eugen Rochko
(#13178) Blocking a domain is closer to blocking all its users than to a mute action.
2020-03-05Fix "tootctl media remove-orphans" crashing when encountering invalid media ↵Eugen Rochko
(#13170) Fixes #13168
2020-03-05Add tooltips to audio/video player buttons (#13203)Eugen Rochko
2020-03-02Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)dependabot-preview[bot]
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.8.3 to 7.8.4. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)dependabot-preview[bot]
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.10.1 to 3.10.3. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02Bump @babel/core from 7.8.4 to 7.8.6 (#13185)dependabot-preview[bot]
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.4 to 7.8.6. - [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.8.4...v7.8.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)dependabot-preview[bot]
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.0...3.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02Bump oj from 3.10.1 to 3.10.3 (#13187)dependabot-preview[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.3. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)dependabot-preview[bot]
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.5.1 to 0.6.2. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.5.1...v0.6.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-01Bump puma from 4.3.2 to 4.3.3 (#13177)ThibG
This fixes cookies and devise authentication being broken as a result of upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
2020-03-01Update puma from 4.3.2 to 4.3.3Thibaut Girka
Fixes #1294 This fixes cookies and devise authentication being broken as a result of upgrading to puma 4.3.2, see https://github.com/puma/puma/issues/2132
2020-02-29Update JS dependenciesThibaut Girka
2020-02-29Update glitch-soc-specific dependenciesThibaut Girka
- drop html2text which has been unused in a while - update redcarpet
2020-02-29Merge pull request #1291 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-02-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-29Fix elasticsearch-api and faraday incompatibilities (#13166)ThibG
2020-02-29Fix installation failing when Redis password contains special characters ↵ThibG
(#13156) * Add support for special characters in Redis passwords Fixes #13154 * Refactor
2020-02-29[Security] Bump puma from 4.3.1 to 4.3.2 (#13167)dependabot-preview[bot]
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2. **This update includes a security fix.** - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-28Fix announcements with fully-qualified mention to local user crashing WebUI ↵ThibG
(#13164)
2020-02-27Merge pull request #1290 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-02-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-27Bump version to 3.1.2 (#13162)Eugen Rochko
2020-02-27Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)Eugen Rochko
2020-02-25Merge pull request #1289 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-02-25[Glitch] Fix `/web` redirecting to `/web/web` in web UIThibG
Port 0f07218e53bf581127cdcf5fbf12d9c207ace8d7 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-24Fix dismissing an announcement twice raising an obscure error (#13124)ThibG