kouhai dev
46072173a9
th: merge glitch again (lol)
2023-09-20 00:27:27 -07:00
kouhai dev
58f370b822
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:27 -07:00
Ariadne Conill
c7447b1ad0
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into chore/merge-20230511-1
2023-09-20 00:27:27 -07:00
kouhai dev
ba51b556df
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
ad8fd63ff4
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
3f741c8549
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
1642877504
th: fix build
2023-09-20 00:27:26 -07:00
kouhai dev
333c6154c7
th: fix extension
2023-09-20 00:27:26 -07:00
kouhai dev
3f21a25d46
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
18e826010d
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
976a04e366
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
kouhai dev
0e17437861
th: Merge remote-tracking branch 'glitch/main'
2023-09-20 00:27:26 -07:00
bd0986e5d7
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 15:41:50 +02:00
cd902b7fd4
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 07:00:38 +02:00
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
db90f2b456
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port ee22b32aef
2023-07-02 12:00:03 +02:00
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
2023-07-02 11:59:31 +02:00
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
2023-07-02 11:58:51 +02:00
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
2023-07-02 11:55:34 +02:00
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
2023-07-02 11:55:08 +02:00
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
2023-07-02 11:54:47 +02:00
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
ee22b32aef
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
2751a6d716
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
2023-06-27 13:25:21 +02:00
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
2023-06-27 13:21:55 +02:00
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
2023-06-27 13:21:14 +02:00
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
2023-06-25 17:40:01 +02:00
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
2023-06-25 17:40:01 +02:00
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
2023-06-25 17:40:01 +02:00
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
2023-06-25 14:27:46 +02:00
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
2023-06-25 14:27:46 +02:00
f0999de66f
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 6c4a6bd115
2023-06-25 14:27:46 +02:00
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
kouhai dev
Ariadne Conill
Plastikmensch