Skip to content
This repository was archived by the owner on Dec 30, 2022. It is now read-only.
Merged

3.1.3 #275

Changes from 1 commit
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
7b63c54
Fix announcements with fully-qualified mention to local user crashing…
ClearlyClaire Feb 28, 2020
047fde1
[Security] Bump puma from 4.3.1 to 4.3.2 (#13167)
dependabot-preview[bot] Feb 29, 2020
ce17cea
Fix installation failing when Redis password contains special charact…
ClearlyClaire Feb 29, 2020
5393b18
Fix elasticsearch-api and faraday incompatibilities (#13166)
ClearlyClaire Feb 29, 2020
7d575c6
Bump puma from 4.3.2 to 4.3.3 (#13177)
ClearlyClaire Mar 1, 2020
74c2490
Bump strong_migrations from 0.5.1 to 0.6.2 (#13071)
dependabot-preview[bot] Mar 2, 2020
95155ec
Bump oj from 3.10.1 to 3.10.3 (#13187)
dependabot-preview[bot] Mar 2, 2020
66b014c
Bump json-ld-preloaded from 3.1.0 to 3.1.1 (#13143)
dependabot-preview[bot] Mar 2, 2020
131c16f
Bump @babel/core from 7.8.4 to 7.8.6 (#13185)
dependabot-preview[bot] Mar 2, 2020
3d8a6dc
Bump webpack-dev-server from 3.10.1 to 3.10.3 (#13184)
dependabot-preview[bot] Mar 2, 2020
86c932f
Bump @babel/runtime from 7.8.3 to 7.8.4 (#13183)
dependabot-preview[bot] Mar 2, 2020
036ba3f
Add tooltips to audio/video player buttons (#13203)
Gargron Mar 5, 2020
d081a80
Fix "tootctl media remove-orphans" crashing when encountering invalid…
Gargron Mar 5, 2020
39453de
Change the string "Hide everything from …" to "Block domain …" in web…
Gargron Mar 5, 2020
0ae5c63
Remove useless `respond_to` calls (#13208)
Gargron Mar 6, 2020
e69a3f5
Change GIF label to be displayed even when autoplay is enabled in web…
koyuawsmbrtn Mar 6, 2020
503eab1
Fix too large announcements not being scrollable in web UI (#13211)
ClearlyClaire Mar 6, 2020
339ce1c
Add specific rate limits for posting and following (#13172)
Gargron Mar 8, 2020
2e18b1a
Fix text area above/right of emoji picker being accidentally clickabl…
ariasuni Mar 8, 2020
4a4cd68
Add sorting by username, creation and last activity in moderation vie…
ClearlyClaire Mar 8, 2020
6185bff
Fix error when searching for URLs that contain the mention syntax (#1…
ClearlyClaire Mar 8, 2020
05d83cb
Set BUNDLE_PATH in CircleCI (#13214)
divergentdave Mar 8, 2020
4063f9f
Change description of privacy levels to be more intuitive in web UI (…
ariasuni Mar 8, 2020
2423d2f
Add ability to delete files uploaded for settings in admin UI (#13192)
ClearlyClaire Mar 8, 2020
4e52421
Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)
tateisu Mar 8, 2020
fd76955
Code style improvements in JavaScript (#13159)
berkes Mar 8, 2020
e31ba61
Add submit button to the top of preferences pages (#13068)
guigeekz Mar 8, 2020
514cd87
Update nginx.conf (#13066)
shleeable Mar 8, 2020
62c4e4c
Change wording of media display preferences to be more intuitive (#13…
ariasuni Mar 8, 2020
5e4b649
Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13…
ariasuni Mar 8, 2020
aa67036
Add support for links to statuses in announcements to be opened in we…
ClearlyClaire Mar 8, 2020
5284e29
Fix public posts from silenced accounts not being changed to unlisted…
ClearlyClaire Mar 8, 2020
764b899
Bump doorkeeper from 5.2.3 to 5.3.1 (#13144)
dependabot-preview[bot] Mar 8, 2020
9660aa4
Change local media attachments to perform heavy processing asynchrono…
Gargron Mar 8, 2020
b154428
Add federation support for the "hide network" preference (#11673)
ClearlyClaire Mar 8, 2020
7088633
Bump cld3 from 3.2.6 to 3.3.0 (#13107)
dependabot-preview[bot] Mar 8, 2020
dc15c81
Change video uploads to enforce certain limits (#13218)
Gargron Mar 9, 2020
8a2b8e0
Change video uploads to always be converted to H264/MP4 (#13220)
Gargron Mar 9, 2020
310d729
Change the string "hidden" to "blocked" in WebUI (#13221)
mayaeh Mar 9, 2020
8c3ac75
Bump file-loader from 5.0.2 to 5.1.0 (#13225)
dependabot-preview[bot] Mar 9, 2020
2c18deb
Bump wicg-inert from 3.0.0 to 3.0.2 (#13226)
dependabot-preview[bot] Mar 9, 2020
116938f
Bump cross-env from 6.0.3 to 7.0.2 (#13228)
dependabot-preview[bot] Mar 9, 2020
57d98b2
Bump eslint-plugin-react from 7.17.0 to 7.19.0 (#13224)
dependabot-preview[bot] Mar 9, 2020
abd8394
Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)
ClearlyClaire Mar 9, 2020
2c60991
Fix videos with unsupported colorspace not being transcoded (#13242)
ClearlyClaire Mar 10, 2020
90f3a00
Fix regression in “Edit media” modal in web UI (#13243)
ClearlyClaire Mar 10, 2020
51a1fba
[Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235)
shleeable Mar 10, 2020
aeebbe9
Fix detailed view of direct messages displaying a 0 boost count (#13244)
ClearlyClaire Mar 10, 2020
f556f79
Add titles to warning presets in admin UI (#13252)
Gargron Mar 12, 2020
bea0bb3
Add option to include resolved DNS records when blacklisting e-mail d…
Gargron Mar 12, 2020
cb12a2c
Fix some timeouts when searching URLs by limiting some database queri…
ClearlyClaire Mar 12, 2020
b998ec7
Fix WebUI crash in single-column mode on prehistoric browsers (#13267)
ClearlyClaire Mar 17, 2020
6dfc161
Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)
dependabot-preview[bot] Mar 18, 2020
a4387ac
Bump babel-jest from 24.9.0 to 25.1.0 (#12973)
dependabot-preview[bot] Mar 18, 2020
83f1933
Bump react-dom from 16.12.0 to 16.13.0 (#13181)
dependabot-preview[bot] Mar 18, 2020
44cdc33
Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)
dependabot-preview[bot] Mar 18, 2020
6c1e452
Bump sass from 1.25.0 to 1.26.3 (#13263)
dependabot-preview[bot] Mar 18, 2020
ce228a4
Bump mkdirp from 0.5.1 to 1.0.3 (#12979)
dependabot-preview[bot] Mar 18, 2020
e65996f
Bump redis from 2.8.0 to 3.0.2 (#13102)
dependabot-preview[bot] Mar 18, 2020
897ff63
Bump json-ld from 3.1.0 to 3.1.1 (#13230)
dependabot-preview[bot] Mar 18, 2020
1780f00
Bump simple_form from 5.0.1 to 5.0.2 (#13231)
dependabot-preview[bot] Mar 18, 2020
e2b816b
Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)
dependabot-preview[bot] Mar 18, 2020
0b33d2b
Bump webmock from 3.8.0 to 3.8.3 (#13265)
dependabot-preview[bot] Mar 18, 2020
c39ad4a
Bump capistrano from 3.11.2 to 3.12.1 (#13264)
dependabot-preview[bot] Mar 18, 2020
61f35c1
Fix reported accounts not being whitelisted when resolving a spamchec…
ClearlyClaire Mar 21, 2020
b5dace6
Decommission support for Ruby 2.4 (#13287)
shleeable Mar 21, 2020
8758221
Fix frontend crash when deleting announcements (#13283)
codesections Mar 21, 2020
8c42e0b
Make bookmarks also searchable (#13271)
tribela Mar 21, 2020
44292a6
Add link to bookmarks in web UI dropdown (#13273)
mayaeh Mar 21, 2020
221eda6
Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)
shleeable Mar 21, 2020
85ff31b
[Security] Bump omniauth from 1.9.0 to 1.9.1 (#13229)
dependabot-preview[bot] Mar 21, 2020
56531d6
Bump sidekiq from 5.2.7 to 6.0.4 (#11727)
dependabot-preview[bot] Mar 21, 2020
5a1fb6e
Fix bookmarks also searchable (#13293)
noellabo Mar 22, 2020
cd6d851
Bump sidekiq-unique-jobs from 6.0.18 to 6.0.20 (#13294)
ykzts Mar 22, 2020
beb80ad
Change poll option hover/active styling to be less confusing (#13313)
ClearlyClaire Mar 25, 2020
858d0dd
Fix frontend crash when deleting announcements (#13312)
ClearlyClaire Mar 25, 2020
f08f880
Fix media not being marked sensitive when client sets a CW but no tex…
ClearlyClaire Mar 25, 2020
eeb4aa5
Bump browser from 3.0.3 to 4.0.0 (#13307)
dependabot-preview[bot] Mar 25, 2020
0916241
Bump i18n-tasks from 0.9.30 to 0.9.31 (#13304)
dependabot-preview[bot] Mar 25, 2020
4b811ab
Bump simplecov from 0.18.2 to 0.18.5 (#13310)
dependabot-preview[bot] Mar 25, 2020
cf39f4c
Bump rspec-rails from 3.9.0 to 3.9.1 (#13305)
dependabot-preview[bot] Mar 25, 2020
3d7264a
Bump discard from 1.1.0 to 1.2.0 (#13308)
dependabot-preview[bot] Mar 25, 2020
c1a82d9
Bump aws-sdk-s3 from 1.60.1 to 1.61.1 (#13306)
dependabot-preview[bot] Mar 25, 2020
260eb6f
New Crowdin translations (#13064)
Gargron Mar 25, 2020
b3156d0
Bump babel-plugin-preval from 4.0.0 to 5.0.0 (#13297)
dependabot-preview[bot] Mar 26, 2020
284f51e
Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.…
dependabot-preview[bot] Mar 26, 2020
29981c4
Bump @babel/core from 7.8.6 to 7.9.0 (#13303)
dependabot-preview[bot] Mar 26, 2020
e187537
Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 (#13300)
dependabot-preview[bot] Mar 26, 2020
0c8945e
Change `tootctl media remove-orphans` to work for all classes (#13316)
Gargron Mar 26, 2020
5020c04
Bump react-select from 3.0.8 to 3.1.0 (#13296)
dependabot-preview[bot] Mar 26, 2020
cb5ad2b
Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 (#13301)
dependabot-preview[bot] Mar 26, 2020
d88480d
Bump webpack from 4.41.5 to 4.42.1 (#13319)
dependabot-preview[bot] Mar 26, 2020
6c79b72
Fix Paperclip using deprecated URI.escape function (#13320)
ClearlyClaire Mar 26, 2020
bf1919e
Bump brakeman from 4.7.2 to 4.8.0 (#13309)
dependabot-preview[bot] Mar 27, 2020
7ddbbde
Fix OCR not working on Safari because of unsupported worker-src CSP (…
ClearlyClaire Mar 27, 2020
0d117c1
Fix 404 and 410 API errors being silently discarded in WebUI (#13279)
ClearlyClaire Mar 28, 2020
1116936
Fix incorrect deletion of local accounts imported by overwriting (#13…
noellabo Mar 30, 2020
be2f159
Fix wrong color for ellipsis in boost confirmation dialog in Web UI (…
ariasuni Mar 31, 2020
b43731c
Bump pg from 1.2.2 to 1.2.3 (#13344)
dependabot-preview[bot] Mar 31, 2020
cc271e9
Bump oj from 3.10.3 to 3.10.5 (#13345)
dependabot-preview[bot] Mar 31, 2020
a2934af
Bump iso-639 from 0.2.8 to 0.3.5 (#13343)
dependabot-preview[bot] Mar 31, 2020
1bcf466
Bump ox from 2.12.1 to 2.13.2 (#13342)
dependabot-preview[bot] Mar 31, 2020
a37ff2b
Bump better_errors from 2.5.1 to 2.6.0 (#13340)
dependabot-preview[bot] Mar 31, 2020
e4617c8
Fix ImportsController param to permit :mode (#13347)
noellabo Mar 31, 2020
caabc0e
Bump parallel_tests from 2.30.1 to 2.32.0 (#13341)
dependabot-preview[bot] Mar 31, 2020
31bd625
Bump uuid from 3.4.0 to 7.0.2 (#13295)
dependabot-preview[bot] Mar 31, 2020
cf1fa73
Fix content warning being unnecessarily cleared when enabling/disabli…
ClearlyClaire Mar 31, 2020
bff1bd5
Bump concurrent-ruby from 1.1.5 to 1.1.6 (#13346)
dependabot-preview[bot] Mar 31, 2020
c54f264
Bump react from 16.12.0 to 16.13.1 (#13337)
dependabot-preview[bot] Mar 31, 2020
2db449e
Bump stringz from 2.0.0 to 2.1.0 (#13331)
dependabot-preview[bot] Mar 31, 2020
9523aa8
Bump babel-jest from 25.1.0 to 25.2.4 (#13332)
dependabot-preview[bot] Mar 31, 2020
0d6ac92
Bump @babel/preset-env from 7.8.3 to 7.9.0 (#13336)
dependabot-preview[bot] Mar 31, 2020
dd084c3
Bump yargs from 15.1.0 to 15.3.1 (#13334)
dependabot-preview[bot] Mar 31, 2020
141e5c2
Bump babel-loader from 8.0.6 to 8.1.0 (#13333)
dependabot-preview[bot] Mar 31, 2020
361c447
Bump @babel/preset-react from 7.8.3 to 7.9.4 (#13335)
dependabot-preview[bot] Mar 31, 2020
dd23fc6
Bump autoprefixer from 9.7.4 to 9.7.5 (#13338)
dependabot-preview[bot] Mar 31, 2020
9241cbf
Fix re-sending of e-mail confirmation not being rate limited (#13360)
Gargron Mar 31, 2020
1fb9203
Improve toot clicking areas (#13327)
ariasuni Mar 31, 2020
9014367
Fix background jobs not using locks like they are supposed to (#13361)
Gargron Mar 31, 2020
662b587
Bump sidekiq-unique-jobs from 6.0.20 to 6.0.21 (#13367)
dependabot-preview[bot] Apr 1, 2020
66e82e9
Bump faker from 2.10.1 to 2.11.0 (#13363)
dependabot-preview[bot] Apr 1, 2020
77772ba
Bump tty-prompt from 0.20.0 to 0.21.0 (#13366)
dependabot-preview[bot] Apr 1, 2020
12f6d41
Bump bootsnap from 1.4.5 to 1.4.6 (#13369)
dependabot-preview[bot] Apr 1, 2020
64980ed
Bump json-ld-preloaded from 3.1.1 to 3.1.2 (#13365)
dependabot-preview[bot] Apr 1, 2020
47ab0bd
Bump json-ld from 3.1.1 to 3.1.2 (#13368)
dependabot-preview[bot] Apr 1, 2020
4bf5aea
Fix pinning a column in web UI sometimes redirecting out of web UI (#…
Gargron Apr 2, 2020
c3965e2
Fix returning results when searching for URL with non-zero offset (#1…
Gargron Apr 2, 2020
a9a063c
Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#1…
Gargron Apr 2, 2020
37b3985
Improve polls: option lengths & redesign (#13257)
brawaru Apr 2, 2020
69558d2
Bump rspec-rails from 3.9.1 to 4.0.0 (#13364)
dependabot-preview[bot] Apr 2, 2020
f65568f
Add ability to filter audit log in admin UI (#13381)
Gargron Apr 3, 2020
51f2315
Update Vagrant box to Bionic (#13384)
mfmfuyu Apr 4, 2020
ae7e3f0
Update config.yml (#13379)
shleeable Apr 4, 2020
d3ff06a
Add explanation as to why unlocked accounts may have follow requests …
ClearlyClaire Apr 4, 2020
5c2e63a
Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 (#…
Gargron Apr 4, 2020
a889756
Bump version to 3.1.3 (#13389)
Gargron Apr 5, 2020
89e28c7
Fix PostgreSQL load when linking in announcements (#13250)
ClearlyClaire Apr 5, 2020
e4a1ebf
[Security] Update Dockerfile for Ruby 2.6.6 (#13393)
shleeable Apr 5, 2020
e96146e
Update .ruby-version (#13395)
shleeable Apr 5, 2020
eea0cd8
Fix “Show more” not switching to “Show less” on public pages (#13174)
ClearlyClaire Apr 5, 2020
c9efb40
Add rate limit for reporting (#13390)
Gargron Apr 5, 2020
510db5e
New Crowdin translations (#13317)
Gargron Apr 5, 2020
85f0e0a
Update CHANGELOG.md (#13397)
Gargron Apr 5, 2020
bb4884f
Merge branch 'features/mild-master' into 3.1.3
YoheiZuho Apr 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change wording of media display preferences to be more intuitive (mas…
  • Loading branch information
ariasuni authored Mar 8, 2020
commit 62c4e4cc223b7a2aecc5383e0b23791447090067
4 changes: 2 additions & 2 deletions config/locales/simple_form.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ en:
setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts)
setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
setting_display_media_show_all: Always show media marked as sensitive
setting_display_media_hide_all: Always hide media
setting_display_media_show_all: Always show media
setting_hide_network: Who you follow and who follows you will not be shown on your profile
setting_noindex: Affects your public profile and status pages
setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
Expand Down