Jeremy Kescher
968dce888d
Remove duplicate strings
2023-05-10 00:42:22 +02:00
Jeremy Kescher
6137ede4e8
Remove leftover German translation
2023-05-10 00:38:33 +02:00
Jeremy Kescher
1fad578552
Remove old emoji reaction-related strings and translations
2023-05-10 00:34:03 +02:00
neatchee
a6f1533aa0
Restore loc files for non-English languages; CrowdIn should handle this
2023-05-10 00:32:00 +02:00
Jeremy Kescher
ed5e07cc5d
Remove further leftover makeCustomEmojiMap references
2023-05-10 00:07:26 +02:00
Jeremy Kescher
54cf5721ac
Run rubocop -a
2023-05-09 23:44:20 +02:00
Jeremy Kescher
12f0a5333f
Add back missing visibleReactions variable to both initial_state.js files
2023-05-09 23:44:20 +02:00
Jeremy Kescher
f26f4676db
Add missing visible_reactions to vanilla initial_state typedef
2023-05-09 23:26:15 +02:00
Jeremy Kescher
b5eb2b639c
Fix max_reactions typedef
2023-05-09 23:26:15 +02:00
Jeremy Kescher
27df8a9079
Move reaction endpoints from route.rb to api.rb
2023-05-09 23:26:15 +02:00
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
Jeremy Kescher
56079b0e1a
Move reaction locale to locales-glitch
2023-05-09 23:04:44 +02:00
Jeremy Kescher
499450dd9d
Remove old makeCustomEmojiMap function
2023-05-09 21:43:21 +02:00
Jeremy Kescher
9538e520d2
Exclude reactions from email notification types
2023-05-09 21:36:31 +02:00
Jeremy Kescher
4b9437b9d4
Adjust order of with_options to emoji patch
2023-05-09 21:30:51 +02:00
Claire
f08f6d20e6
Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-09 14:47:11 +02:00
Renaud Chaput
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
2023-05-08 22:15:00 +02:00
Renaud Chaput
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2023-05-08 22:15:00 +02:00
Claire
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
Claire
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
2023-05-08 22:15:00 +02:00
Eugen Rochko
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
2023-05-08 22:15: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
Claire
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2023-05-08 21:09:49 +02:00
Jeremy Kescher
d183f8c306
Bump version
2023-05-08 19:38:15 +02:00
Jeremy Kescher
0cf94443bd
Rubocop fixes
2023-05-08 19:37:56 +02:00
Jeremy Kescher
8c64325cc6
Fix n+1 query in settings migration for emoji reaction settings
2023-05-08 19:34:04 +02:00
Claire
8b31030fe4
Fix rubocop issues in glitch-soc-specific code
2023-05-08 19:28:43 +02:00
Claire
d77fbbed73
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
Jeremy Kescher
f1a71785b9
Merge remote-tracking branch 'upstream/main' into develop
2023-05-08 18:40:08 +02:00
Claire
f89f3a8566
Fix glitch-soc's thread line styling ( #2214 )
...
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2023-05-08 18:21:36 +02:00
Claire
61f3e0e95e
Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-08 17:59:28 +02:00
Eugen Rochko
8bf9bd5ac8
[Glitch] Fix n+1 query in settings migration
...
Port 0ad2413b35
2023-05-08 16:15:10 +02:00
Eugen Rochko
75e28731a5
[Glitch] Fix transaction around settings migration
...
Port f1c1fa1411
2023-05-08 16:12:05 +02:00
fusagiko / takayamaki
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
Eugen Rochko
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
Claire
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
Nick Schonning
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
Christian Schmidt
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +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
628c027049
Merge remote-tracking branch 'upstream/main' into develop
2023-05-08 00:40:33 +02:00
Jeremy Kescher
7ae19ae728
Reactions: Return 404 when status should not be visible, asynchronous unreact
2023-05-07 23:27:19 +02:00
Jeremy Kescher
46b97c9826
Remove failing skip_before_action from v1/custom_emojis_controller.rb
...
Fixes incorrect merge at 9eb149477a
2023-05-07 23:15:28 +02:00
