treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
16,401 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

16401 Commits (d231f799db64d4da1c29996e9ec8ef9a27562237)

Author SHA1 Message Date
Claire d231f799db Merge pull request #1932 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-15 02:11:22 +01:00
Claire 6ace18fdf6 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-15 02:10:37 +01:00
Claire 6645b57d39 Fix filters from other users being used in the streaming service (#20719) 2022-11-15 02:09:58 +01:00
Claire 51864b0b0d Fix infinite loop when system emoji font is enabled (#1931) 
Fixes #1930
 2022-11-15 00:32:59 +01:00
Claire 1ed97b22f1 Merge pull request #1929 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-14 22:43:56 +01:00
Claire 7fbfa23d71 [Glitch] Fix nodes order being sometimes mangled when rewriting emoji 
Port 97ac51901d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 22:32:00 +01:00
Claire 665c7b9240 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 22:30:30 +01:00
Eugen Rochko eb1cb5b6d9 Bump version to 4.0.1 (#20696) 2022-11-14 22:21:14 +01:00
Claire 97ac51901d Fix nodes order being sometimes mangled when rewriting emoji (#20677) 
* Fix front-end emoji tests

* Fix nodes order being sometimes mangled when rewriting emoji
 2022-11-14 22:14:55 +01:00
Claire a6ea69447b Merge pull request #1928 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream  changes
 2022-11-14 20:29:15 +01:00
Claire 9f0a4acfb1 [Glitch] Fix emoji substitution not applying only to text nodes in Web UI 
Port bd267f6353 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:28:22 +01:00
Claire 699db5f2af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  Upstream removed blank lines.
 2022-11-14 20:27:31 +01:00
Eugen Rochko 4a307df02f Bump version to 4.0.0 (#20636) 2022-11-14 20:27:12 +01:00
Eugen Rochko e18c8537e6 Fix rate limiting for paths with formats (#20675) 2022-11-14 20:26:31 +01:00
Claire c9b53436d7 Fix emoji substitution not applying only to text nodes in backend code (#20641) 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:26:21 +01:00
Claire bd267f6353 Fix emoji substitution not applying only to text nodes in Web UI (#20640) 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:26:03 +01:00
Claire 2ac7a30146 Merge pull request #1927 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-14 18:45:54 +01:00
Claire 56234c7110 [Glitch] Fix media metadata being only editable once 
Port 088c365559 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 18:32:33 +01:00
Claire 6e299f53bd Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 18:31:04 +01:00
Claire 088c365559 Fix media metadata being only editable once (#20665) 2022-11-14 17:52:31 +01:00
Claire 827c1a68e4 Merge pull request #1923 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-14 10:31:28 +01:00
trwnh aacc2970f4 [Glitch] Move V2 Filter methods under /api/v2 prefix 
Port 72d3607229 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:17:59 +01:00
Eugen Rochko 6353e83d6c [Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI 
Port ca6df7a68c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:16:41 +01:00
Samuel Kaiser c538d5d3f6 [Glitch] Stick batch table toolbar to the top 
Port cb99d425b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:05:56 +01:00
Claire 31c8f7a65a Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:57:25 +01:00
Eugen Rochko c5da82cada Bump version to 4.0.0rc4 (#20634) 2022-11-14 08:50:14 +01:00
Claire 997553a99e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
 2022-11-14 08:35:55 +01:00
trwnh 72d3607229 Move V2 Filter methods under /api/v2 prefix (#20622) 
* Move V2 Filter methods under /api/v2 prefix

* move over the tests too
 2022-11-14 08:34:07 +01:00
Claire abc0ea76e7 Fix index name in fix-duplicates task (#20632) 2022-11-14 08:33:48 +01:00
Eugen Rochko 0efd1fc554 Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
Eugen Rochko 2b3b063852 Fix error when invalid domain name is submitted (#19474) 
Fix #19175
 2022-11-14 08:07:14 +01:00
Eugen Rochko 0cfead6483 Fix style of username in navigation bar above compose form in web UI (#20628) 
Regression from #20540
 2022-11-14 08:06:17 +01:00
Eugen Rochko 8b98bebc17 Fix error when passing unknown filter param in REST API (#20626) 
Fix #19156
 2022-11-14 08:06:06 +01:00
Eugen Rochko 2018fe879c Fix image type not being set after conversion for convertible image types (#20624) 2022-11-14 07:13:14 +01:00
Eugen Rochko 3cc5ed3bae Fix `role_ids` not accepting arrays in admin API (#20625) 
Fix #19157
 2022-11-14 06:56:15 +01:00
Eugen Rochko 12b819c78c Fix rules with same priority being sorted non-deterministically (#20623) 2022-11-14 06:28:19 +01:00
Eugen Rochko ca6df7a68c Fix dropdown menu on profiles not being accessible on narrow screens in web UI (#20620) 2022-11-14 06:05:10 +01:00
Hampton Lintorn-Catlin 277e2590e2 Support UTF-8 Characters in Domains During CSV Import (#20592) 
* Support UTF-8 Characters in Domains During Import

* Update Changelong
 2022-11-14 05:52:13 +01:00
Matt Corallo 88b46d0a8f Add `Cache-Control` header to openstack-stored files (#20610) 
When storing files in S3, paperclip is configured with a Cache-Control header
indicating the file is immutable, however no such header was added when using
OpenStack storage.

Luckily Paperclip's fog integration makes this trivial, with a simple
`fog_file` `Cache-Control` default doing the trick.
 2022-11-14 05:26:49 +01:00
Eugen Rochko 72de8402bd Fix wrong cut-off point for "Read more" in web UI (#20599) 2022-11-14 00:43:24 +01:00
Eugen Rochko c7924acf16 Fix icons having an image role (#20600) 2022-11-14 00:38:56 +01:00
Erik Sundell 6a2a65dfc2 helm: Add helm chart tests (#20394) 
* helm: Fix consistent list indentation

* helm: Add helm lint and helm template tests

* helm: Add helm template --validate test

* helm: Add helm install test
 2022-11-13 22:22:07 +01:00
trwnh 1b9ad6fb4b Change in-app links to keep you in-app (#20540) 
* Change in-app links to keep you in-app

* refactor Permalink into Link

* rewrite link hrefs in status content

* please linter

* please linter again
 2022-11-13 21:10:20 +01:00
Cees-Jan Kiewiet 6ca08a018f Add the option to configure external postgresql port (#20370) 
While the normal assumption of port `5432` for a postgresql server is pretty reliable I found that DigitalOcean puts them on a somewhat random port. This adds the ability to specify the port in the helm chart.
 2022-11-13 21:06:03 +01:00
Alex Nordlund 96d24d55b8 Helm: support statsd publishing (#20455) 
* Allow statsd publishing from Helm

* Apply suggestions from code review

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
 2022-11-13 21:05:30 +01:00
Samuel Kaiser cb99d425b3 Stick batch table toolbar to the top (#20442) 
Fixes #20441
 2022-11-13 21:02:28 +01:00
Emily Strickland 2095b41aff Test blank account field verifiability (#20458) 
* Test blank account field verifiability

This change tests the need for #20428, which ensures that we guard against a situation in which `at_xpath` returns `nil`.

* Test verifiability of blank fields for remote account profiles

This adds a counterpart test for remote account profiles' fields' verifiability when those fields are blank. I previously added the same test for local accounts.
 2022-11-13 21:02:09 +01:00
Claire ac0ae9c83d Update fix-duplicates (#20502) 
Fixes #19133
 2022-11-13 21:01:38 +01:00
Nicholas La Roux 8c812d40ba Clean up GitHub sourced gem entry (#20542) 2022-11-13 21:00:38 +01:00
Claire 45f808956c Fix public/local timeline posts not being properly filtered (#20567) 
* Fix streaming server using wrong property name for matching filters

Late in the PR, the `filter_results` property has been renamed to `filtered`,
but the change has not been reflected in the streaming server code.

* Fix filter_action attribute being an integer instead of a string
 2022-11-13 20:59:49 +01:00