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.
11 months ago
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.
11 months ago
4fdbffc57c
Merge pull request #2522 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to b2c5b20ef2
11 months ago
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
11 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
60eb57ce1b
Fix HAML listing issue
11 months ago
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
11 months ago
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
11 months ago
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
11 months ago
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.
11 months ago
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 months ago
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.
11 months ago
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.
11 months ago
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
11 months ago
18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f476d9dab2
11 months ago
33dd5d8179
Fix Ruby lint issues
11 months ago
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.
11 months ago
c8fe36c349
Merge pull request #2517 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3bf896c973
11 months ago
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
11 months ago
bb4fa0c374
[Glitch] Rewrite `AutosuggestTextarea` as Functional Component
...
Port 9c8891b39a
11 months ago
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
11 months ago
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.
11 months ago
537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes up to a916251d8a
11 months ago
f62bafc7a1
Fix HAML linting issue
11 months ago
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.
11 months ago
b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2e6bf60f15
11 months ago
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`
11 months ago
98f50429d5
Merge pull request #2511 from ClearlyClaire/glitch-soc/cleanup-2
...
Further reduce code differences with upstream
11 months ago
df5c64fe57
Further reduce differences with upstream
11 months ago
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
11 months ago
4b2ddaf106
Further reduce differences with upstream
11 months ago
408d4710ed
Further reduce differences with upstream
11 months ago
a27abb4802
Further reduce code differences with upstream ( #2509 )
11 months ago
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
11 months ago
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179eed1de7fb7fa9f8d34620b
11 months ago
c0e562916c
Fix glitch-soc being uninstallable because of yanked dependency ( #2507 )
11 months ago
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
12 months ago
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
12 months ago
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
12 months ago
13902903d3
Merge pull request #2497 from ClearlyClaire/glitch-soc/ports/account_notes-typescript
...
Port upstream's TypeScript refactor of account_notes
12 months ago
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
12 months ago
9ac73a1fbf
[Glitch] Change `eslint` config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
12 months ago
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
12 months ago
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
12 months ago
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
12 months ago
046cb408b7
[Glitch] Fix front-end bug when processing relationship-related account actions
...
Port 287520453c
12 months ago
c3a0d5aca3
[Glitch] Fix Redux types
...
Port 0712cc2b99
12 months ago
6fb5fafd28
[Glitch] Convert `actions/account_notes` into Typescript
...
Port bd06c13204
12 months ago
Claire
Brian Holley
pajowu
Aleks Xhuvani
mogaminsk
Renaud Chaput
Essem
Eugen Rochko
Christian Schmidt
Stanislas Signoud