1609 commits

Author	SHA1	Message	Date
Claire	f05985f8ec	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.	2023-09-21 15:12:00 +02:00
Claire	5356ddbcca	Fix search results temporarily disappearing while scrolling and loading more results (#27014)	2023-09-21 13:51:21 +02:00
Claire	22ee4e057d	Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Upstream has added a parameter to `streamFrom`, while glitch-soc had an extra parameter. Ported upstream changes.	2023-09-19 12:59:23 +02:00
Claire	70cae19b6b	Fix hashtag bar being sometimes incorrectly hidden (#26960)	2023-09-19 12:25:39 +02:00
Claire	9688c5fcc4	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-18 12:09:37 +02:00
Claire	893755f4cb	Fix error in Web UI when server rules cannot be fetched (#26957)	2023-09-18 09:51:52 +02:00
Claire	e193c848fe	Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.	2023-09-15 21:25:05 +02:00
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
Claire	5d8c65f2a7	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
Claire	3ca94f6d4a	Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream	2023-09-15 20:21:40 +02:00
Claire	e14372c2d1	Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
Renaud Chaput	bd06c13204	Convert actions/account_notes into Typescript (#26601)	2023-09-11 16:09:22 +02:00
Claire	91040da871	Fix confusing behavior of mute button and volume slider in web UI (#26860)	2023-09-08 20:39:29 +02:00
Eugen Rochko	9b2bc3d1de	Add recent searches in web UI (#26834)	2023-09-07 14:56:19 +02:00
Eugen Rochko	f3a2e15f8e	Fix mute button and volume slider feeling disconnected in web UI (#26827)	2023-09-07 04:24:24 +02:00
Claire	9c1ef8302a	Add some information about Full-text search being disabled in search popout (#26756)	2023-09-06 17:23:58 +02:00
Eugen Rochko	d8bdba2f9f	Add in: to search popout in web UI (#26807)	2023-09-06 06:46:26 +02:00
Eugen Rochko	9d290c23d2	Remove obfuscation of reply count in web UI (#26768)	2023-09-05 23:57:03 +02:00
Eugen Rochko	5d20733d8d	Add infinite scrolling for search results in web UI (#26784)	2023-09-05 23:54:24 +02:00
Claire	548c032dbb	Improve interaction modal error handling (#26795)	2023-09-05 23:49:48 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
Claire	ac2dae0d11	Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' 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	ffb486648c	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	2023-09-02 13:34:54 +02:00
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
Claire	6c4c72497a	Fix search popout including full-text search instructions when full-text search is disabled (#26755)	2023-09-01 15:13:27 +02:00
Stanislas Signoud	40b69cc1cd	Add an explanation banner on switching to single column mode (#26019)	2023-08-31 12:18:46 +02:00
Tim Rogers	74eb7dbf2d	Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574)	2023-08-29 14:42:20 +02:00
Tim Rogers	ae6cf33321	Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577)	2023-08-29 10:56:19 +02:00
Eugen Rochko	bceb893159	Add search options to search popout in web UI (#26662)	2023-08-28 13:18:39 +02:00
Claire	941a9df28a	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' 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	b6b68b44a1	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' 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	88ff45a3b2	Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
Claire	b2ac93dd73	Fix selecting domains to forward reports to not passing the information correctly (#26636)	2023-08-24 14:06:27 +02:00
Christian Schmidt	152b10b624	Fix some React warnings (#26609)	2023-08-23 15:43:41 +02:00
Renaud Chaput	44ba785242	Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615)	2023-08-23 15:40:31 +02:00
Claire	10404aece8	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
Claire	2126812f65	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	2023-08-22 18:31:28 +02:00
Claire	7e25e311d5	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	2023-08-21 21:07:39 +02:00
Renaud Chaput	061fd66ee6	Remove hashtags from the last line of a status if it only contains hashtags (#26499)	2023-08-21 19:39:01 +02:00
Claire	df6e719898	Add display of out-of-band hashtags in the web interface (#26492) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-08-14 23:42:30 +02:00
Claire	d9c21293aa	Fix unfollow icon styling in advanced column (#26482)	2023-08-14 19:02:47 +02:00
mogaminsk	a664e15702	Fix "Create Account" button in interaction modal (#26459)	2023-08-14 12:04:04 +02:00
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	2023-08-13 18:47:15 +02:00
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	2023-08-11 22:15:41 +02:00
Claire	4caa9f0e69	Change the hashtag column to not display the hashtag header on pinned columns (#26416)	2023-08-09 16:32:40 +02:00
Claire	cd6f2b3cbc	Fix interaction modal layout (#26368)	2023-08-07 17:58:29 +02:00
Eugen Rochko	e325443b02	Change header of hashtag timelines in web UI (#26362)	2023-08-07 09:46:11 +02:00
Claire	b59053ff8c	Fix confirmation when closing media edition modal with unsaved changes (#26342)	2023-08-04 15:48:29 +02:00
CSDUMMI	120f5802c0	Add direct link to the Single-Sign On provider if there is only one sign up method available (#26083)	2023-08-03 16:43:15 +02:00