KMY
|
aa2cdc898a
|
Merge remote-tracking branch 'parent/main' into upstream-20240618
|
2024-06-18 07:43:33 +09:00 |
|
Matt Jankowski
|
b5d1d48266
|
Convert form_for -> form_with in views (#30700)
|
2024-06-14 09:54:22 +00:00 |
|
KMY
|
32a8f367a3
|
Merge remote-tracking branch 'parent/main' into upstream-20240424
|
2024-04-24 08:57:07 +09:00 |
|
Matt Jankowski
|
32ead51e5a
|
Add material design icons to admin/settings views (#27780)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-04-23 16:43:49 +00:00 |
|
KMY
|
76598bd542
|
Merge remote-tracking branch 'parent/main' into upstream-20240319
|
2024-03-19 09:15:20 +09:00 |
|
Matt Jankowski
|
f445d33fd6
|
Fix haml-lint LineLength cops in app/views/admin (#28680)
|
2024-03-15 11:19:00 +00:00 |
|
KMY（雪あすか）
|
76b24193c4
|
Remove: #608 ドメインブロック「リプライを拒否」 (#624)
|
2024-03-01 12:03:31 +09:00 |
|
KMY（雪あすか）
|
407a53aa33
|
Remove: メディアを配送しない設定の削除 (#445)
|
2024-01-11 09:16:59 +09:00 |
|
KMY（雪あすか）
|
92a16218c9
|
Remove: #372 削除予定のドメインブロック項目をいったん削除 (#444)
* Remove: #372 削除予定のドメインブロック項目をいったん削除
* Fix test
|
2024-01-10 19:04:49 +09:00 |
|
KMY
|
fbb82b740b
|
Merge remote-tracking branch 'parent/main' into kb_migration
|
2023-08-25 12:19:55 +09:00 |
|
Matt Jankowski
|
9974163776
|
Consolidate inclusion of admin js pack link (#26628)
|
2023-08-24 09:56:23 +02:00 |
|
KMY
|
bb2e964dca
|
Merge commit 'aea67d448b' into kb_migration
|
2023-06-04 10:15:09 +09:00 |
|
Jed Fox
|
768b00c4d0
|
Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)
|
2023-06-02 19:58:18 +02:00 |
|
KMY
|
3fa8efaf93
|
Add domainblocks to reject_reply_exclude_followers
|
2023-05-12 21:46:28 +09:00 |
|
KMY
|
7d3d93e9a4
|
Add reject public unlisted subscription configs
|
2023-04-30 21:36:49 +09:00 |
|
KMY
|
9ad92e6a09
|
Addo domein block extra supports
|
2023-04-28 13:31:02 +09:00 |
|
Claire
|
bae6ef315e
|
Fix missing Javascript in domain block import confirmation page (#21471)
Follow-up to #20597
|
2022-12-15 15:47:23 +01:00 |
|
lenore gilbert
|
c373148b3d
|
Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
* Allow import/export of instance-level domain blocks/allows (#1754)
* Allow import/export of instance-level domain blocks/allows.
Fixes #15095
* Pacify circleci
* Address simple code review feedback
* Add headers to exported CSV
* Extract common import/export functionality to
AdminExportControllerConcern
* Add additional fields to instance-blocked domain export
* Address review feedback
* Split instance domain block/allow import/export into separate pages/controllers
* Address code review feedback
* Pacify DeepSource
* Work around Paperclip::HasAttachmentFile for Rails 6
* Fix deprecated API warning in export tests
* Remove after_commit workaround
(cherry picked from commit 94e98864e39c010635e839fea984f2b4893bef1a)
* Add confirmation page when importing blocked domains (#1773)
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
(cherry picked from commit b91196f4b73fff91997b8077619ae25b6d04a59e)
* Fix authorization check in domain blocks controller
(cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38)
* Fix error strings for domain blocks and email-domain blocks
Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks
Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing
Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's"
* Ran i18n-tasks normalize to address test failure
* Removed unused admin.export_domain_blocks.not_permitted string
Removing unused string as indicated by Check i18n
* Fix tests
(cherry picked from commit 9094c2f52c24e1c00b594e7c11cd00e4a07eb431)
* Fix domain block export not exporting blocks with only media rejection
(cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960)
* Fix various issues with domain block import
- stop using Paperclip for processing domain allow/block imports
- stop leaving temporary files
- better error handling
- assume CSV files are UTF-8-encoded
(cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902)
Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2022-11-17 11:05:09 +01:00 |
|