Jeremy Kescher
b58bc7102e
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-11-01 17:03:17 +01:00
Claire
2b0410f903
Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-18 17:19:57 +02:00
Matt Jankowski
afc440435c
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 15:49:26 +02:00
Claire
7388a6ce9a
Add more explicit explanations about author attribution and fediverse:creator ( #32383 )
2024-10-18 09:14:13 +02:00
Claire
198283a188
Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while
glitch-soc has a different version of the file overall.
Added upstream's changes.
2024-10-16 12:42:12 +02:00
Matt Jankowski
41e342a88f
Convert admin/invites controller specs to system specs ( #32450 )
2024-10-16 12:40:58 +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
Claire
dfe851b476
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
2024-10-05 20:45:05 +02:00
Matt Jankowski
2e8b752c55
Move admin action log type list generation to helper ( #32178 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
d82ffdccbb
Add copyable_input helper method to wrap shared options ( #32119 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
5c72b46a4e
Clean up labels on development application form ( #32116 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
ceba0f082e
Provide use_path to qr generator for svg data size reduction ( #32127 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
784d1bfb29
Fix broken border on applications list ( #32147 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
97db4bd4dd
Wrap datetime in time element with attrs ( #32177 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1e19242134
Extract constants for header and avatar geometry ( #32151 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
4e6f13a0fb
Only show email domain blocks MX table when some found ( #32155 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
53624b1b54
Remove explicit put action in settings forms ( #32176 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
bdceb1dacf
Add date_range view helper ( #32187 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
6734b6550f
Extract dashboard partial for admin instance page ( #32189 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1283c3544c
Avoid id duplication conflict with main navigation from settings profile link ( #32181 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1b3472bec8
Use account display name for pretend blog example in attribution area ( #32188 )
2024-10-04 17:48:03 +02:00
Jeremy Kescher
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop
2024-10-03 22:25:40 +02:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Christian Schmidt
9d664f87a0
Mailer layout fixes ( #32132 )
2024-09-27 19:41:41 +00:00
Matt Jankowski
24d3ce7bab
Add no-toolbar state for "nothing here" batch table views ( #32128 )
2024-09-27 19:38:44 +00:00
Matt Jankowski
e02e88bff4
Use previously extracted model constants in form maxlength attributes ( #32113 )
2024-09-27 08:21:27 +00:00
Matt Jankowski
04dd3a9eb6
Wrap webhook event label with samp tag ( #32115 )
2024-09-27 08:20:21 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Claire
ed8b0e4b1e
Fix links for reblogs in moderation interface ( #31979 )
2024-09-20 13:33:26 +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
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Claire
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Claire
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
Matt Jankowski
4aa600387e
Move redirect/base body class to view ( #31796 )
2024-09-12 13:31:50 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02: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
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method ( #31846 )
2024-09-11 07:47:16 +00:00
Matt Jankowski
0c3c06f7cc
Remove vendor prefix from mobile-web-app-capable meta tag ( #31845 )
2024-09-10 17:32:58 +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
Claire
5c97ccf939
Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream
2024-09-06 20:10:53 +02:00
Claire
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
Claire
b716248fc5
Add link to /admin/roles in moderation interface when changing someone's role ( #31791 )
2024-09-06 17:21:49 +00:00
Matt Jankowski
7335a43b6d
Use async count in admin dashboard ( #30606 )
2024-09-06 16:52:35 +00:00
