Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/main' into samuel/alf-login | Samuel Newman | 2024-03-20 | 17 | -55/+180 |
|\ | |||||
| * | [Statsig] Track login/logout (#3286) | dan | 2024-03-19 | 5 | -20/+40 |
| | | | | | | | | | | * [Statsig] Track login/logout * Fix missing attribution | ||||
| * | [Statsig] Track feed refresh (#3283) | dan | 2024-03-19 | 2 | -2/+15 |
| | | |||||
| * | Various e2e test fixes (#3284) | Paul Frazee | 2024-03-19 | 3 | -2/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Just use the first picture every time * Add missing testIDs * Various test fixes * Use simplified link fetcher for e2e * Disable tests for now-n * Update test-env creation | ||||
| * | use different labels for `porn` and `sexual` (#3282) | Hailey | 2024-03-19 | 1 | -4/+4 |
| | | | | | | | | | | * use different labels for `porn` and `sexual` * newline | ||||
| * | Fix detection of !no-unauthenticated (#3279) | Paul Frazee | 2024-03-19 | 1 | -1/+2 |
| | | |||||
| * | Remove dead style | Paul Frazee | 2024-03-19 | 1 | -7/+0 |
| | | |||||
| * | Merge branch 'web-fix-fonts-and-image-box' of ↵ | Paul Frazee | 2024-03-19 | 4 | -18/+73 |
| |\ | | | | | | | | | | https://github.com/alexkuz/social-app into alexkuz-web-fix-fonts-and-image-box | ||||
| | * | Add 'Liberation Sans' font for FireFox on Linux; lightbox buttons adjustments | Alexander K | 2024-03-17 | 4 | -30/+90 |
| | | | |||||
| * | | Prevent linking to post from an embed in composer (#3275) | Hailey | 2024-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typos and clarify two `accessibilityHint`s (#2923) | surfdude29 | 2024-03-19 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify accessibilityHint in Settings * Fix typo in ModerationMutedAccounts.tsx * Fix typo in ModerationBlockedAccounts.tsx * fix lint error in ModerationMutedAccounts.tsx * try again * fix lint error in index.tsx * try again * Update index.tsx * Update index.tsx --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com> | ||||
* | | | Merge remote-tracking branch 'origin/main' into samuel/alf-login | Samuel Newman | 2024-03-19 | 47 | -556/+500 |
|\| | | |||||
| * | | Merge branch 'patch-3' of https://github.com/quiple/social-app into ↵ | Paul Frazee | 2024-03-19 | 26 | -102/+141 |
| |\ \ | | | | | | | | | | | | | quiple-patch-3 | ||||
| | * \ | Merge remote-tracking branch 'upstream/main' into patch-3 | Minseo Lee | 2024-03-19 | 53 | -3348/+1589 |
| | |\ \ | |||||
| | * | | | Update Modal.tsx | Minseo Lee | 2024-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update Modal.tsx | Minseo Lee | 2024-03-16 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Update Modal.tsx | Minseo Lee | 2024-03-16 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Update ReasonOptions.tsx | Minseo Lee | 2024-03-16 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Update ReasonOptions.tsx | Minseo Lee | 2024-03-16 | 1 | -21/+24 |
| | | | | | |||||
| | * | | | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-16 | 5 | -163/+25 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-15 | 7 | -76/+11 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-15 | 2 | -3/+50 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-14 | 13 | -11/+67 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-13 | 20 | -1141/+1150 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-12 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-10 | 8 | -412/+223 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'main' into patch-3 | Minseo Lee | 2024-03-07 | 5 | -18/+35 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-06 | 5 | -3/+114 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Update src/view/screens/Settings/index.tsx | Minseo Lee | 2024-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> | ||||
| | * | | | | | | | | | | | Update src/view/screens/Settings/index.tsx | Minseo Lee | 2024-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> | ||||
| | * | | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-03-02 | 16 | -161/+196 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Update Search.tsx | Minseo Lee | 2024-02-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'main' into patch-3 | Minseo Lee | 2024-02-29 | 3 | -8/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-02-28 | 14 | -96/+162 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Update ChangePassword.tsx | Minseo Lee | 2024-02-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Update ChangePassword.tsx | Minseo Lee | 2024-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'main' into patch-3 | Minseo Lee | 2024-02-27 | 21 | -46/+270 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Update NotFound.tsx | Minseo Lee | 2024-02-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | accessibilityLabel | Minseo Lee | 2024-02-24 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Update NotFound.tsx | Minseo Lee | 2024-02-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Update NotFound.tsx | Minseo Lee | 2024-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-02-24 | 19 | -347/+297 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-02-22 | 18 | -126/+161 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'main' into patch-3 | Minseo Lee | 2024-02-19 | 17 | -647/+529 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Update ExportCarDialog.tsx | Minseo Lee | 2024-02-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update Moderation.tsx | Minseo Lee | 2024-02-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update index.tsx | Minseo Lee | 2024-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update Moderation.tsx | Minseo Lee | 2024-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update LanguageSettings.tsx | Minseo Lee | 2024-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3 | Minseo Lee | 2024-02-16 | 2 | -82/+96 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |