about summary refs log tree commit diff
path: root/src/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/main' into samuel/alf-loginSamuel Newman2024-03-2017-55/+180
|\
| * [Statsig] Track login/logout (#3286)dan2024-03-195-20/+40
| | | | | | | | | | * [Statsig] Track login/logout * Fix missing attribution
| * [Statsig] Track feed refresh (#3283)dan2024-03-192-2/+15
| |
| * Various e2e test fixes (#3284)Paul Frazee2024-03-193-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)Hailey2024-03-191-4/+4
| | | | | | | | | | * use different labels for `porn` and `sexual` * newline
| * Fix detection of !no-unauthenticated (#3279)Paul Frazee2024-03-191-1/+2
| |
| * Remove dead stylePaul Frazee2024-03-191-7/+0
| |
| * Merge branch 'web-fix-fonts-and-image-box' of ↵Paul Frazee2024-03-194-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 adjustmentsAlexander K2024-03-174-30/+90
| | |
| * | Prevent linking to post from an embed in composer (#3275)Hailey2024-03-191-1/+1
| | |
| * | Fix typos and clarify two `accessibilityHint`s (#2923)surfdude292024-03-193-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-loginSamuel Newman2024-03-1947-556/+500
|\| |
| * | Merge branch 'patch-3' of https://github.com/quiple/social-app into ↵Paul Frazee2024-03-1926-102/+141
| |\ \ | | | | | | | | | | | | quiple-patch-3
| | * \ Merge remote-tracking branch 'upstream/main' into patch-3Minseo Lee2024-03-1953-3348/+1589
| | |\ \
| | * | | Update Modal.tsxMinseo Lee2024-03-161-1/+1
| | | | |
| | * | | Update Modal.tsxMinseo Lee2024-03-161-1/+3
| | | | |
| | * | | Update Modal.tsxMinseo Lee2024-03-161-6/+6
| | | | |
| | * | | Update ReasonOptions.tsxMinseo Lee2024-03-161-2/+2
| | | | |
| | * | | Update ReasonOptions.tsxMinseo Lee2024-03-161-21/+24
| | | | |
| | * | | Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-165-163/+25
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-157-76/+11
| | |\ \ \
| | * \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-152-3/+50
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-1413-11/+67
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-1320-1141/+1150
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-121-0/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-108-412/+223
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'main' into patch-3Minseo Lee2024-03-075-18/+35
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-065-3/+114
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update src/view/screens/Settings/index.tsxMinseo Lee2024-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
| | * | | | | | | | | | | Update src/view/screens/Settings/index.tsxMinseo Lee2024-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
| | * | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-03-0216-161/+196
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update Search.tsxMinseo Lee2024-02-291-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'main' into patch-3Minseo Lee2024-02-293-8/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-02-2814-96/+162
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update ChangePassword.tsxMinseo Lee2024-02-271-1/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update ChangePassword.tsxMinseo Lee2024-02-271-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'main' into patch-3Minseo Lee2024-02-2721-46/+270
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update NotFound.tsxMinseo Lee2024-02-241-1/+5
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | accessibilityLabelMinseo Lee2024-02-243-4/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Update NotFound.tsxMinseo Lee2024-02-241-0/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Update NotFound.tsxMinseo Lee2024-02-241-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-02-2419-347/+297
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-02-2218-126/+161
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'main' into patch-3Minseo Lee2024-02-1917-647/+529
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Update ExportCarDialog.tsxMinseo Lee2024-02-161-1/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update Moderation.tsxMinseo Lee2024-02-161-1/+3
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update index.tsxMinseo Lee2024-02-161-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update Moderation.tsxMinseo Lee2024-02-161-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update LanguageSettings.tsxMinseo Lee2024-02-161-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'bluesky-social:main' into patch-3Minseo Lee2024-02-162-82/+96
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \