Jeremy Kescher
|
7fa9c34dee
|
Merge branch 'upstream-main' into develop
|
2024-11-01 17:13:04 +01:00 |
|
Claire
|
8b56509625
|
Add more explicit explanations about author attribution and fediverse:creator (#32383)
|
2024-10-17 09:03:08 +00:00 |
|
Jeremy Kescher
|
d364a1b0a7
|
Merge branch 'upstream-main' into develop
|
2024-10-11 00:53:18 +02:00 |
|
Leni Kadali
|
4238da6ee3
|
Add error message when user tries to follow their own account (#31910)
|
2024-10-07 12:05:46 +00:00 |
|
gunchleoc
|
160917e718
|
Pluralize csv imports (#27094)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-10-04 08:19:01 +00:00 |
|
Jeremy Kescher
|
1290a5609d
|
Merge branch 'glitch-v4.3.0-rc.1' into develop
|
2024-10-03 22:25:40 +02:00 |
|
Claire
|
513f187daf
|
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106)
|
2024-09-26 19:27:57 +00:00 |
|
Christian Schmidt
|
db332553c9
|
Rename "Data export" menu item (#32099)
|
2024-09-25 19:54:28 +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 |
|
Claire
|
592a7af27f
|
Fix translatable source string using “silenced” instead of “limited” (#31822)
|
2024-09-09 19:57:52 +00: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 |
|
Emelia Smith
|
fd7fc7bdc3
|
Disable actions on reports that have already been taken (#31773)
|
2024-09-06 12:50:30 +00:00 |
|
Christian Schmidt
|
491033c86c
|
Reject status creation with invalid media_ids parameter (#31681)
|
2024-09-02 15:30:48 +00:00 |
|
Jeremy Kescher
|
7df41062ba
|
Merge branch 'glitch' into develop
|
2024-08-26 18:31:12 +02:00 |
|
Emelia Smith
|
376088f6da
|
Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533)
|
2024-08-22 08:42:33 +00:00 |
|
Jeremy Kescher
|
08e538f8a4
|
Merge branch 'glitch' into develop
|
2024-08-16 16:05:14 +02:00 |
|
Jeremy Kescher
|
084cfb7d6c
|
Merge branch 'refs/heads/glitch' into develop
|
2024-08-11 19:09:56 +02:00 |
|
Robin
|
c39a8e1061
|
Change “e-mail” to “email” in en.yml (#31317)
|
2024-08-10 09:32:57 +00:00 |
|
Emelia Smith
|
d3089018d5
|
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292)
|
2024-08-10 09:17:10 +00:00 |
|
Jeong Arm
|
9bae237792
|
Change confirmation prompt on trending management (#19626)
|
2024-08-09 12:47:02 +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 |
|
Emelia Smith
|
c40e481169
|
Implement UI for Admin Search of Hashtags (#30880)
|
2024-07-29 15:49:44 +00:00 |
|
Emelia Smith
|
bb2e5a4b58
|
Add audit logs to Admin::InstancesController (#27386)
|
2024-07-23 08:12:30 +00:00 |
|
Jeremy Kescher
|
1862a60e51
|
Merge branch 'refs/heads/glitch' into develop
|
2024-07-16 22:32:15 +02:00 |
|
Emelia Smith
|
aa88aca0ad
|
Add optional OAuth application to reports (#30539)
|
2024-07-16 13:23:08 +00:00 |
|
Michael Stanclift
|
905921b2ef
|
Add missing "Update Report" string in audit log (#31033)
|
2024-07-16 07:06:19 +00:00 |
|
David Roetzel
|
9be77fc0db
|
Revert "Add system check for missing database indexes" (#30909)
|
2024-07-03 13:36:42 +00:00 |
|
David Roetzel
|
ebd8e1bbb6
|
Add system check for missing database indexes (#30888)
|
2024-07-03 07:19:54 +00:00 |
|
Jeremy Kescher
|
29ac8c0606
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-06-18 00:15:52 +02:00 |
|
Emelia Smith
|
3d9f00ae16
|
Fix unsafe URLs in audit log resulting from domain blocks (#27139)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-06-14 07:54:09 +00:00 |
|
Jeremy Kescher
|
d1856ea48d
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/initial_state.js
|
2024-05-22 23:56:46 +02:00 |
|
Michael Stanclift
|
2c75cf8599
|
Add "Warning preset" link to admin navigation (#26199)
|
2024-05-22 09:05:33 +00:00 |
|
Jeremy Kescher
|
fae98d1deb
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
|
2024-05-20 23:57:04 +02:00 |
|
Jeong Arm
|
a627219b25
|
Fix moderation action logs (#30342)
|
2024-05-17 09:18:54 +00:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
Michael Stanclift
|
bb8c6346fb
|
Reword and rearrange Content Retention page (#27733)
|
2024-04-26 15:17:41 +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 |
|
Renaud Chaput
|
02ea161506
|
Support "system" theme setting (light/dark theme depending on user system preference) (#29748)
Co-authored-by: Nishiki Liu <hello@nshki.com>
|
2024-03-26 09:25:49 +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 |
|
Claire
|
44bf7b8128
|
Add notifications of severed relationships (#27511)
|
2024-03-20 15:37:21 +00:00 |
|
Claire
|
bc6f9befde
|
Change “Notifications” settings page to “E-mail notifications” (#29646)
|
2024-03-19 13:40:16 +00:00 |
|
Claire
|
cf08a438e7
|
Add badge on account card in report moderation interface when account is already suspended (#29592)
|
2024-03-19 08:20:53 +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 |
|
Claire
|
82c2af0356
|
Fix user_mailer.welcome.hashtags_recent_count not having plural form (#29607)
|
2024-03-16 16:38:20 +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 |
|
Eugen Rochko
|
50b17f7e10
|
Add notification policies and notification requests (#29366)
|
2024-03-07 14:53:37 +00:00 |
|