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

6595 commits

Author SHA1 Message Date
Claire
5cc06f5edc Merge commit '37e5129118019dae515a876c40b25b14ac976be2' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire
e55eb73623 [Glitch] Improve interaction modal error handling 
Port a8a25dcbdb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-15 20:11:18 +02:00
Claire
9bb5ff5a62 Merge commit 'a8a25dcbdb63efb3191dbb3720c385209ffe4f34' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Plastikmensch
06221b90d2 Fix wrong gradient color on collapsed private mentions (#2402) 
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-13 08:44:40 +02:00
Eugen Rochko
3433972ed3 Add in: to search popout in web UI (#26807) 2023-09-06 06:46:26 +02:00
Eugen Rochko
2c5ba586ff Remove obfuscation of reply count in web UI (#26768) 2023-09-05 23:57:03 +02:00
Eugen Rochko
01e3a1f941 Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
Claire
a8a25dcbdb Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
Stanislas Signoud
21b72ec665 [Glitch] Fix light mode colors for advanced interface banner 
Port cfd21eee96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 18:31:00 +02:00
Claire
ef01aa71a9 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
Stanislas Signoud
cfd21eee96 Fix light mode colors for advanced interface banner (#26759) 2023-09-04 10:14:01 +02:00
Plastikmensch
d245d6380b Add recent to search props (#2394) 
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-03 08:46:30 +02:00
Claire
f15e8e3e0d [Glitch] Add admin notifications for new Mastodon versions 
Port front-end changes from 97238e3496 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:20:06 +02:00
Claire
78a851ae0a Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
fa329286d0 [Glitch] Add authorized_fetch server setting in addition to env var 
Port SCSS changes from 7d3930a520 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:01:37 +02:00
Eugen Rochko
70c734d65a Fix wrong color on active icons with counters in web UI (#26767) 2023-09-02 14:46:26 +02:00
Claire
63969b15b3 Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire
e070644a5d [Glitch] Fix search popout including full-text search instructions when full-text search is disabled 
Port 20913b52bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:56:20 +02:00
Santiago Kozak
64e558cbbf [Glitch] Allow filter form in profiles directory to wrap 
Port 1b9fe4882f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:55:53 +02:00
Stanislas Signoud
f7e8c8033f [Glitch] Add an explanation banner on switching to single column mode 
Port 2c0eaf50f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:54:33 +02:00
Claire
432bd89f72 Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
 2023-09-02 13:50:16 +02:00
Claire
513d22e1d6 [Glitch] Fix sign up steps progress layout in right-to-left locales 
Port 4452d8dad5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:50 +02:00
Tim Rogers
e21ef86a9b [Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts 
Port 378b3dcddf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:15 +02:00
Tim Rogers
97d464e5d3 [Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts 
Port 1b52b02c1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:39:02 +02:00
Claire
d38116d584 Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire
c499c4a019 Merge commit 'd2ee5b19004995d385e344c5b3216e29c8337094' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
 2023-09-02 13:18:16 +02:00
Claire
1ef0758cf0 Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Eugen Rochko
dab6bbdd54 [Glitch] Add search options to search popout in web UI 
Port 9ab2c6b479 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 12:09:07 +02:00
Claire
a9fb03b6c0 Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire
ed5d57dac3 Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
 2023-09-02 11:56:09 +02:00
Claire
f188aa636c [Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex 
Port d8276ad1b4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 11:49:35 +02:00
Claire
52ce0a1c1d Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Claire
97238e3496 Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Claire
7d3930a520 Add authorized_fetch server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
Claire
20913b52bb Fix search popout including full-text search instructions when full-text search is disabled (#26755) 2023-09-01 15:13:27 +02:00
Santiago Kozak
1b9fe4882f Allow filter form in profiles directory to wrap (#26682) 2023-08-31 14:15:58 +02:00
Stanislas Signoud
2c0eaf50f6 Add an explanation banner on switching to single column mode (#26019) 2023-08-31 12:18:46 +02:00
Claire
4452d8dad5 Fix sign up steps progress layout in right-to-left locales (#26728) 2023-08-30 16:29:52 +02:00
Tim Rogers
378b3dcddf Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574) 2023-08-29 14:42:20 +02:00
Tim Rogers
1b52b02c1c Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577) 2023-08-29 10:56:19 +02:00
Christian Schmidt
d2ee5b1900 Remove dead code from public.jsx (#26547) 2023-08-29 10:16:18 +02:00
github-actions[bot]
9a65f28e9e New Crowdin translations (#2388) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-29 08:28:45 +02:00
Eugen Rochko
a4130c4139 Fix colors and typography on hashtag bar in web UI (#26666) 2023-08-28 19:49:38 +02:00
Eugen Rochko
9ab2c6b479 Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
renovate[bot]
85c3155d14 Update dependency @testing-library/jest-dom to v6 (#26479) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-08-28 12:19:42 +02:00
github-actions[bot]
d033fab0ed New Crowdin translations (#2376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-26 22:53:46 +02:00
Eugen Rochko
8784abbc4c Fix toast saying "published" instead of "saved" after editing post in web UI (#26664) 2023-08-25 22:03:04 +02:00
Claire
d8276ad1b4 Add data-nosnippet attribute to remote posts and local posts with noindex (#26648) 2023-08-25 11:31:20 +02:00
Claire
9bc91160b2 [Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode 
Port b63ddc70d6 to glitch-soc

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:27 +02:00
Claire
a7a9e2854d [Glitch] Fix selecting domains to forward reports to not passing the information correctly 
Port 6db702fa24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:00 +02:00