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

16454 Commits (401a51b67b61bfc11adc90665ad32b8bc1848f6b)

Author SHA1 Message Date
Rin 401a51b67b
Update instructions - make everything self contained
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-23 19:31:19 +11:00
Rin 842498649d
Moderately curse the env file to contain everything in the project 2022-11-23 19:25:17 +11:00
Rin 17e49cf098
rename env file to conform 2022-11-23 19:22:32 +11:00
Rin ca98b0da84
Add .env.ENV.local to .gitignore 2022-11-23 19:10:31 +11:00
Rin 8a701c5ac3 Fix numbering <_<
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-23 07:25:24 +00:00
Rin 2790045c7e Reduce .env file to minimal config 2022-11-23 07:25:24 +00:00
Rin 74c54af904 update gitignore to ignore the pg db we created 2022-11-23 07:25:24 +00:00
Rin 59b831de9b use local pg cluster instead 2022-11-23 07:25:24 +00:00
Rin 4172c91de0 fix typo 2022-11-23 07:25:24 +00:00
Rin ced99149d6 Add SETUP instructions 2022-11-23 07:25:24 +00:00
Rin d25d8d2c07
fix no-style links in admin panel
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-21 18:34:21 +11:00
kouhai dev b247829276 Merge remote-tracking branch 'glitch/main'
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-15 12:03:46 -08:00
Claire eb675af0fb
Merge pull request #1932 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-15 02:11:22 +01:00
Claire 66461ae79a Merge branch 'main' into glitch-soc/merge-upstream 2022-11-15 02:10:37 +01:00
Claire 8c3c6dcae9
Fix filters from other users being used in the streaming service (#20719) 2022-11-15 02:09:58 +01:00
Claire ceafd1f68f
Fix infinite loop when system emoji font is enabled (#1931) 
Fixes #1930
 2022-11-15 00:32:59 +01:00
Claire e589afa0ef
Merge pull request #1929 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-14 22:43:56 +01:00
Claire 8aa56aedfd [Glitch] Fix nodes order being sometimes mangled when rewriting emoji 
Port ccbca50a25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 22:32:00 +01:00
Claire b5698af25f Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 22:30:30 +01:00
Eugen Rochko 4415dd6036
Bump version to 4.0.1 (#20696) 2022-11-14 22:21:14 +01:00
Claire ccbca50a25
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 7a8cd0cb0a
Merge pull request #1928 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream  changes
 2022-11-14 20:29:15 +01:00
Claire 71982e5c83 [Glitch] Fix emoji substitution not applying only to text nodes in Web UI 
Port 625e086996 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:28:22 +01:00
Claire 767630be24 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  Upstream removed blank lines.
 2022-11-14 20:27:31 +01:00
Eugen Rochko fb389bd73c
Bump version to 4.0.0 (#20636) 2022-11-14 20:27:12 +01:00
Eugen Rochko 21fd25a269
Fix rate limiting for paths with formats (#20675) 2022-11-14 20:26:31 +01:00
Claire 71c92d3f56
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 625e086996
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 a34aa2a5f9
Merge pull request #1927 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-14 18:45:54 +01:00
Claire 96c1ef6d50 [Glitch] Fix media metadata being only editable once 
Port 2d54986a03 to glitch-soc

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:05:56 +01:00
Claire cd713cac81 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:57:25 +01:00
Eugen Rochko 75299a042c
Bump version to 4.0.0rc4 (#20634) 2022-11-14 08:50:14 +01:00
Claire 32c70d2f09 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 b59ce0a60f
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 457c37e47a
Fix index name in fix-duplicates task (#20632) 2022-11-14 08:33:48 +01:00
Eugen Rochko 1e83092e47
Update AUTHORS.md (#20630) 2022-11-14 08:33:24 +01:00
Eugen Rochko 552d69ad96
Fix error when invalid domain name is submitted (#19474) 
Fix #19175
 2022-11-14 08:07:14 +01:00
Eugen Rochko 523e106cbf
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 b31afc6294
Fix error when passing unknown filter param in REST API (#20626) 
Fix #19156
 2022-11-14 08:06:06 +01:00
Eugen Rochko 5c826c408d
Fix image type not being set after conversion for convertible image types (#20624) 2022-11-14 07:13:14 +01:00
Eugen Rochko 167d86d21d
Fix `role_ids` not accepting arrays in admin API (#20625) 
Fix #19157
 2022-11-14 06:56:15 +01:00
Eugen Rochko 2e2ba39abf
Fix rules with same priority being sorted non-deterministically (#20623) 2022-11-14 06:28:19 +01:00
Eugen Rochko 6da9df774e
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 147d8bd8fc
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