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
2023-05-08 22:15:00 +02:00
Jeremy Kescher
8eff35ad53
Update emoji reaction patches
2023-05-07 22:01:04 +02:00
Jeremy Kescher
48cfb27b7c
Merge remote-tracking branch 'upstream/main' into develop
2023-05-07 21:40:47 +02:00
Claire
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Jeremy Kescher
9eb149477a
Merge remote-tracking branch 'upstream/main' into develop
2023-05-06 00:39:56 +02:00
Nick Schonning
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
Eugen Rochko
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
Christian Schmidt
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
Jeremy Kescher
f3953eee78
Merge remote-tracking branch 'upstream/main' into develop
2023-04-23 20:49:47 +02:00
Ivan Rodriguez
a21a875dba
[Glitch] Fix status title for statuses without text
...
Port f05fb51ecb
2023-04-22 10:16:20 +02:00
Jeremy Kescher
3866d53b95
Merge remote-tracking branch 'upstream/main' into develop
2023-04-21 15:05:02 +02:00
Eugen Rochko
34f8e696e2
[Glitch] Change all components to use the same error page in web UI
...
Port cee357d538
2023-04-16 18:20:51 +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
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
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
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
Christian Schmidt
b632c5a55a
[Glitch] Add lang attribute to preview card
...
Port 8000a8f230
2023-02-25 14:43:57 +01:00
Renaud Chaput
81ef21a0c8
[Glitch] Rename JSX files with proper .jsx extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Claire
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2023-02-18 16:02:12 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
2023-02-17 00:26:21 +01:00
Claire
155424e52f
[Glitch] Run eslint --fix
...
I don't like it changing files this way, but it's basically what
c49213f0ea
2023-02-03 20:52:07 +01:00
Jeremy Kescher
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/components/status_action_bar.js
# app/javascript/flavours/glitch/containers/status_container.js
# app/javascript/flavours/glitch/features/status/components/action_bar.js
# app/javascript/flavours/glitch/locales/de.json
# app/javascript/flavours/glitch/locales/fr.json
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/status/components/action_bar.js
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
2023-01-05 23:29:53 +01:00
Claire
c4649ae9d4
[Glitch] Add dropdown menu item to open admin interface for remote domains
...
Port 18d00055f4
2023-01-05 16:31:20 +01:00
Claire
7e9d5bdbb9
[Glitch] Fix unnecessary re-rendering of various components when typing in web UI ( #2063 )
...
Port 9620ee90be
2023-01-05 13:32:29 +01:00
fef
18e408c6af
properly disable reactions when not logged in
2022-12-20 18:27:56 +01:00
fef
47ac7a2e50
fix image for new custom emoji reactions
2022-12-20 18:27:55 +01:00
fef
f0197c80dc
display external custom emoji reactions properly
...
Using an emoji map was completely unnecessary in
the first place, because the reaction list from
the API response includes URLs for every custom
emoji anyway. The reaction list now also contains
a boolean field indicating whether it is an
external custom emoji, which is required because
people should only be able to react with Unicode
emojis and local custom ones, not with custom
emojis from other servers.
2022-12-20 18:27:55 +01:00
fef
a2db70b3c8
rename nop handler to handleNoOp
...
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2022-12-20 18:27:53 +01:00
fef
a9bb743db7
cleanup JS imports and other minor stuff
2022-12-20 18:27:53 +01:00
fef
f129b47f13
cleanup frontend emoji reaction code
2022-12-20 18:24:20 +01:00
fef
da78479b93
move react button to action bar
2022-12-20 18:24:19 +01:00
fef
ff379c7fd0
show reactions in detailed status view
2022-12-20 18:22:04 +01:00
Claire
749c360ba0
Reuse upstream's “Posts and replies” as column heading ( #2023 )
...
Upstream does not have a column heading for “Posts and replies”, but the
text itself exists in a similar context, so re-use that translatable
string so that we can use upstream's translations.
2022-12-20 12:37:14 +01:00
Eugen Rochko
a3052dad04
[Glitch] Add user content translations with configurable backends
...
Port 0d6b878808
2022-11-30 13:53:38 +01:00
Eugen Rochko
c4d2c72924
[Glitch] Add option to open original page in dropdowns of remote content in web UI
...
Port ef582dc4f2
2022-11-10 11:06:56 +01:00
Sasha Sorokin
099b3011aa
[Glitch] Remove aria-pressed where it's redundant
...
Port d055d75172
2022-11-10 10:25:43 +01:00
Eugen Rochko
5dfb7ba35c
[Glitch] Fix missing delete and redraft link in web UI
...
Port 371d969403
2022-10-28 19:24:02 +02:00
Eugen Rochko
b36c58b99e
[Glitch] Change post editing to be enabled in web UI
...
Port 8ebff0efcb
2022-10-28 19:24:02 +02:00
Claire
885389d279
fixup! [Glitch] Change public accounts pages to mount the web UI
2022-10-28 19:24:02 +02:00
Eugen Rochko
9363e5c24e
[Glitch] Change public accounts pages to mount the web UI
...
Port 839f893168
2022-10-28 19:24:02 +02:00
Yamagishi Kazutoshi
e5720cd540
[Glitch] Add title to pages with missing title in Web UI
...
Port a5112b51fd
2022-10-28 19:24:02 +02:00
Claire
015e798394
Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/
2022-10-11 11:31:11 +02:00
Claire
d3879c07b1
Rename flavours/glitch/util into flavours/glitch/utils
2022-10-11 11:31:11 +02:00
Claire
26b687160b
Move flavours/glitch/util/initial_state to flavours/glitch/initial_state
2022-10-11 10:17:04 +02:00
Eugen Rochko
c9fadb3cae
[Glitch] Add interaction modal to logged-out web UI
...
Port 7fb738c837
2022-10-09 18:23:15 +02:00
