Ind.ie is now Small Technology Foundation.
Commit 1a149377 authored by Ram's avatar Ram

Merge branch 'master' into fix_install

parents 4c92316d 32758108
......@@ -398,12 +398,10 @@ class TimelineViewController: NSViewController, WKNavigationDelegate
{
println(">>>>>\(CurrentTimeline.id!)")
var noticeBody = "<p><strong>No messages yet.</strong></p>"
if CurrentTimeline.id! == "allfriends"
{
noticeBody += "<p>This is where you will see messages from all of your friends. Messages you send will also be seen by all of your friends.</p><p>To avoid confusion, when replying to friends here, start your messaegs them with <em>@<their handle></em>. Although this does nothing special at the moment, it might give them a notification in the future.</p><p>Also, remember that your friends won’t see each other’s messages unless they are also friends with each other. In the future, @handle could help with discovery if we link handles to people’s public pages (thereby making it possible for your friends to discover each other through your conversations on this timeline).</p>"
noticeBody += "<p>This is where you will see messages from all of your friends. Messages you send will also be seen by all of your friends.</p><p>To avoid confusion, when replying to friends here, start your messages them with <em>@<their handle></em>. Although this does nothing special at the moment, it might give them a notification in the future.</p><p>Also, remember that your friends won’t see each other’s messages unless they are also friends with each other. In the future, @handle could help with discovery if we link handles to people’s public pages (thereby making it possible for your friends to discover each other through your conversations on this timeline).</p>"
}
if CurrentTimeline.id! == "private"
{
......
......@@ -59,6 +59,10 @@ class VerticalTabBarViewController: NSViewController
//
// Setup keyboard shortcuts
//
delay(0.1)
{
self.simulateButtonPress(self.everyoneAtIndieButton)
}
// let command1Shortcut = MASShortcut(keyCode: UInt(kVK_ANSI_1), modifierFlags: NSEventModifierFlags.CommandKeyMask.rawValue)
// let command2Shortcut = MASShortcut(keyCode: UInt(kVK_ANSI_2), modifierFlags: NSEventModifierFlags.CommandKeyMask.rawValue)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment