Ariadne Conill
8e83b4aaac
th: woodpecker: only do push when branch is main
2022-11-13 03:34:08 +00:00
Ariadne Conill
5947e9339b
th: Merge pull request 'logo-fix' ( #12 ) from logo-fix into main
...
Reviewed-on: https://gitea.treehouse.systems/treehouse/mastodon/pulls/12
2022-11-13 03:18:16 +00:00
Claire
29cddeffaf
Fix saving server registration settings redirecting to branding settings ( #20505 )
2022-11-13 03:33:31 +01:00
Claire
cf77d938f8
Fix saving server registration settings redirecting to branding settings ( #20505 )
2022-11-13 03:33:31 +01:00
helloworldstack
b15f094f38
Fix casing and spacing of words ( #20504 )
2022-11-13 03:33:20 +01:00
helloworldstack
e9e4938bc9
Fix casing and spacing of words ( #20504 )
2022-11-13 03:33:20 +01:00
Rin
147592405d
th: Fix non-rendering on certain engines
2022-11-13 02:12:17 +00:00
Rin
55bbd293d4
th: Change Safari bookmark colour to match treehouse
2022-11-13 02:12:17 +00:00
Rin
7c130092e6
th: Add small icon assets
2022-11-13 02:12:17 +00:00
Ariadne Conill
313fd219e3
th: woodpecker: add registry secret
2022-11-12 14:08:48 +00:00
Claire
e566c9ff02
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-12 14:33:14 +01:00
Claire
81b1d32d5b
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-12 14:33:14 +01:00
Claire
8fe691e177
[Glitch] Fix WebUI crash when listing server blocks and rationale is not available
...
Port 532fc2e361
2022-11-12 14:02:23 +01:00
Claire
a808ac1fd8
[Glitch] Fix WebUI crash when listing server blocks and rationale is not available
...
Port 93a6ebc83d
2022-11-12 14:02:23 +01:00
Claire
06c5841fbd
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port d55054b166
2022-11-12 14:01:47 +01:00
Claire
9255bfb908
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port 31005aad12
2022-11-12 14:01:47 +01:00
Cutls
f5aacdcc74
[Glitch] Do not show drag&drop dialog when not logined
...
Port f22910ef4a
2022-11-12 13:59:03 +01:00
Cutls
e2315876f4
[Glitch] Do not show drag&drop dialog when not logined
...
Port 553b169d48
2022-11-12 13:59:03 +01:00
Claire
905aa6616d
[Glitch] Remove “No description added” media warning in edit mode
...
Port 28ae058593
2022-11-12 13:57:41 +01:00
Claire
8ac4165c72
[Glitch] Remove “No description added” media warning in edit mode
...
Port 5e796dc6f8
2022-11-12 13:57:41 +01:00
Eugen Rochko
fd6d4392c2
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 609cb69251
2022-11-12 13:56:49 +01:00
Eugen Rochko
400d168310
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 6774c339b2
2022-11-12 13:56:49 +01:00
Connor Shea
843a4824f2
[Glitch] Only remove padding when listing applications
...
Port 8824c6c4a2
2022-11-12 13:55:43 +01:00
Connor Shea
d525ae4bdd
[Glitch] Only remove padding when listing applications
...
Port cf4992c918
2022-11-12 13:55:43 +01:00
Yamagishi Kazutoshi
5d4ad82142
[Glitch] Delay workbox import
...
Port 95e3572a6c
2022-11-12 13:55:02 +01:00
Yamagishi Kazutoshi
0071582c6d
[Glitch] Delay workbox import
...
Port 53d26cfc1c
2022-11-12 13:55:02 +01:00
Claire
b5481c4ba2
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 9b878a14eb
2022-11-12 13:54:09 +01:00
Claire
5394ca6807
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 894ce3726a
2022-11-12 13:54:09 +01:00
Claire
d4f1b79bcf
[Glitch] Remove preview cards from fav and boost notifications
...
Port 0161fa9745
2022-11-12 13:51:30 +01:00
Claire
487689f062
[Glitch] Remove preview cards from fav and boost notifications
...
Port 99734ac936
2022-11-12 13:51:30 +01:00
Claire
a4e1a2fef2
[Glitch] Fix color of the “No description added“ media upload warning on light theme
...
Port a0d7039011
2022-11-12 13:48:42 +01:00
Claire
3fa6c603ba
[Glitch] Fix color of the “No description added“ media upload warning on light theme
...
Port 89a6b76f99
2022-11-12 13:48:42 +01:00
Claire
81d24609e5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
2022-11-12 13:28:03 +01:00
Claire
93912f0498
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
2022-11-12 13:28:03 +01:00
Claire
fe49f097ca
Add back missing glitch-soc admin settings ( #1919 )
...
Fixes #1890
2022-11-12 13:24:53 +01:00
Claire
d37f426f95
Add back missing glitch-soc admin settings ( #1919 )
...
Fixes #1890
2022-11-12 13:24:53 +01:00
Ariadne Conill
3af10ecac0
th: woodpecker: remove separate login step
2022-11-12 11:18:48 +00:00
Ariadne Conill
3f8b329507
th: woodpecker: expose host docker socket for now until i have time to make docker-in-docker work
2022-11-12 10:55:53 +00:00
Jared Allard
b23f93be52
ci: write permissions to packages ( #1906 )
2022-11-12 11:51:16 +01:00
Jared Allard
e88f4f5e57
ci: write permissions to packages ( #1906 )
2022-11-12 11:51:16 +01:00
Ariadne Conill
5742b395f1
th: add woodpecker CI
2022-11-12 10:50:24 +00:00
Claire
d80141d0e5
Merge pull request #1918 from ClearlyClaire/glitch-soc/features/glitch-label
...
Add “Glitch-only” label to some settings
2022-11-12 11:45:39 +01:00
Claire
210341fba1
Merge pull request #1918 from ClearlyClaire/glitch-soc/features/glitch-label
...
Add “Glitch-only” label to some settings
2022-11-12 11:45:39 +01:00
Claire
2b3a57d5c0
Add extended description for glitch-soc only “hide followers count" setting
2022-11-12 11:31:05 +01:00
Claire
af89b14628
Add extended description for glitch-soc only “hide followers count" setting
2022-11-12 11:31:05 +01:00
Claire
0b2da756d8
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
Claire
6a96b17a2d
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
Claire
efa93f0b5a
Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
...
Fix “not recommended” label being shown as “recommended”
2022-11-12 11:10:39 +01:00
Claire
c813df2ebb
Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
...
Fix “not recommended” label being shown as “recommended”
2022-11-12 11:10:39 +01:00
Claire
285e4f762a
Make trendable_by_default not apply to posts
2022-11-12 10:59:17 +01:00
