Commit graph

16459 commits

Author SHA1 Message Date
Rin
44230699fb th: Add dir for redis data 2022-11-25 14:24:44 +11:00
Kouhai
6fd1136c63 th: update gitignore 2022-11-24 18:58:23 -06:00
Kouhai
de2acb9854 th: rewrite instructions for a self-contained dev env 2022-11-24 18:57:24 -06:00
Rin
b5d5269eee th: Command style consistency 2022-11-23 19:35:13 +11:00
Rin
face86a613 th: Fix headings 2022-11-23 19:34:20 +11:00
Rin
06efc078fa th: Update instructions - make everything self contained 2022-11-23 19:31:19 +11:00
Rin
0b7a1c3750 th: Moderately curse the env file to contain everything in the project 2022-11-23 19:25:17 +11:00
Rin
116dbae343 th: rename env file to conform 2022-11-23 19:22:32 +11:00
Rin
ef88e896ab th: Add .env.ENV.local to .gitignore 2022-11-23 19:10:31 +11:00
Rin
cabb0bffa0 th: Fix numbering <_< 2022-11-23 07:25:24 +00:00
Rin
93a2640b83 th: Reduce .env file to minimal config 2022-11-23 07:25:24 +00:00
Rin
a1196f3955 th: update gitignore to ignore the pg db we created 2022-11-23 07:25:24 +00:00
Rin
5278309ddf th: use local pg cluster instead 2022-11-23 07:25:24 +00:00
Rin
b530dbe151 th: fix typo 2022-11-23 07:25:24 +00:00
Rin
a5da6333a6 th: Add SETUP instructions 2022-11-23 07:25:24 +00:00
Rin
5ae84e35c1 th: fix no-style links in admin panel 2022-11-21 18:34:21 +11:00
Kouhai
a590a2a093 th: Merge remote-tracking branch 'glitch/main' 2022-11-15 12:03:46 -08:00
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