Jeremy Kescher
|
c9f7e9454c
|
Merge branch 'upstream-main' into develop
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
|
2024-11-08 14:46:42 +01:00 |
|
Jeremy Kescher
|
7fa9c34dee
|
Merge branch 'upstream-main' into develop
|
2024-11-01 17:13:04 +01:00 |
|
github-actions[bot]
|
0426cb78f7
|
New Crowdin Translations (automated) (#32589)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-28 13:23:13 +00:00 |
|
github-actions[bot]
|
8eae0d067d
|
New Crowdin Translations (automated) (#32573)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-18 07:56:43 +00:00 |
|
github-actions[bot]
|
7d89cea0ea
|
New Crowdin Translations (automated) (#32339)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-15 09:26:28 +00:00 |
|
Jeremy Kescher
|
d364a1b0a7
|
Merge branch 'upstream-main' into develop
|
2024-10-11 00:53:18 +02:00 |
|
Jeremy Kescher
|
9090719153
|
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
|
2024-10-10 22:57:13 +02:00 |
|
github-actions[bot]
|
ff3e2c9cfa
|
New Crowdin Translations (automated) (#32295)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-08 08:10:39 +00:00 |
|
github-actions[bot]
|
2e0d918d7d
|
New Crowdin Translations for stable-4.3 (automated) (#32253)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-07 11:21:49 +02:00 |
|
github-actions[bot]
|
498024558a
|
New Crowdin Translations (automated) (#32262)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-10-07 07:06:43 +00:00 |
|
Jeremy Kescher
|
1290a5609d
|
Merge branch 'glitch-v4.3.0-rc.1' into develop
|
2024-10-03 22:25:40 +02:00 |
|
github-actions[bot]
|
278a075b22
|
New Crowdin Translations (automated) (#32103)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-09-26 08:47:38 +00:00 |
|
github-actions[bot]
|
ed90d9342e
|
New Crowdin Translations (automated) (#32011)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-09-23 08:50:19 +00:00 |
|
Jeremy Kescher
|
655d28f6a7
|
Merge remote-tracking branch 'upstream/main' into develop
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
|
2024-09-20 11:53:07 +02:00 |
|
Matt Jankowski
|
5405bdd344
|
Remove unused E2EE messaging code (#31193)
|
2024-09-18 09:27:43 +00:00 |
|
Eugen Rochko
|
3d46f47817
|
Change embedded posts to use web UI (#31766)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-09-12 09:41:19 +00:00 |
|
Jeremy Kescher
|
0b66cfbc8d
|
Merge remote-tracking branch 'upstream/main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
|
2024-09-10 16:15:59 +02:00 |
|
Eugen Rochko
|
e0c27a5047
|
Add ability to manage which websites can credit you in link previews (#31819)
|
2024-09-10 12:00:40 +00:00 |
|
github-actions[bot]
|
2caa3f365d
|
New Crowdin Translations (automated) (#31800)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-09-09 12:38:43 +00:00 |
|
github-actions[bot]
|
2f2b98c8cb
|
New Crowdin Translations (automated) (#31671)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-09-02 08:35:09 +00:00 |
|
github-actions[bot]
|
92eba9096b
|
New Crowdin Translations (automated) (#31656)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-08-30 07:12:56 +00:00 |
|
Jeremy Kescher
|
08e538f8a4
|
Merge branch 'glitch' into develop
|
2024-08-16 16:05:14 +02:00 |
|
github-actions[bot]
|
634ab0bad0
|
New Crowdin Translations (automated) (#31351)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-08-11 18:13:10 +00:00 |
|
Jeremy Kescher
|
afa0c78715
|
Merge branch 'refs/heads/glitch' into develop
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
|
2024-07-30 08:38:14 +02:00 |
|
github-actions[bot]
|
ef0e3e447a
|
New Crowdin Translations (automated) (#31119)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-07-25 07:44:00 +00:00 |
|
Jeremy Kescher
|
1862a60e51
|
Merge branch 'refs/heads/glitch' into develop
|
2024-07-16 22:32:15 +02:00 |
|
github-actions[bot]
|
17117109ad
|
New Crowdin Translations (automated) (#31018)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-07-15 07:44:37 +00:00 |
|
Jeremy Kescher
|
cb080ca3ef
|
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
|
2024-05-30 18:51:42 +02:00 |
|
Jeremy Kescher
|
6d448d46ff
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
|
2024-05-29 14:23:08 +02:00 |
|
github-actions[bot]
|
e5c3dc33a2
|
New Crowdin Translations (automated) (#30421)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-05-27 09:35:45 +00:00 |
|
github-actions[bot]
|
5b5a35cf96
|
New Crowdin Translations (automated) (#30402)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-05-23 08:26:29 +00:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
github-actions[bot]
|
9be2c02e52
|
New Crowdin Translations (automated) (#30169)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-05-06 08:36:29 +00:00 |
|
github-actions[bot]
|
3655fb6a22
|
New Crowdin Translations (automated) (#30014)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-04-22 08:42:35 +00:00 |
|
github-actions[bot]
|
4e78cb9988
|
New Crowdin Translations (automated) (#29939)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-04-15 09:29:39 +00:00 |
|
Jeremy Kescher
|
2df3b9f803
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/serializers/initial_state_serializer.rb
|
2024-04-11 21:50:48 +02:00 |
|
github-actions[bot]
|
13faf26315
|
New Crowdin Translations (automated) (#29859)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-04-08 13:44:54 +00:00 |
|
github-actions[bot]
|
799e3be9bd
|
New Crowdin Translations (automated) (#29726)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-25 11:07:38 +00:00 |
|
Jeremy Kescher
|
0353a3d759
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
|
2024-03-20 22:59:13 +01:00 |
|
github-actions[bot]
|
6c0b1a41a1
|
New Crowdin Translations (automated) (#29657)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-20 08:39:42 +00:00 |
|
Matt Jankowski
|
ecdbf15ebe
|
Remove unused link_to_older and link_to_newer helper methods (#29620)
|
2024-03-18 08:54:46 +00:00 |
|
github-actions[bot]
|
04817e965a
|
New Crowdin Translations (automated) (#29623)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-18 08:47:48 +00:00 |
|
Jeremy Kescher
|
caccc2e0f4
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
|
2024-03-14 20:01:30 +01:00 |
|
github-actions[bot]
|
f85168b189
|
New Crowdin Translations (automated) (#29467)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-03-11 07:37:04 +00:00 |
|
Eugen Rochko
|
50b17f7e10
|
Add notification policies and notification requests (#29366)
|
2024-03-07 14:53:37 +00:00 |
|
HTeuMeuLeu
|
934cab7508
|
New welcome email (#28883)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
|
2024-03-01 12:16:53 +00:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
noellabo
|
d518f06eae
|
Add reject blurhash to Admin setting
|
2024-02-24 11:14:32 +01:00 |
|
github-actions[bot]
|
bba4118ddd
|
New Crowdin Translations (automated) (#29369)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-23 15:21:02 +00:00 |
|
github-actions[bot]
|
449fcf1ae7
|
New Crowdin Translations (automated) (#29343)
Co-authored-by: GitHub Actions <noreply@github.com>
|
2024-02-22 10:37:48 +00:00 |
|