Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bagel o themes #9

Merged
merged 60 commits into from
Apr 29, 2024
Merged

Bagel o themes #9

merged 60 commits into from
Apr 29, 2024

Conversation

DismalShadowX
Copy link
Owner

Merge into Alpha branch

DismalShadowX and others added 30 commits April 22, 2024 21:29
@DismalShadowX
Tangerine UI
bee21c1 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update themes.yml
c562340 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update localized string name
30e3bff 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update themes.yml
efadf34 
Rolle's BirdUI theme

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Create mastodon-bird-ui-dark.scss
6e94a18 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Create mastodon-bird-ui-light.scss
80244c5 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Create mastodon-bird-ui-contrast
59a3693 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Create mastodon-bird-ui-accessible
04a4434 
Support for accessibility

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update en.yml
b844013 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Rename mastodon-bird-ui-contrast to mastodon-bird-ui-contrast.scss
4538343 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Rename mastodon-bird-ui-accessible to mastodon-bird-ui-accessible.scss
dcc90e8 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Add files via upload
e10d61d 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update themes.yml
61177b8 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update themes.yml
d8614d2 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update en.yml
b5598f7 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
02440aa 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
3577c2d 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-multiple-columns.scss
dfb2a05 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-multiple-columns.scss
f71b3be 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-multiple-columns.scss
a90a4d7 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
4adc394 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
66205e5 
Compose-form is not taking effects without `!important`

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-multiple-columns.scss
6e35916 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Merge branch 'Alpha' into Bagel-O-Themes
50f952f 
Signed-off-by: Nathan Sparrow <[email protected]>
@mjankowski
Change default ruby version to 3.3.1 (mastodon#28013)
7201f99
@davbeck
Remove home marker updates (mastodon#22721)
4f4b779
@renchap
Convert easy entrypoints files to Typescript (mastodon#30102)
3690906
@renovate
Update dependency haml_lint to v0.58.0 (mastodon#30094)
d8a4cea 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rubocop to v1.63.4 (mastodon#30096)
31f3dd5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update devDependencies (non-major) (mastodon#30109)
c0584a6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 27 commits April 29, 2024 08:10
@renovate
Update peter-evans/create-pull-request action to v6.0.5 (mastodon#30112)
00aec2f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#30092)
9be7efe 
Co-authored-by: GitHub Actions <[email protected]>
@renchap
Convert entrypoints/sign_up to Typescript (mastodon#30106)
4527e01
@mjankowski
Use EXPIRATION_DURATIONS constant in CustomFilter class (mastodon…
f0c9cba 
…#30088)
@mjankowski
Move Account limits to constants (mastodon#30087)
2123281
@renovate
Update dependency aws-sdk-s3 to v1.148.0 (mastodon#30076)
6931cf5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove unused Account.popular scope (mastodon#30068)
bbf1b60
@mjankowski
Use shorter render call in admin/webhooks view (mastodon#30071)
2739d8d
@renchap
Remove usage of deprecated defaultTypes on React functional compone…
b9b4db4 
…nts (mastodon#30099)
@mjankowski
Use shared form partial for admin/warning_presets views (mastodon#3…
a9816f0 
…0069)
@mjankowski
Use shared form partial for admin/rules views (mastodon#30067)
e336466
@ClearlyClaire
Prevent accidental serialization of Account and User records (mas…
95e9de5 
…todon#30079)
@mjankowski
Use composable query in Status.without_replies scope (mastodon#30086)
ac7f4d5
@ClearlyClaire
Add loading indicator and empty result message to advanced interface …
7d3fe2b 
…search (mastodon#30085)
@mjankowski
Disable Style/SignalException cop (mastodon#30064)
f1a4b4e
@mjankowski
Remove unused memoization in CustomFilter#expires_in method (mastod…
924af40 
…on#30117)
@renovate
Update dependency ws to v8.17.0 (mastodon#30097)
f5d6362 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@DismalShadowX
Added peach theme by nileane
4d12854 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Delete app/javascript/styles/mastodon-bird-ui/layout-multiple-columns…
e8c3bce 
….css

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Delete app/javascript/styles/mastodon-bird-ui/layout-single-column.css
01f05d9 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
36a4a62 
Restored attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-multiple-columns.scss
1b2eaa4 
Restore attribution to the original author and indicating the version of my modified work.

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update layout-single-column.scss
b2bf3c6 
Fixed incorrect branch tag from ronilaukkarinen

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update themes.yml
7e7e018 
Added support for peach theme

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Update en.yml
6d4766d 
Added support for peach theme

Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Added support for peach theme
041de35 
Signed-off-by: Nathan Sparrow <[email protected]>
@DismalShadowX
Merge branch 'mastodon:main' into Bagel-O-Themes
b317a49
@DismalShadowX DismalShadowX self-assigned this Apr 29, 2024
@DismalShadowX DismalShadowX merged commit 8b6ebf7 into Alpha Apr 29, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@DismalShadowX DismalShadowX

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DismalShadowX @mjankowski @davbeck @renchap @ClearlyClaire