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
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
Christian Schmidt
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +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
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
66ade5c1fd
properly disable reactions when not logged in
2022-12-09 23:08:45 +01:00
fef
e6c9206f5c
fix image for new custom emoji reactions
2022-12-09 23:08:44 +01:00
fef
0ea02e608c
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-09 23:08:44 +01:00
fef
6aa7d7fb12
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-09 23:08:42 +01:00
fef
7187d6f9cf
cleanup JS imports and other minor stuff
2022-12-09 23:08:42 +01:00
fef
b82984f0b5
cleanup frontend emoji reaction code
2022-12-09 23:04:13 +01:00
fef
8398f7ad4e
move react button to action bar
2022-12-09 23:04:12 +01:00
fef
91fcd87069
show reactions in detailed status view
2022-12-09 23:04:11 +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
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
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
Rens Groothuijsen
41fa50ac86
[Glitch] Add warning for sensitive audio posts
...
Port e6979aa6d4
2022-08-15 14:57:57 +02:00
Claire
a5f81e1abd
Improve interaction between out-of-CW attachments and collapsed toots
2022-07-24 13:16:03 +02:00
Claire
3f4e27ab6f
Add local setting toggle to move media attachments outside CWs
...
Fixes #1812
2022-07-24 11:10:49 +02:00
Eugen Rochko
30e7836a19
[Glitch] Add customizable user roles
...
Port front-end changes from 44b2ee3485
2022-07-05 11:35:32 +02:00
Claire
bb12af7250
Swap position of media attachments and polls
2022-04-20 22:07:13 +02:00
CommanderRoot
9b95077885
[Glitch] Replace deprecated String.prototype.substr()
...
Port 0ec695e036
2022-04-06 16:08:33 +02:00
Eugen Rochko
642b5a621a
[Glitch] Chore: Disable menu items for editing statuses in web UI ( #17497 )
...
Port 3dc1e3cfc3
2022-02-10 19:10:59 +01:00
Eugen Rochko
5e67858fbc
[Glitch] Add editing for published statuses
...
Port 63002cde03
2022-02-10 19:10:20 +01:00
Eugen Rochko
44b06c4d96
[Glitch] Add edit history to web UI
...
Port fd3a45e348
2022-02-09 17:51:35 +01:00
Eugen Rochko
d4654dc892
[Glitch] Add support for editing for published statuses
...
Port front-end changes from 1060666c58
2022-01-20 00:03:41 +01:00
Claire
5effc0f8fa
[Glitch] Add support for private pinned posts
...
Port JS changes from d5c9feb7b7
2022-01-17 08:35:27 +01:00
Eugen Rochko
a7f6524c6b
[Glitch] Change routing paths to use usernames in web UI
...
Port 52e5c07948
2021-09-26 21:35:57 +02:00
Claire
6bbcd99f14
Fix media attachments not being displayed on polls
...
Fixes #1595
2021-09-08 16:36:30 +02:00
Eugen Rochko
d973a90bcc
[Glitch] Fix not being able to open audio modal in web UI
...
Port a8c471fcc0
2021-05-07 22:47:09 +02:00
Mélanie Chauvel
0e7484209c
[Glitch] Slightly reorder three dots menu on toots to make it more intuitive
...
Port f5fefdc11a
2021-02-12 10:55:37 +01:00
Eugen Rochko
51d0e1c7b4
[Glitch] Fix hardcoded frame rate for frame by frame video navigation in web UI
...
Port f970e1fab6
2020-11-25 15:46:09 +01:00
