me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38492 commits 2 branches 0 tags 429 MiB
Commit graph

38492 commits

This branch
This branch
All branches
Author SHA1 Message Date
prplecake
e8e547b23d Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
Jeremy Kescher
f00756b79e Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Claire
0bfb3187fc Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-10-31 18:25:34 +01:00
Claire
968f343006
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-10-31 18:25:34 +01:00
Claire
78f77cb5d4 Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
Claire
bb1ef11c30
Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
Eugen Rochko
0b91816814 Change design of link footer (#19562) 2022-10-31 13:06:17 +01:00
Eugen Rochko
2d9a85db6e
Change design of link footer (#19562) 2022-10-31 13:06:17 +01:00
Claire
4a8b813a1f Merge branch 'main' into glitch-soc/merge-upstream 2022-10-31 08:37:32 +01:00
Claire
1fe4e5e38c Merge branch 'main' into glitch-soc/merge-upstream 2022-10-31 08:37:32 +01:00
Eugen Rochko
fdfe1eae4a Remove language filtering from hashtag timelines (#19563) 2022-10-30 21:29:23 +01:00
Eugen Rochko
26478f461c
Remove language filtering from hashtag timelines (#19563) 2022-10-30 21:29:23 +01:00
Claire
96bd245f04 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire
5fd758fad1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire
8c94b641a9 Fix invites (#19560) 
Fixes #19507

Fix regression from #19296
 2022-10-30 19:04:39 +01:00
Claire
a529d6d93e
Fix invites (#19560) 
Fixes #19507

Fix regression from #19296
 2022-10-30 19:04:39 +01:00
Eugen Rochko
974c21ac09 [Glitch] Fix sidebar and tabs on settings on small screens in admin UI 
Port 361a2a3516 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:32:20 +01:00
Eugen Rochko
8048874a3a [Glitch] Fix sidebar and tabs on settings on small screens in admin UI 
Port ad83e64795 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:32:20 +01:00
Eugen Rochko
b12ffe1fbf [Glitch] Fix upload progress not communicating processing phase in web UI 
Port 89ef2cf044 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:30:58 +01:00
Eugen Rochko
ebfe393e9c [Glitch] Fix upload progress not communicating processing phase in web UI 
Port 30ef110224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:30:58 +01:00
Eugen Rochko
a1fed002e8 [Glitch] Fix logged out search and changed logged-in search placeholder 
Port 973d496b86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:24:57 +01:00
Eugen Rochko
eb307ec1bd [Glitch] Fix logged out search and changed logged-in search placeholder 
Port 55af04b253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:24:57 +01:00
Claire
525919c04f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 2022-10-30 18:15:28 +01:00
Claire
eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 2022-10-30 18:15:28 +01:00
Eugen Rochko
3455b9001f Add reputation and followers score boost to SQL-only account search (#19251) 2022-10-30 13:23:05 +01:00
Eugen Rochko
ac9fb0d654
Add reputation and followers score boost to SQL-only account search (#19251) 2022-10-30 13:23:05 +01:00
Eugen Rochko
eedf46b243 Fix account action type validation (#19476) 
* Fix account action type validation

Fix #19143

* Fix #19145

* Fix code style issues
 2022-10-30 02:44:32 +02:00
Eugen Rochko
40c7f3e830
Fix account action type validation (#19476) 
* Fix account action type validation

Fix #19143

* Fix #19145

* Fix code style issues
 2022-10-30 02:44:32 +02:00
Eugen Rochko
69f2f514d2 Fix admin APIs returning deleted object instead of empty object upon delete (#19479) 
Fix #19153
 2022-10-30 02:43:57 +02:00
Eugen Rochko
276b85bc91
Fix admin APIs returning deleted object instead of empty object upon delete (#19479) 
Fix #19153
 2022-10-30 02:43:57 +02:00
Eugen Rochko
fa30d092f2 Fix language not being saved when editing status (#19543) 
Fix #19542
 2022-10-30 02:43:27 +02:00
Eugen Rochko
5724da0780
Fix language not being saved when editing status (#19543) 
Fix #19542
 2022-10-30 02:43:27 +02:00
Eugen Rochko
c129275c25 Fix not being able to input featured tag with # (#19535) 2022-10-30 02:43:20 +02:00
Eugen Rochko
3b024c563c
Fix not being able to input featured tag with # (#19535) 2022-10-30 02:43:20 +02:00
Eugen Rochko
361a2a3516 Fix sidebar and tabs on settings on small screens in admin UI (#19533) 2022-10-30 02:43:15 +02:00
Eugen Rochko
ad83e64795
Fix sidebar and tabs on settings on small screens in admin UI (#19533) 2022-10-30 02:43:15 +02:00
Ben Hardill
6682f12a9e Fix helm chart use of Postgres Password (#19537) 
Fixes #19536
 2022-10-30 01:30:16 +02:00
Ben Hardill
6094a916b1
Fix helm chart use of Postgres Password (#19537) 
Fixes #19536
 2022-10-30 01:30:16 +02:00
Eugen Rochko
89ef2cf044 Fix upload progress not communicating processing phase in web UI (#19530) 2022-10-29 20:05:53 +02:00
Eugen Rochko
30ef110224
Fix upload progress not communicating processing phase in web UI (#19530) 2022-10-29 20:05:53 +02:00
Yurii Izorkin
87b5ede13a nginx: optimize locations (#19438) 
* nginx: optimize locations

* nginx: don't use regex in locations

* nginx: optimize Cache-Control headaers

* nginx: use 404 error_page for missing static files

* nginx: sort locations

* nginx: add missing HSTS header
 2022-10-29 15:06:23 +02:00
Yurii Izorkin
a449ee8654
nginx: optimize locations (#19438) 
* nginx: optimize locations

* nginx: don't use regex in locations

* nginx: optimize Cache-Control headaers

* nginx: use 404 error_page for missing static files

* nginx: sort locations

* nginx: add missing HSTS header
 2022-10-29 15:06:23 +02:00
Eugen Rochko
57d54172f4 Fix wrong host being used for custom.css when asset host configured (#19521) 2022-10-29 14:04:24 +02:00
Eugen Rochko
f910f0dc92
Fix wrong host being used for custom.css when asset host configured (#19521) 2022-10-29 14:04:24 +02:00
Matthias Bethke
150f5b0e6c fix name of Lao language (#19520) 
It said ພາສາ or pha-sa, which means just "language" in Lao. "ພາສາລາວ",
pha-sa lao, is the full name but the short "ລາວ" is commonly used.
 2022-10-29 13:34:56 +02:00
Matthias Bethke
7926cb1bc7
fix name of Lao language (#19520) 
It said ພາສາ or pha-sa, which means just "language" in Lao. "ພາສາລາວ",
pha-sa lao, is the full name but the short "ລາວ" is commonly used.
 2022-10-29 13:34:56 +02:00
Eugen Rochko
973d496b86 Fix logged out search and changed logged-in search placeholder (#19514) 2022-10-29 13:32:49 +02:00
Eugen Rochko
55af04b253
Fix logged out search and changed logged-in search placeholder (#19514) 2022-10-29 13:32:49 +02:00