Commit graph

39710 commits

Author SHA1 Message Date
Christian Schmidt
2a4f2216d6
Add lang attribute to image description textarea and poll option field (#23293) 2023-01-29 19:00:19 +01:00
Eugen Rochko
3110aee7d2 Fix unserialized role on account entities in admin API (#23290) 2023-01-29 15:59:58 +01:00
Eugen Rochko
d3f3810fe1
Fix unserialized role on account entities in admin API (#23290) 2023-01-29 15:59:58 +01:00
Claire
b5d60a90a3 New translations en.json (German) (#2097)
[ci skip]
2023-01-28 10:20:55 +01:00
Claire
ec26f7c1b1
New translations en.json (German) (#2097)
[ci skip]
2023-01-28 10:20:55 +01:00
dependabot[bot]
5b170f4e98 Bump sanitize from 6.0.0 to 6.0.1 (#23281)
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-28 18:12:57 +09:00
dependabot[bot]
1708167dd3
Bump sanitize from 6.0.0 to 6.0.1 (#23281)
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-28 18:12:57 +09:00
Claire
c14c4be592 Add role badges to WebUI (#2096)
* [Glitch] Add role badges to WebUI

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Ensure role name remains readable

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-26 23:35:23 +01:00
Claire
d9a078e6d3
Add role badges to WebUI (#2096)
* [Glitch] Add role badges to WebUI

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Ensure role name remains readable

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-26 23:35:23 +01:00
Claire
39b5421ab4 Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-01-26 20:16:31 +01:00
Claire
cfa92c4ec0
Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-01-26 20:16:31 +01:00
neatchee
c5af6caf05 Allow users to set the trigger height for lengthy toot auto-collapse (#2070)
* Allow users to set the trigger height for lengthy toot autocollapse

Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered

Originally authored by Dean Bassett (github.com/deanveloper)

Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18

* Remove bad escape characters

* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity

* Update comments re: lengthy toot height

* Fix inconsistent indentation

* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
neatchee
20abef6590
Allow users to set the trigger height for lengthy toot auto-collapse (#2070)
* Allow users to set the trigger height for lengthy toot autocollapse

Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered

Originally authored by Dean Bassett (github.com/deanveloper)

Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18

* Remove bad escape characters

* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity

* Update comments re: lengthy toot height

* Fix inconsistent indentation

* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
Claire
613ca54418 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-26 19:31:39 +01:00
Claire
fad6633156 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-26 19:31:39 +01:00
Claire
fc8554435b Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-01-25 21:58:31 +01:00
Claire
7acf26e777
Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-01-25 21:58:31 +01:00
Claire
9e5f274ba9 Add roles attribute to Account entities in REST API (#23255) 2023-01-25 19:55:40 +01:00
Claire
13a2abacc8
Add roles attribute to Account entities in REST API (#23255) 2023-01-25 19:55:40 +01:00
Claire
80e6f2c99e [Glitch] Fix styling of featured tags in light theme
Port 9ff964c90c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-25 17:27:23 +01:00
Claire
2093436349 [Glitch] Fix styling of featured tags in light theme
Port e5ae75bf6a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-25 17:27:23 +01:00
Claire
64d688a022 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-25 17:26:38 +01:00
Claire
0f4637981b Merge branch 'main' into glitch-soc/merge-upstream 2023-01-25 17:26:38 +01:00
Claire
9ff964c90c Fix styling of featured tags in light theme (#23252)
* Fix styling of featured tags in light theme

Fixes #23251

* Remove broken highlighting on /settings/featured_tags
2023-01-25 16:28:29 +01:00
Claire
e5ae75bf6a
Fix styling of featured tags in light theme (#23252)
* Fix styling of featured tags in light theme

Fixes #23251

* Remove broken highlighting on /settings/featured_tags
2023-01-25 16:28:29 +01:00
Claire
b26ab9916d Bump version to 4.1.0rc2 (#23220) 2023-01-25 16:20:54 +01:00
Claire
2f112432e6
Bump version to 4.1.0rc2 (#23220) 2023-01-25 16:20:54 +01:00
Claire
dc463f0c36 [Glitch] Fix missing filtering on some notification types
Port 07ee9f2ed5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:43:19 +01:00
Claire
ffea668076 [Glitch] Fix missing filtering on some notification types
Port 98779535fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:43:19 +01:00
Claire
4b9c5fffde [Glitch] Add lang attribute to compose textarea and CW field
Port 6feec4fd18 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:40:48 +01:00
Claire
853d0f28c5 [Glitch] Add lang attribute to compose textarea and CW field
Port 83a8efa9ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:40:48 +01:00
Mina Her
370511dd06 [Glitch] Make <Audio> to handle volume change
Port 453b6eb2bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:37:37 +01:00
Mina Her
78b822c61d [Glitch] Make <Audio> to handle volume change
Port 3cf60ba267 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:37:37 +01:00
Claire
1fa797be40 [Glitch] Fix upload area display in single-column mode
Port f08b565fd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:36:59 +01:00
Claire
cf3ad10e75 [Glitch] Fix upload area display in single-column mode
Port 54e798a5a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-24 20:36:59 +01:00
Claire
8134672631 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
Claire
3074338d79 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
Claire
1c279cca28 Fix email with empty domain name labels passing validation (#23246)
* Fix email with empty domain name labels passing validation

`EmailMxValidator` would allow empty labels because `Resolv::DNS` is
particularly lenient about them, but the email would be invalid and
unusable.

* Add tests
2023-01-24 20:18:41 +01:00
Claire
a5a00d7f7a
Fix email with empty domain name labels passing validation (#23246)
* Fix email with empty domain name labels passing validation

`EmailMxValidator` would allow empty labels because `Resolv::DNS` is
particularly lenient about them, but the email would be invalid and
unusable.

* Add tests
2023-01-24 20:18:41 +01:00
Claire
74aa00bc56 Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail (#23247)
Fixes #23093
2023-01-24 20:18:25 +01:00
Claire
dd58db64d8
Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail (#23247)
Fixes #23093
2023-01-24 20:18:25 +01:00
Claire
d28bbdfd48 Fix account activation being triggered before email confirmation (#23245)
* Add tests

* Fix account activation being triggered before email confirmation

Fixes #23098
2023-01-24 19:40:21 +01:00
Claire
6883fddb19
Fix account activation being triggered before email confirmation (#23245)
* Add tests

* Fix account activation being triggered before email confirmation

Fixes #23098
2023-01-24 19:40:21 +01:00
Claire
cefc065310 Fix moderation audit log items for warnings having incorrect links (#23242) 2023-01-24 18:50:13 +01:00
Claire
4725191d3c
Fix moderation audit log items for warnings having incorrect links (#23242) 2023-01-24 18:50:13 +01:00
Claire
6feec4fd18 Add lang attribute to compose textarea and CW field (#23240)
Fixes #19858
2023-01-24 18:49:21 +01:00
Claire
83a8efa9ca
Add lang attribute to compose textarea and CW field (#23240)
Fixes #19858
2023-01-24 18:49:21 +01:00
dependabot[bot]
db49abc2a1 Bump @babel/runtime from 7.20.7 to 7.20.13 (#23226)
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.20.7 to 7.20.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.13/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-24 17:52:06 +01:00
dependabot[bot]
dcdf081c6f
Bump @babel/runtime from 7.20.7 to 7.20.13 (#23226)
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.20.7 to 7.20.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.13/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-24 17:52:06 +01:00
Mina Her
453b6eb2bd Make <Audio> to handle volume change (#23187) 2023-01-24 16:24:46 +01:00