Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update social links #2278

Merged
merged 2 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/AboutViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ @interface AboutViewController ()

@property (weak, nonatomic) IBOutlet UITableViewCell *sendFeedback;
@property (weak, nonatomic) IBOutlet UITableViewCell *openGithub;
@property (weak, nonatomic) IBOutlet UITableViewCell *openMastodon;
@property (weak, nonatomic) IBOutlet UITableViewCell *openFediverse;
@property (weak, nonatomic) IBOutlet UITableViewCell *openDiscord;

@property (weak, nonatomic) IBOutlet UITableViewCell *upgradeApkCell;
Expand Down Expand Up @@ -106,10 +106,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
[UIApplication openURL:@"mailto:tblodt@icloud.com?subject=Feedback%20for%20iSH"];
} else if (cell == self.openGithub) {
[UIApplication openURL:@"https://github.com/ish-app/ish"];
} else if (cell == self.openMastodon) {
} else if (cell == self.openFediverse) {
[UIApplication openURL:@"https://publ.ish.app/ish"];
} else if (cell == self.openDiscord) {
[UIApplication openURL:@"https://discord.gg/HFAXj44"];
[UIApplication openURL:@"https://discord.gg/ish"];
} else if (cell == self.exportContainerCell) {
// copy the files to the app container so they can be extracted from iTunes file sharing
NSURL *container = ContainerURL();
Expand Down
4 changes: 2 additions & 2 deletions app/Base.lproj/About.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
<rect key="frame" x="0.0" y="0.0" width="293.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="iSH on Mastodon" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wyO-AY-ccm">
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="iSH on the Fediverse" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wyO-AY-ccm">
<rect key="frame" x="16" y="0.0" width="269.5" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
Expand Down Expand Up @@ -392,8 +392,8 @@
<outlet property="exportContainerCell" destination="OIE-9g-Btx" id="qxo-l5-0Mq"/>
<outlet property="launchCommandField" destination="gDx-hv-hhV" id="RQn-gk-Dx8"/>
<outlet property="openDiscord" destination="K5r-jy-Dzl" id="b4l-Vr-6l8"/>
<outlet property="openFediverse" destination="bge-GA-6p8" id="ghM-X8-itm"/>
<outlet property="openGithub" destination="F4i-eC-hQ6" id="66M-sQ-RJR"/>
<outlet property="openMastodon" destination="bge-GA-6p8" id="El9-To-qws"/>
<outlet property="resetMountsCell" destination="Bqt-ud-CI0" id="2AS-2S-XCr"/>
<outlet property="saddamHussein" destination="bcR-YQ-PkC" id="mUA-6I-CB9"/>
<outlet property="sendFeedback" destination="gMm-4C-5X3" id="nhX-ZH-zyP"/>
Expand Down
2 changes: 1 addition & 1 deletion app/Icons/Icons.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key></key>
<dict>
<key>link</key>
<string>https://twitter.com/tblodt</string>
<string>https://mastodon.social/@tbodt</string>
<key>author</key>
<string>@tbodt</string>
<key>description</key>
Expand Down
2 changes: 1 addition & 1 deletion emu/float80.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ float80 f80_add(float80 a, float80 b) {
sign = 1;
}

// a bizarre special case https://twitter.com/tblodt/status/1262145524620234752
// a bizarre special case https://web.archive.org/web/20200517222437/https://twitter.com/tblodt/status/1262145524620234752
if (signif == 0 && a_signif != 0 && f80_rounding_mode == round_down)
return (float80) {.sign = 1};

Expand Down
4 changes: 2 additions & 2 deletions fastlane/footer.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Send bug reports or feedback here: https://github.com/ish-app/ish/issues (or by email, if you prefer)
Follow iSH on Twitter: https://twitter.com/iSH_app
Join the Discord: https://discord.gg/HFAXj44
Follow iSH on the Fediverse: @ish@ish.app
Join the Discord: https://discord.gg/ish
Give me money here: https://patreon.com/tbodt

Loading