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

18979 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christian Schmidt
d2ee5b1900 Remove dead code from public.jsx (#26547) 2023-08-29 10:16:18 +02:00
Lukas Martini
f8b5f05d44 Improve error messages when DeepL quota is exceeded (#26704) 2023-08-29 09:14:44 +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
92c9bf731d Change video compression parameters (#26631) 2023-08-28 19:40:08 +02:00
renovate[bot]
e1b0d6bbe5 Update dependency stoplight to v3.0.2 (#26698) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 17:10:58 +02:00
Eugen Rochko
bafa60f5b9 Fix bad search type heuristic (#26673) 2023-08-28 17:08:37 +02:00
Claire
c46d297740 Fix incorrect call to PublicStatusesIndex.import (#26697) 2023-08-28 15:04:57 +02:00
Eugen Rochko
9ab2c6b479 Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
Eugen Rochko
4ecbd5bb40 Add from:me syntax to search (#26660) 2023-08-28 12:43:00 +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
Eugen Rochko
4b24a994c1 Fix multiple issues with status index mappings (#26686) 2023-08-28 11:36:17 +02:00
renovate[bot]
c51564cc67 Update DefinitelyTyped types (non-major) (#26693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 11:04:06 +02:00
renovate[bot]
62bc0e37d2 Update dependency haml_lint to v0.50.0 (#26665) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 10:32:13 +02:00
Eugen Rochko
e50d54b91a Fix not being able to negate prefix clauses in search (#26672) 2023-08-28 10:31:51 +02:00
renovate[bot]
e886929716 Update eslint (non-major) (#26694) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 10:20:02 +02:00
Eugen Rochko
f071f72a3c Change indexing jobs to use database replica (#26692) 2023-08-27 22:38:01 +02:00
Eugen Rochko
4456f65da4 Fix unnecessary condition causing seqscan when indexing (#26689) 2023-08-27 22:37:35 +02:00
Eugen Rochko
a0373d049d Change queue of job when opting into search from default to pull (#26688) 2023-08-27 18:58:20 +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
Claire
2cb30c25dc Fix nightly build version (#26676) 2023-08-26 17:34:36 +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
1201da3752 Change the pre-release versioning scheme and associated environment variables (#26653) 2023-08-25 18:26:44 +02:00
Claire
c833282412 Fix dashboard check for Elasticsearch suggested command including incorrect names (#26658) 2023-08-25 18:17:22 +02:00
jsgoldstein
5a74675fce Update ordering to use id from body of document instead of deprecated _id (#26659) 2023-08-25 18:16:08 +02:00
renovate[bot]
c0d98abf00 Update dependency immutable to v4.3.4 (#26655) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-25 17:02:33 +02:00
Claire
2a5c1dca2e Fix statuses search Elasticsearch query (#26657) 2023-08-25 17:01:56 +02:00
Claire
11b120cb64 Add Elasticsearch/OpenSearch version to “Software” in admin dashboard (#26652) 2023-08-25 12:02:09 +02:00
Claire
a9a06f5ffe Add PublicStatusesCheck to Elasticsearch index check on admin dashboard (#26650) 2023-08-25 12:01:55 +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
renovate[bot]
3a75c0fdc3 Update babel monorepo to v7.22.11 (#26640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-25 10:08:44 +02:00
Claire
b24b345375 Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-08-25 08:42:16 +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
Claire
592a675a33 Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
 2023-08-24 21:56:00 +02:00
Claire
8ed2ece44d Merge commit '5e0894ff132ef566880604b96b45ce650a9872ab' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/admin.html.haml`:
  Upstream moved `javascript_pack_tag` calls around, but we don't use them in
  the same way in glitch-soc due to the different theming system.
  Kept glitch-soc's files unchanged.
 2023-08-24 21:52:19 +02:00
Antonin Del Fabbro
6f5721e5c9 [Glitch] Change opacity of the delete icon in the search field to be more visible 
Port b271c3da75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:51:13 +02:00
Claire
a0c46afb82 Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Christian Schmidt
63ba01fb2d [Glitch] Fix some React warnings 
Port 6a4160cb5f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire
2a8e55b0ee Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire
40ee4d55df Merge commit 'd67c1089643a25ab617c51a0cd3787eb0d7831b7' into glitch-soc/merge-upstream 2023-08-24 21:38:59 +02:00
Claire
7c2c2918ac [Glitch] Fix layout of the closed registrations modal 
Port 38ec8071fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:38:08 +02:00
Christian Schmidt
2e8f2a18f9 [Glitch] Fix profile picture preview 
Port SCSS changes from 330f7e5e7e to glitch-soc

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