Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
Jeong Arm
94c4c7f330
[Glitch] Fix open status on media modal
...
Port 922f086253
2023-12-19 20:17:45 +01:00
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Claire
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
Claire
cd1e3ac2c7
Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
Upstream refactored this code, the conflict was because of an extra supported
parameter, `allow_local_only`.
Updated the controller to follow upstream's refactor, and moved the extra
parameter definition accordingly.
2023-12-19 19:51:40 +01:00
Claire
4fdbffc57c
Merge pull request #2522 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to b2c5b20ef2
2023-12-19 18:20:34 +01:00
Brian Holley
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
2023-12-18 20:59:33 +01:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
pajowu
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
2023-12-18 19:15:57 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
60eb57ce1b
Fix HAML listing issue
2023-12-18 19:07:15 +01:00
Claire
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
2023-12-18 18:49:48 +01:00
Aleks Xhuvani
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
2023-12-18 18:42:30 +01:00
Aleks Xhuvani
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
2023-12-18 18:42:07 +01:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
cd2ee0ec5f
Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept ours.
- `yarn.lock`:
Upstream changed from yarn 1 to yarn 4, but we had some different
dependencies.
Updated to yarn 4 and re-added our dependencies.
2023-12-18 18:25:33 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Claire
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
2023-12-18 13:20:08 +01:00
Claire
18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f476d9dab2
2023-12-18 13:19:45 +01:00
Claire
33dd5d8179
Fix Ruby lint issues
2023-12-17 23:17:55 +01:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
c8fe36c349
Merge pull request #2517 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3bf896c973
2023-12-17 20:06:18 +01:00
mogaminsk
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
2023-12-17 18:03:22 +01:00
Claire
bb4fa0c374
[Glitch] Rewrite AutosuggestTextarea as Functional Component
...
Port 9c8891b39a
2023-12-17 17:59:33 +01:00
Renaud Chaput
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
2023-12-17 17:50:31 +01:00
Claire
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire
537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes up to a916251d8a
2023-12-17 17:42:22 +01:00
Claire
f62bafc7a1
Fix HAML linting issue
2023-12-17 16:37:11 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Claire
b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2e6bf60f15
2023-12-12 19:45:18 +01:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Claire
98f50429d5
Merge pull request #2511 from ClearlyClaire/glitch-soc/cleanup-2
...
Further reduce code differences with upstream
2023-12-10 18:03:04 +01:00
Claire
df5c64fe57
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
2023-12-09 21:19:43 +01:00
Claire
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
408d4710ed
Further reduce differences with upstream
2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
Claire
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
2023-12-09 20:29:15 +01:00
Claire
b2647bc3f2
[Glitch] Update Avatar, AvatarComposite, and AvatarOverlay components ( #2508 )
...
Various ports including 8dfe5179eed1de7fb7fa9f8d34620b
2023-12-09 18:33:42 +01:00
Claire
c0e562916c
Fix glitch-soc being uninstallable because of yanked dependency ( #2507 )
2023-12-06 13:32:27 +01:00
Claire
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
2023-12-04 13:30:27 +01:00
Essem
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
2023-12-04 13:30:17 +01:00
Claire
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
2023-12-03 20:57:42 +01:00
Claire
13902903d3
Merge pull request #2497 from ClearlyClaire/glitch-soc/ports/account_notes-typescript
...
Port upstream's TypeScript refactor of account_notes
2023-12-03 20:57:23 +01:00
Eugen Rochko
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
2023-12-03 19:39:08 +01:00
Renaud Chaput
9ac73a1fbf
[Glitch] Change eslint config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
2023-12-03 16:44:40 +01:00
Christian Schmidt
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
2023-12-03 16:38:41 +01:00
Stanislas Signoud
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
2023-12-03 16:38:41 +01:00
Eugen Rochko
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
2023-12-03 16:38:41 +01:00
