Jeremy Kescher
f1a71785b9
Merge remote-tracking branch 'upstream/main' into develop
2023-05-08 18:40:08 +02:00
Claire
16c5354b8c
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
Jeremy Kescher
48cfb27b7c
Merge remote-tracking branch 'upstream/main' into develop
2023-05-07 21:40:47 +02:00
Plastikmensch
179e38cf15
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +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
2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
...
Conflicts:
- .github/workflows/build-image.yml
We don't use GitHub Actions for building Docker images.
- Gemfile.lock
Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
Christian Schmidt
8f97ffe91e
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +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
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
Dean Bassett
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2023-02-13 20:05:36 +01:00
Claire
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2023-02-13 20:04:45 +01:00
Dean Bassett
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
Claire
fa433ac5a6
Further JS code style changes
2023-02-04 22:31:47 +01:00
Akira Ouchi
8ce02aa6e8
[Glitch] autofocus the compose form again on /share
...
Port e73b55184b
2023-02-03 20:58:15 +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
Nick Schonning
ed7cb79723
[Glitch] Remove extra semicolons with ESLint autofix
...
Port d9088ef327
2023-02-03 19:58:44 +01:00
Jeremy Kescher
27fdb81b65
Merge remote-tracking branch 'upstream/main' into develop
2023-01-27 00:36:49 +01:00
neatchee
20abef6590
Allow users to set the trigger height for lengthy toot auto-collapse ( #2070 )
...
* Allow users to set the trigger height for lengthy toot autocollapse
Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered
Originally authored by Dean Bassett (github.com/deanveloper)
Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18
* Remove bad escape characters
* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity
* Update comments re: lengthy toot height
* Fix inconsistent indentation
* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
Jeremy Kescher
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/features/ui/index.js
# app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
Connor Shea
00cc1536f2
[Glitch] Add listing of followed hashtags
...
Port 30e895299c
2023-01-18 17:58:18 +01:00
Claire
b5c6a116a7
[Glitch] Add support for editing media description and focus point of already-posted statuses
...
Port 4b92e59f4f
2023-01-18 17:52:45 +01:00
Jeremy Kescher
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Peter Simonsson
a36dfbb2aa
[Glitch] Fix dropdown menu positions when scrolling
...
Port fd33bcb3b2
2023-01-12 11:18:22 +01:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2022-12-16 17:53:33 +01:00
Claire
0912fb736d
[Glitch] Add follow request banner on account header
...
Port 70415714f1
2022-12-15 21:11:32 +01:00
Claire
cdba1ec5f4
[Glitch] Fix being stuck in edit mode when deleting the edited status
...
Port ebf1d74e40
2022-12-15 21:06:00 +01:00
Claire
bc91069e08
[Glitch] Change default reply language to be default language when replying to a translated reply
...
Port f70bdba926
2022-12-14 09:14:50 +01:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 23:46:41 +01:00
fef
e6c9206f5c
fix image for new custom emoji reactions
2022-12-09 23:08:44 +01:00
fef
be0bf21f3b
make number of visible reactions a vanilla setting
...
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2022-12-09 23:04:13 +01:00
fef
6d2ad83c02
make number of displayed reactions a setting
...
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
2022-12-09 23:04:13 +01:00
fef
b82984f0b5
cleanup frontend emoji reaction code
2022-12-09 23:04:13 +01:00
fef
079b0d15c5
cherry-pick emoji reaction changes
2022-12-09 23:04:12 +01:00
fef
a5c6f4f4b0
add frontend for emoji reactions
...
this is still pretty bare bones but hey, it works.
2022-12-09 23:04:11 +01:00
Claire
3ea445bb5c
[Glitch] Fix potential duplicate statuses in Explore tab
...
Port c8a1faa86b
2022-12-09 16:50:53 +01:00
Jeremy Kescher
cf912c6ccb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2022-12-04 20:53:50 +01:00
Claire
f4879c4481
Fix content-type being reset when editing toots ( #1993 )
...
Fixes #1990
2022-12-04 17:58:10 +01:00
Jeremy Kescher
495da7d1a8
Merge remote-tracking branch 'upstream/main' into develop
2022-11-30 18:24:52 +01:00
Eugen Rochko
a3052dad04
[Glitch] Add user content translations with configurable backends
...
Port 0d6b878808
2022-11-30 13:53:38 +01:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6
2022-11-29 00:15:08 +01:00
Claire
98c5ca1037
[Glitch] Fix infinite loading instead of soft 404 for non-existing remote accounts
...
Port 3ffaa966b0
2022-11-28 11:55:56 +01:00
kedama
32b43a96a7
[Glitch] Fix status mismatch of sensitive check
...
Port 14e2354eea
2022-11-28 11:53:21 +01:00
Jeremy Kescher
122870cb6b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# config/initializers/rack_attack.rb
# lib/mastodon/version.rb
2022-11-14 22:18:48 +01:00
Claire
96c1ef6d50
[Glitch] Fix media metadata being only editable once
...
Port 2d54986a03
2022-11-14 18:32:33 +01:00
Jeremy Kescher
c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2022-11-12 14:38:59 +01:00
Claire
9255bfb908
[Glitch] Add the ability to edit media attachment metadata for any unattached media
...
Port 31005aad12
2022-11-12 14:01:47 +01:00
Jeremy Kescher
5b797a34df
Merge remote-tracking branch 'upstream/main' into develop
2022-11-08 23:30:01 +01:00
Claire
9b6d6a919f
[Glitch] Fix redrafting a currently-editing post not leaving edit mode
...
Port 782b6835f7
2022-11-08 16:26:25 +01:00
Jeremy Kescher
03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# lib/mastodon/version.rb
# public/avatars/original/missing.png
2022-11-06 20:59:47 +01:00
Claire
fa293f03fa
[Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
...
Port 7c8e2b9859
2022-11-06 17:29:04 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2022-11-01 10:29:44 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +01:00
Eugen Rochko
ebfe393e9c
[Glitch] Fix upload progress not communicating processing phase in web UI
...
Port 30ef110224
2022-10-30 18:30:58 +01:00
Takeshi Umeda
8be350cc82
[Glitch] Add featured tags selector for WebUI
...
Port 4c7b5fb6c1
2022-10-28 19:24:02 +02:00
Eugen Rochko
f9f0949bd3
[Glitch] Fix case-sensitive look-up for profiles in web UI
...
Port 5e908c5a95
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
Eugen Rochko
67b4ecdd21
[Glitch] Change about page to be mounted in the web UI
...
Port 1bd00036c2
2022-10-28 19:24:02 +02:00
Jeremy Kescher
e333716df0
Merge remote-tracking branch 'upstream/main' into develop
2022-10-13 22:39:25 +02:00
Claire
7e62688a0e
Fix notification cleaning mode causing notifications to get stuck ( #1868 )
2022-10-13 20:00:20 +02:00
Claire
27a2edcb79
Fix issues with notification cleaning mode when there is a disconnection gap ( #1867 )
2022-10-13 08:55:00 +02:00
Jeremy Kescher
b153ef2672
Merge remote-tracking branch 'upstream/main' into develop
2022-10-12 07:25:19 +02:00
Claire
18f210aff6
Fix accidentally importing vanilla code in glitch-soc flavor ( #1863 )
2022-10-11 19:35:37 +02:00
Claire
b728b25c10
Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji
2022-10-11 12:43:19 +02:00
Claire
b75bf336bd
Move more modules from flavours/glitch/utils to flavours/glitch
2022-10-11 12:25:45 +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
Jeremy Kescher
f314520459
Merge remote-tracking branch 'upstream/main' into develop
2022-10-10 06:45:32 +02:00
Eugen Rochko
757e16a0b5
[Glitch] Add server banner to web app
...
Port d2528b26b6
2022-10-09 20:26:15 +02:00
Jeremy Kescher
5da4f13737
Merge remote-tracking branch 'upstream/main' into develop
2022-10-09 12:13:47 +02:00
Eugen Rochko
da67e0660a
[Glitch] Add pagination for trending statuses in web UI
...
Port f382192862
2022-10-08 20:49:02 +02:00
Eugen Rochko
6e208a817d
[Glitch] Fix not showing loading indicator when searching in web UI
...
Port cb2e198d89
2022-10-08 20:49:02 +02:00
Eugen Rochko
058b74dc0a
[Glitch] Add explore page to web UI
...
Port d4592bbfcd
2022-10-08 20:49:02 +02:00
Eugen Rochko
870f0aae48
[Glitch] Fix pop-out player appearing on mobile screens in web UI
...
Port 18ca4e0e9a
2022-10-08 20:49:02 +02:00
Jeremy Kescher
7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop
2022-08-26 08:43:43 +02:00
Claire
43a1bfd05d
[Glitch] Fix “Filter this post” potentially listing deleted filters
...
Port 2cae5f5b8d
2022-08-25 18:18:34 +02:00
Claire
3844f15da0
Remove obsolete filter local settings
2022-08-25 09:52:13 +02:00
Claire
0b733ca790
[Glitch] Add ability to filter individual posts
...
Port 50487db122
2022-08-25 09:52:13 +02:00
Claire
a15fe32e61
[Glitch] Revamp post filtering system
...
Port front-end changes from 02851848e9
2022-08-25 09:40:45 +02:00
Jeremy Kescher
71b46e3a86
Merge remote-tracking branch 'upstream/main' into develop
2022-08-25 08:57:30 +02:00
Claire
448ed92f76
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port afb8bc97d0
2022-08-25 05:16:43 +02:00
Jeremy Kescher
5206dddac7
Merge remote-tracking branch 'upstream/main' into develop
2022-08-21 18:01:10 +02:00
Shlee
8a93dd3d83
[Glitch] Update notifications.js
...
Port d92ce31c92
2022-08-21 14:44:58 +02:00
Jeremy Kescher
e354a296c1
Web UI: Allow creating polls with only one option
2022-08-12 21:17:29 +02:00
prplecake
991349e6e2
[Glitch] Add ability to follow hashtags in web UI
2022-07-30 20:00:00 -05:00
Claire
18346f4044
Add option to share CW toggle state across instances of a post
2022-07-25 11:57:09 +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
Eugen Rochko
485b43ed7e
[Glitch] Add notifications for new reports
...
Port 2936f42a14
2022-06-28 13:13:10 +02:00
Claire
e94c8b9e29
[Glitch] Change language to be carried over on reply
...
Port 14d7cf39f4
2022-06-02 11:09:19 +02:00
Claire
53c89ee44b
Add language indicator icon and local settings for status icons ( #1788 )
...
* Add language indicator
* Add local settings for status icons
* Switch to text icon for language
2022-05-27 16:34:29 +02:00
Eugen Rochko
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
2022-05-16 23:06:29 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping ( #1770 )
...
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Eugen Rochko
6fb837aa1d
[Glitch] Add limited attribute to accounts in REST API and a warning in web UI
...
Port b4d373a3df
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
2022-05-11 11:09:20 +02:00
Claire
43aff90d0e
[Glitch] Fix potentially missing statuses when reconnecting to websocket
...
Port ebe01ea194
2022-04-08 20:02:49 +02:00
Claire
ed8a0bfbb8
[Glitch] Fix older items possibly disappearing on timeline updates
...
Port 1b91359a45
2022-04-07 15:05:06 +02:00
Claire
e2f4bafc13
[Glitch] Fix possible duplicate statuses in timelines in some edge cases
...
Port dd4c156f33
2022-04-06 21:16:07 +02:00
Claire
8e04ba87b7
[Glitch] Fix reply button on media modal not giving focus to compose form
...
Port 2cd31b3177
2022-02-26 09:54:48 +01:00
Claire
ae3cd3b84c
[Glitch] Fix reporting from profile
...
Port b7cf11d5a9
2022-02-23 21:46:46 +01:00
