c790ecb14d
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
5 years ago
764b89939f
Bump doorkeeper from 5.2.3 to 5.3.1 ( #13144 )
...
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>
5 years ago
5284e29e2f
Fix public posts from silenced accounts not being changed to unlisted visibility ( #13096 )
5 years ago
aa67036b41
Add support for links to statuses in announcements to be opened in web UI ( #13212 )
...
* Add support for links to public statuses in announcements to be opened in WebUI
* Please CodeClimate
5 years ago
5e4b649655
Change the tooltip "Toggle visibility" to "Hide media" in web UI ( #13199 )
5 years ago
62c4e4cc22
Change wording of media display preferences to be more intuitive ( #13198 )
5 years ago
514cd874a7
Update nginx.conf ( #13066 )
5 years ago
e31ba618d4
Add submit button to the top of preferences pages ( #13068 )
...
* Move submit button to the top of the edit page
* Duplicate save button on long form
* Fix click submit on profile spec
5 years ago
fd76955f39
Code style improvements in JavaScript ( #13159 )
...
* JS-linter: fix trailing comma's
* Configure eslinter to ignore this onchange error.
5 years ago
4e524218d3
Add `--skip-media-remove` option to `tootctl statuses remove` ( #13080 )
...
* 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>
5 years ago
2423d2f677
Add ability to delete files uploaded for settings in admin UI ( #13192 )
...
* Allow deleting site uploads
* Refactor and move links into hints
* Fix i18n tests
* Fix HTML output of site_upload_delete_hint
5 years ago
4063f9f278
Change description of privacy levels to be more intuitive in web UI ( #13197 )
...
* 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>
5 years ago
05d83cb07d
Set BUNDLE_PATH in CircleCI ( #13214 )
5 years ago
6185bff4b3
Fix error when searching for URLs that contain the mention syntax ( #13151 )
...
Fixes #13150
5 years ago
4a4cd686c1
Add sorting by username, creation and last activity in moderation view ( #13076 )
...
* Add ability to order accounts in moderation view
* Display last status date in “Most recent activity” for remote users
5 years ago
2e18b1a2a2
Fix text area above/right of emoji picker being accidentally clickable in web UI ( #13148 )
5 years ago
339ce1c4e9
Add specific rate limits for posting and following ( #13172 )
5 years ago
503eab1c1f
Fix too large announcements not being scrollable in web UI ( #13211 )
5 years ago
e69a3f54a1
Change GIF label to be displayed even when autoplay is enabled in web UI ( #13209 )
5 years ago
0ae5c6312f
Remove useless `respond_to` calls ( #13208 )
5 years ago
39453de232
Change the string "Hide everything from …" to "Block domain …" in web UI ( #13178 )
...
Blocking a domain is closer to blocking all its users than to a mute
action.
5 years ago
d081a80cff
Fix "tootctl media remove-orphans" crashing when encountering invalid media ( #13170 )
...
Fixes #13168
5 years ago
036ba3f510
Add tooltips to audio/video player buttons ( #13203 )
5 years ago
86c932f79c
Bump @babel/runtime from 7.8.3 to 7.8.4 ( #13183 )
...
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>
5 years ago
3d8a6dc043
Bump webpack-dev-server from 3.10.1 to 3.10.3 ( #13184 )
...
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>
5 years ago
131c16f0bc
Bump @babel/core from 7.8.4 to 7.8.6 ( #13185 )
...
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>
5 years ago
66b014ca50
Bump json-ld-preloaded from 3.1.0 to 3.1.1 ( #13143 )
...
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>
5 years ago
95155ecbe7
Bump oj from 3.10.1 to 3.10.3 ( #13187 )
...
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>
5 years ago
74c2490cdd
Bump strong_migrations from 0.5.1 to 0.6.2 ( #13071 )
...
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>
5 years ago
7d575c669e
Bump puma from 4.3.2 to 4.3.3 ( #13177 )
...
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
5 years ago
13ef4d5fb0
Update puma from 4.3.2 to 4.3.3
...
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
5 years ago
553a16c6f8
Update JS dependencies
5 years ago
b0a7cb71be
Update glitch-soc-specific dependencies
...
- drop html2text which has been unused in a while
- update redcarpet
5 years ago
907ebcfd43
Merge pull request #1291 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
427ef4948a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
5393b187c4
Fix elasticsearch-api and faraday incompatibilities ( #13166 )
5 years ago
ce17cea221
Fix installation failing when Redis password contains special characters ( #13156 )
...
* Add support for special characters in Redis passwords
Fixes #13154
* Refactor
5 years ago
047fde18c3
[Security] Bump puma from 4.3.1 to 4.3.2 ( #13167 )
...
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>
5 years ago
7b63c5469e
Fix announcements with fully-qualified mention to local user crashing WebUI ( #13164 )
5 years ago
e1d29f7d9f
Merge pull request #1290 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
51d326f852
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
aa8568b7f2
Bump version to 3.1.2 ( #13162 )
5 years ago
0c28a505dd
Fix leak of arbitrary statuses through unfavourite action in REST API ( #13161 )
5 years ago
9ee8e1add9
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
2f2b48b227
[Glitch] Fix `/web` redirecting to `/web/web` in web UI
...
Port 0f07218e53
5 years ago
85933bc9ff
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
7face973fa
Fix dismissing an announcement twice raising an obscure error ( #13124 )
5 years ago
cf4fe6caef
Fix misleading error when attempting to re-send a pending follow request ( #13133 )
...
Fixes #13131
5 years ago
d91946ae13
Fix backups failing when files are missing from media attachments ( #13146 )
...
Fixes #13123
5 years ago
3704402dcc
Fix duplicate accounts being created when fetching an account for its key only ( #13147 )
...
Fixes #13136
When a user's canonical acct domain is different from its id's domain
(WEB_DOMAIN ≠ LOCAL_DOMAIN), two webfinger queries are required to find the
canonical domain from the URI. However, we skip webfinger queries when
updating only the key of a remote user, which led to the creation of a
duplicate account, using the URI's domain instead of the canonical acct: one.
5 years ago
Thibaut Girka