Jeremy Kescher
|
9fe04326ea
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# .github/workflows/build-image.yml
# config/routes.rb
# db/schema.rb
# lib/mastodon/version.rb
|
2023-05-09 23:26:00 +02:00 |
|
Claire
|
a8939e9098
|
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
Port 598e63dad2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-05-08 22:15:00 +02:00 |
|
Jeremy Kescher
|
628c027049
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-05-08 00:40:33 +02:00 |
|
Claire
|
de74acbe0c
|
Fix some more Javascript linting issues and discrepancies with upstream (#2209)
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
|
2023-05-07 21:43:25 +02:00 |
|
Jeremy Kescher
|
48cfb27b7c
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-05-07 21:40:47 +02:00 |
|
Claire
|
ed0a407888
|
Fix thread lines not being properly updated when new posts are received (#2210)
|
2023-05-07 20:06:10 +02:00 |
|
Jeremy Kescher
|
9eb149477a
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-05-06 00:39:56 +02:00 |
|
Claire
|
edec08b970
|
Disable full-width media in thread view
|
2023-04-29 12:43:01 +02:00 |
|
Eugen Rochko
|
7b01b7c3bf
|
[Glitch] Add lines to threads in web UI
Port 290e4aba31 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-04-29 12:08:13 +02:00 |
|
Jeremy Kescher
|
1e866e57ac
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-04-10 08:14:20 +02:00 |
|
Nick Schonning
|
bfe46d08f9
|
[Glitch] Ensure tabIndex is number instead of string
Port ec0c104bf2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-04-09 14:47:29 +02:00 |
|
Jeremy Kescher
|
722b6697d7
|
Merge remote-tracking branch 'upstream/main' into develop
|
2023-03-28 17:31:34 +02:00 |
|
neatchee
|
8215df76c0
|
[Glitch] Remove legacy decorators syntax
Port d1b057a0ac to glitch-soc
|
2023-03-27 08:51:57 +02:00 |
|
Jeremy Kescher
|
047286d54e
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
|
2023-03-06 16:33:21 +01:00 |
|
Christian Schmidt
|
0e476f3c4f
|
[Glitch] Add lang attribute to media and poll options
Port d3eefead30 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-03-05 17:52:53 +01:00 |
|
Jeremy Kescher
|
7318b74ebf
|
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
|
2023-03-05 12:34:16 +01:00 |
|
Renaud Chaput
|
81ef21a0c8
|
[Glitch] Rename JSX files with proper .jsx extension
Port 44a7d87cb1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2023-02-25 14:35:31 +01:00 |
|