38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2023-04-29 18:54:13 +02:00
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2023-04-29 12:21:44 +02:00
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2023-04-29 12:17:06 +02:00
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2023-04-29 11:34:44 +02:00
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2023-04-29 11:28:24 +02:00
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2023-04-29 11:14:43 +02:00
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2023-04-29 11:12:35 +02:00
66bda4713e
[Glitch] Allow `==` when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
612a1ee697
Fix `body_classes` test for glitch-soc
2023-04-29 11:08:38 +02:00
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
2a3a110f00
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
faa336e3f7
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
8979b70975
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
1c61869eed
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
6028d047b9
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
2b0f1f365a
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +02:00
7cf963eec2
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
a5bc4ea550
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2023-04-28 07:50:31 +02:00
ece38b9318
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
8e514b1965
Unignore stuck Dependabot updates ( #24670 )
2023-04-27 12:12:56 +02:00
d9e9579832
Bump tesseract.js from 2.1.1 to 2.1.5 ( #19084 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-27 11:26:13 +02:00
1d9969fadf
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts ( #24680 )
2023-04-27 10:15:45 +02:00
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
d8a06c1375
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
d4511f2a76
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4520e6473a
2023-04-26 21:30:41 +02:00
5841f1af8c
Autofix Rubocop RSpec/MatchArray ( #24675 )
2023-04-26 21:29:36 +02:00
a3393d0d07
Autofix Rubocop RSpec/MatchArray ( #24050 )
2023-04-26 20:21:54 +02:00
91a8cd21d8
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
3029aeb838
Bump pg from 1.4.6 to 1.5.2 ( #24671 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:46:01 +02:00
185a71f281
Bump rack from 2.2.6.4 to 2.2.7 ( #24672 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:45:49 +02:00
b839babb39
Bump sass from 1.62.0 to 1.62.1 ( #24668 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:43:52 +02:00
785b0349eb
Bump lint-staged from 13.2.1 to 13.2.2 ( #24669 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:43:37 +02:00
872c4e1ef2
Bump glob from 10.0.0 to 10.2.2 ( #24632 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:36:58 +02:00
90beba57d8
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
2023-04-26 17:25:07 +02:00
c7cd891e86
Bump brakeman from 5.4.0 to 5.4.1 ( #24006 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 17:10:21 +02:00
6403d7841e
Add Dependabot ignores for stuck updates and those needing manual interventions ( #23966 )
2023-04-26 17:09:26 +02:00
93a84f4704
Add S3 region list reference to Scalingo config ( #24152 )
2023-04-26 16:46:19 +02:00
2f5608e9e5
Bump sass from 1.61.0 to 1.62.0 ( #24574 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 16:30:43 +02:00
5f624954be
Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 ( #24633 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 23:10:54 +09:00
9650a5738a
Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 ( #24638 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 22:35:24 +09:00
dcdc614bd2
Remove postcss-scss devDep ( #24223 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-26 22:33:31 +09:00
b31ee9ab38
Bump json-schema from 3.0.0 to 4.0.0 ( #24642 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:57:08 +02:00
1820b55a11
Bump postcss from 8.4.22 to 8.4.23 ( #24629 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:41:20 +02:00
0c66358601
Bump prettier from 2.8.7 to 2.8.8 ( #24631 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-26 14:41:09 +02:00
Eugen Rochko