Commit graph

16274 commits

Author SHA1 Message Date
Jeremy Kescher
52f9449b3d
Update outdated link to source 2022-11-06 01:50:59 +01:00
Jeremy Kescher
9dafedaecd
Remove misc duplicate declarations 2022-11-06 01:42:40 +01:00
Jeremy Kescher
5ab1ac972b
Show about tab if explore tab wouldn't show any statuses 2022-11-06 01:41:55 +01:00
Jeremy Kescher
b0be4764b4
Keep showing explore tab, only statuses are hidden 2022-11-06 01:30:46 +01:00
Jeremy Kescher
7e0108bccd
Fix wrong "only" target in previous commit 2022-11-06 01:18:29 +01:00
Jeremy Kescher
da8c3bed5c
Don't show trending statuses in public web UI 2022-11-06 01:13:19 +01:00
Jeremy Kescher
41f1a81ab7
Change AUTHORIZED_FETCH to not block unauthenticated REST API access
Port of vanilla commit: https://github.com/mastodon/mastodon/pull/19803
2022-11-06 00:39:33 +01:00
Jeremy Kescher
f0422fb416
v3.5.3+1.1.3 2022-11-05 12:26:41 +01:00
Jeremy Kescher
96afc222d2
Merge remote-tracking branch 'upstream/main' into develop 2022-11-05 12:26:08 +01:00
Claire
2f8fb49d13
Fix users not being able to change their hide_followers_count setting (#1889) 2022-11-05 11:55:25 +01:00
prplecake
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2022-11-05 08:12:04 +01:00
Jeremy Kescher
3bc0621c3c
v3.5.3+1.1.2 2022-11-02 21:16:39 +01:00
Jeremy Kescher
c3bffb95b6
Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls 2022-11-02 21:16:10 +01:00
Jeremy Kescher
3d2fc73ecb
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/mastodon/initial_state.js
2022-11-02 21:12:42 +01:00
prplecake
f359b15303
Allow number of trending hashtags to be customizable (#1884) 2022-11-02 09:20:47 +01:00
prplecake
56eb1da0f5
Fix CharacterCount in vanilla UI (#1883) 2022-11-01 18:06:07 +01:00
Jeremy Kescher
e1d17e6f34
Update README.md
Editing is now enabled in vanilla and glitch-soc
2022-11-01 12:05:14 +01:00
Jeremy Kescher
b127fa6d36
Assign lowest possible scheduling priorities to Sidekiq 2022-11-01 11:54:45 +01:00
Jeremy Kescher
025e6ce643
v3.5.3+1.1.1 2022-11-01 10:30:21 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API 2022-11-01 10:29:44 +01:00
Jeremy Kescher
22427cd43c
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
2022-11-01 10:23:35 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Jeremy Kescher
d797cefec3
Change missing profile picture image 2022-10-31 23:05:20 +01:00
Jeremy Kescher
06c090fda5
Redirect old /web links 2022-10-31 22:29:47 +01:00
Jeremy Kescher
30223ea224
Revert version bump for now
Shorten "catstodon" to "cat" in version suffix
2022-10-31 21:47:02 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2022-10-31 21:37:48 +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
1fe4e5e38c Merge branch 'main' into glitch-soc/merge-upstream 2022-10-31 08:37:32 +01:00
Eugen Rochko
26478f461c
Remove language filtering from hashtag timelines (#19563) 2022-10-30 21:29:23 +01:00
Claire
5fd758fad1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire
a529d6d93e
Fix invites (#19560)
Fixes #19507

Fix regression from #19296
2022-10-30 19:04:39 +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
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
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
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
ac9fb0d654
Add reputation and followers score boost to SQL-only account search (#19251) 2022-10-30 13:23:05 +01: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
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
5724da0780
Fix language not being saved when editing status (#19543)
Fix #19542
2022-10-30 02:43:27 +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
ad83e64795
Fix sidebar and tabs on settings on small screens in admin UI (#19533) 2022-10-30 02:43:15 +02:00
Ben Hardill
6094a916b1
Fix helm chart use of Postgres Password (#19537)
Fixes #19536
2022-10-30 01:30:16 +02:00
Jeremy Kescher
6067b452ae
Use mimalloc instead of jemalloc 2022-10-29 23:41:37 +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
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
f910f0dc92
Fix wrong host being used for custom.css when asset host configured (#19521) 2022-10-29 14:04:24 +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
55af04b253
Fix logged out search and changed logged-in search placeholder (#19514) 2022-10-29 13:32:49 +02:00