nyura123dev
87929ad866
[Glitch] Fix safari explore disappearing tabs
...
Port aaca78da78
2022-11-17 12:57:58 +01:00
Moritz Heiber
a1fe971bf2
Split off Dockerfile components for faster build times ( #20933 )
2022-11-17 12:56:14 +01:00
Moritz Heiber
1b5ed32085
Split off Dockerfile components for faster build times ( #20933 )
2022-11-17 12:56:14 +01:00
Claire
4f15f1d8b6
Remove glitch-soc-specific translations of upstreamed feature (domain block import)
2022-11-17 12:08:59 +01:00
Claire
5ef92dff57
Remove glitch-soc-specific translations of upstreamed feature (domain block import)
2022-11-17 12:08:59 +01:00
Claire
3e4b8636a0
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how docker images were built, including how
they were cached.
I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
The feature, that was in glitch-soc, got backported upstream.
It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
Glitch-soc changes have been backported upstream. As a result,
some code from `app/javascript/core/admin.js` got added upstream.
Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
Upstream added something to distinguish unusable and unusable-because-moved
accounts, while glitch-soc considers moved accounts usable.
Took upstream's code for `functional_or_moved?` and made `functional?`
call it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream cleaned up code style a bit, on a line that we had custom changes
for.
Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
Upstream adopted one CSP directive we already had.
The conflict is because of our files being structurally different, but the
change itself was already part of glitch-soc.
Kept our version.
2022-11-17 12:01:37 +01:00
Claire
aec61a703f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how docker images were built, including how
they were cached.
I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
The feature, that was in glitch-soc, got backported upstream.
It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
Glitch-soc changes have been backported upstream. As a result,
some code from `app/javascript/core/admin.js` got added upstream.
Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
Upstream added something to distinguish unusable and unusable-because-moved
accounts, while glitch-soc considers moved accounts usable.
Took upstream's code for `functional_or_moved?` and made `functional?`
call it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream cleaned up code style a bit, on a line that we had custom changes
for.
Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
Upstream adopted one CSP directive we already had.
The conflict is because of our files being structurally different, but the
change itself was already part of glitch-soc.
Kept our version.
2022-11-17 12:01:37 +01:00
Claire
0297acfe70
Fix various issues with domain block import ( #1944 )
...
- stop using Paperclip for processing domain allow/block imports
- stop leaving temporary files
- better error handling
- assume CSV files are UTF-8-encoded
2022-11-17 11:42:20 +01:00
Claire
ab7d99e035
Fix various issues with domain block import ( #1944 )
...
- stop using Paperclip for processing domain allow/block imports
- stop leaving temporary files
- better error handling
- assume CSV files are UTF-8-encoded
2022-11-17 11:42:20 +01:00
Claire
41be06e4ec
Remove use of DOMParser in front-end emoji rewriting code ( #20758 )
...
* Add jstest for node ordering in emojify
* Remove use of DOMParser in front-end emoji rewriting code
2022-11-17 11:24:59 +01:00
Claire
585cc1a604
Remove use of DOMParser in front-end emoji rewriting code ( #20758 )
...
* Add jstest for node ordering in emojify
* Remove use of DOMParser in front-end emoji rewriting code
2022-11-17 11:24:59 +01:00
Rose
b54c639482
Fix style for hashes ( #20518 )
...
* Fix style for hashes
Make the style for hashes consistent.
* New style
More consistency
2022-11-17 11:05:39 +01:00
Rose
4f15fd0ba1
Fix style for hashes ( #20518 )
...
* Fix style for hashes
Make the style for hashes consistent.
* New style
More consistency
2022-11-17 11:05:39 +01:00
lenore gilbert
498e9478c7
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 b8319d0578#1773 )
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
(cherry picked from commit 73a2e3326f655bac2c3a1ba41b34c11686374b2f
2022-11-17 11:05:09 +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 94e98864e3#1773 )
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
(cherry picked from commit b91196f4b775279377589094c2f52c26ff48ee48
2022-11-17 11:05:09 +01:00
Ell Bradshaw
739d684403
Remove last references to "silencing" in UI text ( #20637 )
...
* Remove last references to "silencing" in en and en_GB locales
* Remove stray the, rephrase a bit
* Revert changes to generated files
I assume these will get updated via Crowdin
2022-11-17 11:01:51 +01:00
Ell Bradshaw
e7deea62d1
Remove last references to "silencing" in UI text ( #20637 )
...
* Remove last references to "silencing" in en and en_GB locales
* Remove stray the, rephrase a bit
* Revert changes to generated files
I assume these will get updated via Crowdin
2022-11-17 11:01:51 +01:00
Kohei Ota (inductor)
5a5fd023d1
Use buildx functions for faster build ( #20692 )
...
* Use buildx functions for faster build
* move link
* cannot use --link with --chown
2022-11-17 11:01:16 +01:00
Kohei Ota (inductor)
92734e3df1
Use buildx functions for faster build ( #20692 )
...
* Use buildx functions for faster build
* move link
* cannot use --link with --chown
2022-11-17 11:01:16 +01:00
Joshua Wood
e0940d04f1
Handle links with no href in VerifyLinkService ( #20741 )
...
Before this change, the following error would cause VerifyAccountLinksWorker to fail:
NoMethodError: undefined method `downcase' for nil:NilClass
[PROJECT_ROOT]/app/services/verify_link_service.rb:31 :in `block in link_back_present?`
2022-11-17 10:59:35 +01:00
Joshua Wood
daf6f3453e
Handle links with no href in VerifyLinkService ( #20741 )
...
Before this change, the following error would cause VerifyAccountLinksWorker to fail:
NoMethodError: undefined method `downcase' for nil:NilClass
[PROJECT_ROOT]/app/services/verify_link_service.rb:31 :in `block in link_back_present?`
2022-11-17 10:59:35 +01:00
Claire
4abfb043f2
Fix invalid/empty RSS feed link on account pages ( #20772 )
...
Fixes #20770
2022-11-17 10:58:33 +01:00
Claire
cbb0153bd0
Fix invalid/empty RSS feed link on account pages ( #20772 )
...
Fixes #20770
2022-11-17 10:58:33 +01:00
trwnh
699bec589f
Make tag following idempotent ( #20860 )
2022-11-17 10:55:59 +01:00
trwnh
7fdeed5fbc
Make tag following idempotent ( #20860 )
2022-11-17 10:55:59 +01:00
trwnh
0f402ff0eb
Fix getting a single EmailDomainBlock ( #20846 )
2022-11-17 10:55:50 +01:00
trwnh
72618ebf03
Fix getting a single EmailDomainBlock ( #20846 )
2022-11-17 10:55:50 +01:00
Claire
c7accdb6ac
Change automatic post deletion configuration to be accessible to redirected users ( #20774 )
...
Fixes #20550
2022-11-17 10:55:23 +01:00
Claire
00b2720ef0
Change automatic post deletion configuration to be accessible to redirected users ( #20774 )
...
Fixes #20550
2022-11-17 10:55:23 +01:00
Claire
d5fad31a45
Add form-action CSP directive ( #20781 )
2022-11-17 10:55:03 +01:00
Claire
7955d4b959
Add form-action CSP directive ( #20781 )
2022-11-17 10:55:03 +01:00
Claire
d79515d3df
Fix misleading wording about waitlists ( #20850 )
2022-11-17 10:54:33 +01:00
Claire
eb80789b0b
Fix misleading wording about waitlists ( #20850 )
2022-11-17 10:54:33 +01:00
trwnh
9b83c67aa7
Fix pagination of followed tags ( #20861 )
...
* Fix missing pagination headers on followed tags
* Fix typo
2022-11-17 10:54:10 +01:00
trwnh
e1f819fd78
Fix pagination of followed tags ( #20861 )
...
* Fix missing pagination headers on followed tags
* Fix typo
2022-11-17 10:54:10 +01:00
Levi Bard
8f32b59570
Make the button that expands the publish form differentiable from the button that publishes a post ( #20864 )
2022-11-17 10:53:38 +01:00
Levi Bard
654d348aac
Make the button that expands the publish form differentiable from the button that publishes a post ( #20864 )
2022-11-17 10:53:38 +01:00
Alex Nordlund
7619476cf1
Bump Helm chart version to account for mastodon 4 ( #20886 )
2022-11-17 10:53:04 +01:00
Alex Nordlund
642870c82b
Bump Helm chart version to account for mastodon 4 ( #20886 )
2022-11-17 10:53:04 +01:00
Claire
3e40b7ef8d
Change batch account suspension to create a strike ( #20897 )
2022-11-17 10:52:51 +01:00
Claire
0cc77263fc
Change batch account suspension to create a strike ( #20897 )
2022-11-17 10:52:51 +01:00
Chris Johnson
5573d1db4e
Add maskable icon support for Android ( #20904 )
...
* Add maskable icon support for Android
* Update manifest_serializer.rb
* Fix linting issue
2022-11-17 10:52:30 +01:00
Chris Johnson
413481f953
Add maskable icon support for Android ( #20904 )
...
* Add maskable icon support for Android
* Update manifest_serializer.rb
* Fix linting issue
2022-11-17 10:52:30 +01:00
trwnh
2e118aa0e6
Add missing admin scopes ( fix #20892 ) ( #20918 )
2022-11-17 10:50:21 +01:00
trwnh
a2931d19ae
Add missing admin scopes ( fix #20892 ) ( #20918 )
2022-11-17 10:50:21 +01:00
nyura123dev
c18c565cb3
Fix safari explore disappearing tabs ( #20917 )
...
* fix disappearing Explore tabs on Safari
* fix lint
Co-authored-by: nyura <nyura@hidden.com>
2022-11-17 08:54:43 +01:00
nyura123dev
aaca78da78
Fix safari explore disappearing tabs ( #20917 )
...
* fix disappearing Explore tabs on Safari
* fix lint
Co-authored-by: nyura <nyura@hidden.com>
2022-11-17 08:54:43 +01:00
Claire
8ec48c486c
Add aria-label and title attributes to local settings navigation items ( #1949 )
2022-11-16 20:56:06 +01:00
Claire
23ea0e7508
Add aria-label and title attributes to local settings navigation items ( #1949 )
2022-11-16 20:56:06 +01:00
Claire
2fa8bd21e2
Add form-action CSP directive ( #1948 )
2022-11-16 16:28:48 +01:00
