adium 5651:1af72510ff18: Merged adium-1.6 into libotr4.0.0.
commits at adium.im
commits at adium.im
Wed Jul 10 12:12:21 UTC 2013
details: http://hg.adium.im/adium/rev/1af72510ff18
revision: 5651:1af72510ff18
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jul 10 14:11:14 2013 +0200
Merged adium-1.6 into libotr4.0.0.
diffs (truncated from 144438 to 1000 lines):
diff -r 991f62ac6f10 -r 1af72510ff18 .hgtags
--- a/.hgtags Tue Jul 09 23:02:41 2013 +0200
+++ b/.hgtags Wed Jul 10 14:11:14 2013 +0200
@@ -6,3 +6,6 @@
0000000000000000000000000000000000000000 adium-1.5.4
90a171a6b0fc033ebeba46112223e20fcee0a004 1.5.6
fc2294917bf61da7cf8c1560db443fe29e2acfb8 1.5.5
+a40ffe152e617ebb603ce3c6677eef0ce00cb1ad 1.5.7
+a40ffe152e617ebb603ce3c6677eef0ce00cb1ad 1.5.7
+c72b164f75a705caf2b01853be031399d10c254e 1.5.7
diff -r 991f62ac6f10 -r 1af72510ff18 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Jul 09 23:02:41 2013 +0200
+++ b/Adium.xcodeproj/project.pbxproj Wed Jul 10 14:11:14 2013 +0200
@@ -1059,6 +1059,8 @@
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */; };
5AA2A0EE14B3EFF500B4DB65 /* AIOSCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5ACA086A17873AEA00B15047 /* AIButtonWithCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5ACA086B17873AEA00B15047 /* AIButtonWithCursor.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */; };
5ACF27391392C74A004B6AEF /* AIHighlightingTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */; };
5ACF273A1392C74A004B6AEF /* AIHighlightingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */; };
5ACF273B1392C74A004B6AEF /* AIPreferenceCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */; };
@@ -1347,6 +1349,14 @@
765F5D6F162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D6E162F357E00C57904 /* AIOTRSMPSecretAnswerWindowController.xib */; };
765F5D71162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */; };
765F5D74162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */; };
+ 7652804C175FC0F500710EC8 /* RequestFieldBoolean.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */; };
+ 7652804D175FC0F500710EC8 /* RequestFieldChoice.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */; };
+ 7652804E175FC0F500710EC8 /* RequestFieldInteger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */; };
+ 7652804F175FC0F500710EC8 /* RequestFieldList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528042175FC0EB00710EC8 /* RequestFieldList.xib */; };
+ 76528050175FC0F500710EC8 /* RequestFieldString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528043175FC0EB00710EC8 /* RequestFieldString.xib */; };
+ 76528054175FCEF700710EC8 /* RequestFieldMultilineString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528052175FCEF700710EC8 /* RequestFieldMultilineString.xib */; };
+ 76528055175FCEF700710EC8 /* RequestFieldSecureString.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528053175FCEF700710EC8 /* RequestFieldSecureString.xib */; };
+ 7652805A175FD35B00710EC8 /* RequestFieldMultiList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76528059175FD35B00710EC8 /* RequestFieldMultiList.xib */; };
765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
@@ -4009,6 +4019,8 @@
5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-AddressBookIntegration.xib"; path = "Resources/Preferences-AddressBookIntegration.xib"; sourceTree = "<group>"; };
5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Encryption.xib"; path = "Resources/Preferences-Encryption.xib"; sourceTree = "<group>"; };
5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-MessageAlerts.xib"; path = "Resources/Preferences-MessageAlerts.xib"; sourceTree = "<group>"; };
+ 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIButtonWithCursor.h; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.h"; sourceTree = "<group>"; };
+ 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIButtonWithCursor.m; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.m"; sourceTree = "<group>"; };
5ACF27331392C585004B6AEF /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = Resources/Preferences.xib; sourceTree = "<group>"; };
5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIHighlightingTextField.h; path = "Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.h"; sourceTree = "<group>"; };
5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIHighlightingTextField.m; path = "Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m"; sourceTree = "<group>"; };
@@ -4420,6 +4432,14 @@
765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIOTRSMPSharedSecretWindowController.xib; path = Resources/AIOTRSMPSharedSecretWindowController.xib; sourceTree = "<group>"; };
765F5D72162F48FA00C57904 /* AIOTRSMPSharedSecretWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRSMPSharedSecretWindowController.h; path = Source/AIOTRSMPSharedSecretWindowController.h; sourceTree = "<group>"; };
765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRSMPSharedSecretWindowController.m; path = Source/AIOTRSMPSharedSecretWindowController.m; sourceTree = "<group>"; };
+ 7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldBoolean.xib; path = "Plugins/Purple Service/Request UI/RequestFieldBoolean.xib"; sourceTree = "<group>"; };
+ 76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldChoice.xib; path = "Plugins/Purple Service/Request UI/RequestFieldChoice.xib"; sourceTree = "<group>"; };
+ 76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldInteger.xib; path = "Plugins/Purple Service/Request UI/RequestFieldInteger.xib"; sourceTree = "<group>"; };
+ 76528042175FC0EB00710EC8 /* RequestFieldList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldList.xib; path = "Plugins/Purple Service/Request UI/RequestFieldList.xib"; sourceTree = "<group>"; };
+ 76528043175FC0EB00710EC8 /* RequestFieldString.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldString.xib; path = "Plugins/Purple Service/Request UI/RequestFieldString.xib"; sourceTree = "<group>"; };
+ 76528052175FCEF700710EC8 /* RequestFieldMultilineString.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldMultilineString.xib; path = "Plugins/Purple Service/Request UI/RequestFieldMultilineString.xib"; sourceTree = "<group>"; };
+ 76528053175FCEF700710EC8 /* RequestFieldSecureString.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldSecureString.xib; path = "Plugins/Purple Service/Request UI/RequestFieldSecureString.xib"; sourceTree = "<group>"; };
+ 76528059175FD35B00710EC8 /* RequestFieldMultiList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RequestFieldMultiList.xib; path = "Plugins/Purple Service/Request UI/RequestFieldMultiList.xib"; sourceTree = "<group>"; };
765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
@@ -6110,6 +6130,14 @@
34C2CF8F0633405C0018E5D2 /* Request UI */ = {
isa = PBXGroup;
children = (
+ 7652803F175FC0EB00710EC8 /* RequestFieldBoolean.xib */,
+ 76528040175FC0EB00710EC8 /* RequestFieldChoice.xib */,
+ 76528041175FC0EB00710EC8 /* RequestFieldInteger.xib */,
+ 76528059175FD35B00710EC8 /* RequestFieldMultiList.xib */,
+ 76528042175FC0EB00710EC8 /* RequestFieldList.xib */,
+ 76528043175FC0EB00710EC8 /* RequestFieldString.xib */,
+ 76528052175FCEF700710EC8 /* RequestFieldMultilineString.xib */,
+ 76528053175FCEF700710EC8 /* RequestFieldSecureString.xib */,
34AEE7E808E35A5800AE1C78 /* ESPurpleRequestAbstractWindowController.h */,
34AEE7E908E35A5800AE1C78 /* ESPurpleRequestAbstractWindowController.m */,
3499F4A706309AF60035B468 /* ESPurpleRequestWindowController.h */,
@@ -7676,6 +7704,8 @@
6334FF370F9C14BF003C77A9 /* Button with a popup menu for toolbar items */,
6334FF340F9C14BF003C77A9 /* Button with rollover delegate action */,
6334FF310F9C14BF003C77A9 /* Auto-completing textField */,
+ 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */,
+ 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */,
);
name = "Fun New Controls";
sourceTree = "<group>";
@@ -9256,6 +9286,7 @@
633400550F9C14C2003C77A9 /* AITextViewWithPlaceholder.h in Headers */,
633400570F9C14C2003C77A9 /* AIFlexibleToolbarItem.h in Headers */,
6334005B0F9C14C2003C77A9 /* AIDockingWindow.h in Headers */,
+ 5ACA086A17873AEA00B15047 /* AIButtonWithCursor.h in Headers */,
6334005D0F9C14C2003C77A9 /* AIBorderlessWindow.h in Headers */,
6334005F0F9C14C2003C77A9 /* AIGenericViewCell.h in Headers */,
633400610F9C14C2003C77A9 /* AIImageTextCell.h in Headers */,
@@ -9669,6 +9700,14 @@
34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */,
5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */,
769D634B17393CBE008B97BC /* AMPurpleJabberDiscoveryBrowser.xib in Resources */,
+ 7652804C175FC0F500710EC8 /* RequestFieldBoolean.xib in Resources */,
+ 7652804D175FC0F500710EC8 /* RequestFieldChoice.xib in Resources */,
+ 7652804E175FC0F500710EC8 /* RequestFieldInteger.xib in Resources */,
+ 7652804F175FC0F500710EC8 /* RequestFieldList.xib in Resources */,
+ 76528050175FC0F500710EC8 /* RequestFieldString.xib in Resources */,
+ 76528054175FCEF700710EC8 /* RequestFieldMultilineString.xib in Resources */,
+ 76528055175FCEF700710EC8 /* RequestFieldSecureString.xib in Resources */,
+ 7652805A175FD35B00710EC8 /* RequestFieldMultiList.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10769,6 +10808,7 @@
633400320F9C14C2003C77A9 /* AIDividedAlternatingRowOutlineView.m in Sources */,
633400340F9C14C2003C77A9 /* AIOutlineView.m in Sources */,
633400360F9C14C2003C77A9 /* AIAlternatingRowOutlineView.m in Sources */,
+ 5ACA086B17873AEA00B15047 /* AIButtonWithCursor.m in Sources */,
633400380F9C14C2003C77A9 /* AIVariableHeightFlexibleColumnsOutlineView.m in Sources */,
6334003A0F9C14C2003C77A9 /* AIVariableHeightOutlineView.m in Sources */,
6334003C0F9C14C2003C77A9 /* AIMultiCellOutlineView.m in Sources */,
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/AdiumHelp.html
--- a/AdiumHelp/AdiumHelp.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/AdiumHelp.html Wed Jul 10 14:11:14 2013 +0200
@@ -23,8 +23,8 @@
</div>
<div id="contentcenter"></div>
<div id="contentright">
- <h2> What's New in Adium? </h2>
- <p> <a href="pgs/Whats-New.html">Check out great new features.</a> </p>
+ <h2> What's new in Adium 1.6? </h2>
+ <p> <a href="pgs/WhatsNew1.6.html">Check out great new features.</a> </p>
<h2 class="space17"> Adium Documentation </h2>
<p> <a href="pgs/AdiumDocumentation.html">Learn how to use Adium.</a> </p>
<h2 class="space17"> Troubleshooting </h2>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/DefaultEvents.png
Binary file AdiumHelp/gfx/DefaultEvents.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/GetInfoThirdPane.png
Binary file AdiumHelp/gfx/GetInfoThirdPane.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/Growl notification.png
Binary file AdiumHelp/gfx/Growl notification.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/GrowlNotification1.png
Binary file AdiumHelp/gfx/GrowlNotification1.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/GrowlNotification2.png
Binary file AdiumHelp/gfx/GrowlNotification2.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/IRC from account selection.png
Binary file AdiumHelp/gfx/IRC from account selection.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/MistNotification.png
Binary file AdiumHelp/gfx/MistNotification.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/NotificationCenterNotification.png
Binary file AdiumHelp/gfx/NotificationCenterNotification.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/PasswordProtection-DiskUtilityCreateEncryptedDiskImage.png
Binary file AdiumHelp/gfx/PasswordProtection-DiskUtilityCreateEncryptedDiskImage.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/RecoveringDeletedTranscripts-AdiumLogsFolder.png
Binary file AdiumHelp/gfx/RecoveringDeletedTranscripts-AdiumLogsFolder.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/gfx/Twitter from account selection.png
Binary file AdiumHelp/gfx/Twitter from account selection.png has changed
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Wed Jul 10 14:11:14 2013 +0200
@@ -61,7 +61,7 @@
<li><a class="ext_link" href="http://www.livejournal.com/chat/">LiveJournal</a></li>
<li><a class="ext_link" href="http://www.passport.com/">MSN Messenger</a></li>
<li><a class="ext_link" href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
- <li><a class="ext_link" href="http://trac.adium.im/wiki/Zephyr">Zephyr</a></li>
+ <li><a class="ext_link" href="https://trac.adium.im/wiki/Zephyr">Zephyr</a></li>
</ul>
</li>
<li>Paid Services
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Wed Jul 10 14:11:14 2013 +0200
@@ -80,7 +80,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
<tr>
<td width="150" rowspan="2" valign="top"><img src="../gfx/Message-sm.png" height="auto" width="150" border="0" alt="Message window screenshot" /> </td>
- <td valign="top" colspan="3"><p>The Messaging window lets you communicate with your contacts. There are various features of this window from choosing which account of your contact you're talking to or want to talk to, adding files and emoticons to conversations and past chat history with the contact.</p></td>
+ <td valign="top" colspan="3"><p>The chat window lets you communicate with your contacts. There are various features of this window from choosing which account of your contact you're talking to or want to talk to, adding files and emoticons to conversations and past chat history with the contact.</p></td>
</tr>
<tr>
<td><ul>
@@ -97,18 +97,39 @@
</div>
<div class="taskboxline">
<div class="taskboxheader">
+ <h3>Events and notifications</h3>
+ </div>
+ <div class="taskboxtable">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+ <tr>
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/GrowlNotification1.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
+ <td valign="top" colspan="3"><p>Adium features a highly-customisable "Events" system which enables you to set up different kinds of notifications and other actions for events.</p></td>
+ </tr>
+ <tr>
+ <td><ul>
+ <li><a href="AdvancedFeatures-Events.html">Events â–¸</a></li>
+ <ul>
+ <li><a href="AdvancedFeatures-VisualNotifications.html">Visual notifications â–¸</a></li>
+ <li><a href="AdvancedFeatures-EmailNotification.html">Email notification â–¸</a></li>
+ </ul>
+ </ul></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
<h3>Advanced features</h3>
</div>
<div class="taskboxtable">
<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
<tr>
- <td width="150" rowspan="2" valign="top"><img src="../gfx/Growl notification.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
+ <td width="150" rowspan="2" valign="top"><img src="../gfx/Adium-Xtras.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
<td valign="top" colspan="3"><p>Adium sports a variety of advanced features.</p></td>
</tr>
<tr>
<td><ul>
<li><a href="AdvancedFeatures-AdiumXtras.html">Adium Xtras â–¸</a></li>
- <li><a href="AdvancedFeatures-GrowlSupport.html">Growl support â–¸</a></li>
<li><a href="AdvancedFeatures-FileTransfer.html">File transfer â–¸</a></li>
<li><a href="AdvancedFeatures-AddressBookIntegration.html">Address Book integration â–¸</a></li>
<li><a href="AdvancedFeatures-OTREncryption.html">OTR encryption â–¸</a></li>
@@ -136,11 +157,16 @@
<tr>
<td><ul>
<li><a href="Miscellaneous-KeyboardShortcuts.html">Keyboard shortcuts â–¸</a></li>
+ <li><a href="Miscellaneous-PasswordProtection.html">Password-protecting Adium â–¸</a></li>
<li><a href="Miscellaneous-BackingUpAdium.html">Backing up Adium â–¸</a></li>
<li><a href="Miscellaneous-Uninstalling.html">Uninstalling Adium â–¸</a></li>
<li><a href="Miscellaneous-LocationsAdiumFiles.html">Locations of Adium files â–¸</a></li>
<li><a href="Miscellaneous-AVSkypeSupport.html">Audio/Video chat and Skype support â–¸</a></li>
- <li><a href="Miscellaneous-SupportOtherOS.html">Support for other operating systems â–¸</a></li>
+ <li>Support for other operating systems</a></li>
+ <ul>
+ <li><a href="Miscellaneous-SupportWindowsLinuxMacOS9.html">Support for Windows, Linux and Mac OS 9 â–¸</a></li>
+ <li><a href="https://trac.adium.im/wiki/AdiumForiPhone">Support for iOS (iPhone, iPad) â–¸</li>
+ </ul>
</ul></td>
</tr>
</table>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-DockIcons.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-DockIcons.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-DockIcons.html Wed Jul 10 14:11:14 2013 +0200
@@ -47,7 +47,7 @@
<h3>Creating a dock icon</h3>
</div>
<div class="taskboxtext">
- <p>Information on making custom dock icons is available at <a class="ext_link" href="http://trac.adium.im/wiki/CreatingDockIcons">Creating dock icons</a>.</p>
+ <p>Information on making custom dock icons is available at <a class="ext_link" href="https://trac.adium.im/wiki/CreatingDockIcons">Creating dock icons</a>.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html Wed Jul 10 14:11:14 2013 +0200
@@ -43,7 +43,7 @@
<h3>Creating a dock icon </h3>
</div>
<div class="taskboxtext">
- <p>Information on making custom menu bar icons is available at <a class="ext_link" href="http://trac.adium.im/wiki/CreatingMenuBarIcons">Creating menu bar icons</a>.</p>
+ <p>Information on making custom menu bar icons is available at <a class="ext_link" href="https://trac.adium.im/wiki/CreatingMenuBarIcons">Creating menu bar icons</a>.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-SoundSets.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-SoundSets.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras-SoundSets.html Wed Jul 10 14:11:14 2013 +0200
@@ -46,7 +46,7 @@
<h3>Creating a sound set</h3>
</div>
<div class="taskboxtext">
- <p>Information on making custom sound sets is available at <a class="ext_link" href="http://trac.adium.im/wiki/CreatingSoundSets">Creating sound sets</a>.</p>
+ <p>Information on making custom sound sets is available at <a class="ext_link" href="https://trac.adium.im/wiki/CreatingSoundSets">Creating sound sets</a>.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Wed Jul 10 14:11:14 2013 +0200
@@ -76,7 +76,7 @@
<h3>Creating an Xtra</h3>
</div>
<div class="taskboxtext">
- <p>Start by looking at the <a class="ext_link" href="http://trac.adium.im/wiki/CreatingXtras">Creating Xtras page</a>.</p>
+ <p>Start by looking at the <a class="ext_link" href="https://trac.adium.im/wiki/CreatingXtras">Creating Xtras page</a>.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html Wed Jul 10 14:11:14 2013 +0200
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+<title>Email notification</title>
+<meta name="keywords" content="email, notification, alert, mail" />
+<meta name="description" content="Email notification" />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Email notification</h1>
+ </div>
+ <p>On supported services, Adium can notify you when you receive new email on the address associated with your account. Adium will not notify of email for any other email account; Adium is not a mail client and does not intend to replace one.</p>
+ <p>Adium supports mail notification for:</p>
+ <ul>
+ <li>AOL accounts</li>
+ <li>AIM accounts with AIM Mail</li>
+ <li>Yahoo accounts</li>
+ <li>MSN accounts connecting with an @hotmail.com address</li>
+ </ul>
+ <p>To enable mail checking</p>
+ <ul>
+ <li>double click your account in the <strong>Accounts</strong> pane of the Preferences window,</li>
+ <li>click the <strong>Options</strong> tab</li>
+ <li>check <strong>Check for New Mail</strong>.</li>
+ </ul>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
\ No newline at end of file
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-Events.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-Events.html Wed Jul 10 14:11:14 2013 +0200
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="events, actions, applescript, growl, notifications" />
+<meta name="description" content="Events" />
+<title>Events</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="tabs" id="tabs"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Events</h1>
+ </div>
+ <p>Adium features a highly-customisable "Events" system which allows you to tie certain "actions" to "events" and save settings of this kind as "presets".</p>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>What are "events" and "actions"?</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Events are all kinds of things happening in Adium like messages being sent or contacts changing their status. Actions are things that are done when those events occur, for example a sound being played, the bouncing of the dock icon or sending a message.</p>
+ <p>Here are some examples of actions being tied to events:</p>
+ <ul>
+ <li>display (<a class="ext_link" href="http://growl.info">Growl</a>- or <a class="ext_link" href="http://support.apple.com/kb/ht5362">Notification-Center</a>-type) visual notifications when you receive new messages</li>
+ <li>play a sound when contacts sign on</li>
+ <li>open a chat window when a specific contacts signs on.</li>
+ </ul>
+ <p>For events, actions can be added and removed. Events can be edited globally and on a per-contact basis.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>What are "presets"?</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Depending on the situation, you might like to have different actions for events. To avoid having to edit all events every time, you can save global event settings as presets. Adium comes with three pre-existing presets: "Default Notifications", "Audio Notifications" and "Visual Notifications".</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Editing events globally</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>To edit an event globally, first open the <strong>Events</strong> section of Adium's preferences.</p>
+ <p>To add an action for an event</p>
+ <ul>
+ <li>Select the event.</li>
+ <li>Click the "+" button.</li>
+ <li>Choose the action, edit settings (some actions have them) as desired and click "OK".</li>
+ </ul>
+ <p>To remove an action tied to an event</p>
+ <ul>
+ <li>Click the arrow next to the event to display actions attached to it.</li>
+ <li>Select the action you want to remove.</li>
+ <li>Click the "-" button.</li>
+ </ul>
+ <p>To edit the settings for an existing action</p>
+ <ul>
+ <li>Select the action.</li>
+ <li>Click the "Edit" button.</li>
+ <li>Make changes as desired and click "OK".</li>
+ </ul>
+ <p align="center"> <img src="../gfx/DefaultEvents.png" width="400" " alt="" /></p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Editing events on a per-contact basis</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>To edit an event on a per-contact basis, first click "Get Info…" (⇧⌘I) from the <strong>Contact</strong> menu and select the third pane called "Events".</p>
+ <p>To add an action for an event</p>
+ <ul>
+ <li>Select the event.</li>
+ <li>Click the "+" button.</li>
+ <li>Choose the action, edit settings (some actions have them) as desired and click "OK".</li>
+ </ul>
+ <p>To remove an action tied to an event</p>
+ <ul>
+ <li>Click the arrow next to the event to display actions attached to it.</li>
+ <li>Select the action you want to remove.</li>
+ <li>Click the "-" button.</li>
+ </ul>
+ <p>To edit the settings for an existing action</p>
+ <ul>
+ <li>Select the action.</li>
+ <li>Click the "Edit" button.</li>
+ <li>Make changes as desired and click "OK".</li>
+ </ul>
+ <p align="center"> <img src="../gfx/GetInfoThirdPane.png" width="200" " alt="" /></p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-GrowlSupport.html
--- a/AdiumHelp/pgs/AdvancedFeatures-GrowlSupport.html Tue Jul 09 23:02:41 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="growl, notifications" />
-<meta name="description" content="Built into the application." />
-<title>Growl support</title>
-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
-</head>
-<body>
-<div id="banner"> <a name="tabs" id="tabs"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Growl support</h1>
- </div>
- <p><a href="http://growl.info/about.php">Growl</a> lets Mac OS X applications unobtrusively tell you when things happen. In its default configuration, Growl fades a floating notification into the top-right corner of your screen for a moment and then fades it out again. This help page informs how to set up Growl.</p>
- <p align="center"> <img src="../gfx/Growl notification.png" alt="" /></p>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Installing Growl</h3>
- </div>
- <div class="taskboxtext">
- <p>As of Adium 1.5, Adium is able to show Growl notifications without the Growl application installed. This feature is called <a href="http://growl.info/notetodevelopers">Mist</a>.</p>
- <p>If you want to use a different style or use some of the more advanced features of Growl, you will have to either buy the application from the Mac App Store, or get an older and free version from <a href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Configuring Growl notifications</h3>
- </div>
- <div class="taskboxtext">
- <p>The following events notify you via Growl by default:</p>
- <ul>
- <li>Contact signs on</li>
- <li>Message received (Background Chat)</li>
- <li>File transfer requested</li>
- <li>File transfer completed successfully</li>
- <li>File transfer failed</li>
- <li>Error occurs</li>
- </ul>
- <p>To turn certain notifications off, or to make Adium post additional ones, you need to set up one or more events. You can do this globally as well as on a per-contact basis.</p>
- <ul>
- <li>To change the global Growl notification settings edit the events in Adium's "Events" preferences.</li>
- <li>To edit the Growl notification settings for a specific contact, open the "Get Info" window for this contact and edit the events in the third pane.</li>
- </ul>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Disabling and uninstalling Growl</h3>
- </div>
- <div class="taskboxtext">
- <p>To disable Adium's built-in Mist notifications, enter this command in Terminal.app: <code>defaults write -g com.growl.growlframework.mist.enabled -bool NO</code>.<p>
- <p>To uninstall the Growl application, follow the <a href="http://growl.info/documentation/growl-package-removal.php">instructions on the Growl website</a>.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Wed Jul 10 14:11:14 2013 +0200
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="notification, center, growl, visual, alert" />
+<meta name="description" content="Visual notifications" />
+<title>Visual notifications</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="tabs" id="tabs"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Visual notifications</h1>
+ </div>
+ <p>Visual notifications are a means of unobtrusively informing you when things happen, for example when you receive a message. In their default configuration, they fade into the top-right corner of your screen for a moment and then fade out again.</p>
+ <p>Adium features comprehensive support for visual notifications by ways of OS X's very own <a class="ext_link" href="http://support.apple.com/kb/ht5362">Notification Center</a> (on OS X 10.8 and later), third-party software <a class="ext_link" href="http://growl.info">Growl</a> as well as built-in notifications called "Mist" (on OS 10.7 and older).</p>
+ <p>This page explains the three different notification mechanisms mentioned above. See <a href="AdvancedFeatures-Events.html">Events</a> on how to tell Adium when to display visual notifications.<p>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Notification Center support (OS X 10.8 and later)</h3>
+ </div>
+ <p align="center"> <img src="../gfx/NotificationCenterNotification.png" alt="" /></p>
+ <div class="taskboxtext">
+ <p>Apple introduced "Notification Center" (NC) in OS X 10.8 ("Mountain Lion").</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Growl support</h3>
+ </div>
+ <p align="center"> <img src="../gfx/GrowlNotification1.png" alt="" /></p>
+ <p align="center"> <img src="../gfx/GrowlNotification2.png" alt="" /></p>
+ <div class="taskboxtext">
+ <p>The third-party application Growl.app has been around about as long as Adium itself – a long time before Apple introduced "Notification Center" (NC) in OS X 10.8 ("Mountain Lion").</p>
+ <p>While Growl.app is the obvious solution for users on previous versions of OS X, it also has a lot to offer to OS X users on 10.8, especially in the way of customisability and extendability. For example, there are dozens of different styles to choose from.</p>
+ <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a>, or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
+ <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need make the change in Growl's preferences.</p>
+ <p>To uninstall the Growl application, follow the <a class="ext_link" href="http://growl.info/documentation/growl-package-removal.php">instructions on the Growl website</a>.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Built-in notifications ("Mist", OS X 10.7 and older)</h3>
+ </div>
+ <p align="center"> <img src="../gfx/MistNotification.png" alt="" /></p>
+ <div class="taskboxtext">
+ <p>As of Adium 1.5, Adium is able to show Growl-style notifications on OS X versions 10.7 and 10.6 without the Growl application installed. This feature is called <a class="ext_link" href="http://growl.info/notetodevelopers">Mist</a>.</p>
+ <p>If you want to use a different style or use some of the more advanced features of Growl, you will have to either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a>, or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
+ <p>To disable Mist notifications, enter this command in Terminal.app: <code>defaults write -g com.growl.growlframework.mist.enabled -bool NO</code>. Please note that this affects any apps that support built-in Mist notifications like Adium does.<p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/ContactList-BlockingUnblocking.html
--- a/AdiumHelp/pgs/ContactList-BlockingUnblocking.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/ContactList-BlockingUnblocking.html Wed Jul 10 14:11:14 2013 +0200
@@ -82,7 +82,7 @@
</ul>
</li>
</ol>
- <p><b>Note:</b> Unfortunately, not all services support all privacy settings; Adium does not currently present this information as clearly as it should. This will hopefully be fixed at a later point on the libpurple (http://trac.adium.im/wiki/LibPurple) level. (See http://developer.pidgin.im/wiki/GSoC2009/PrivacyRewrite for more information)</p>
+ <p><b>Note:</b> Unfortunately, not all services support all privacy settings; Adium does not currently present this information as clearly as it should. This will hopefully be fixed at a later point on the libpurple (https://trac.adium.im/wiki/LibPurple) level. (See http://developer.pidgin.im/wiki/GSoC2009/PrivacyRewrite for more information)</p>
</div>
</div>
<div class="taskboxline">
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/ContactList-StatusIcons.html
--- a/AdiumHelp/pgs/ContactList-StatusIcons.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/ContactList-StatusIcons.html Wed Jul 10 14:11:14 2013 +0200
@@ -88,7 +88,7 @@
<h3>Creating custom status icons</h3>
</div>
<div class="taskboxtext">
- <p>Information on making custom status icons is available online at <a href="http://trac.adium.im/wiki/CreatingStatusIcons">"CreatingStatusIcons"</a> on the Adium Wiki.</p>
+ <p>Information on making custom status icons is available online at <a href="https://trac.adium.im/wiki/CreatingStatusIcons">"CreatingStatusIcons"</a> on the Adium Wiki.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Messaging-MessageView.html
--- a/AdiumHelp/pgs/Messaging-MessageView.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Messaging-MessageView.html Wed Jul 10 14:11:14 2013 +0200
@@ -22,7 +22,7 @@
<h3>WebKit-based</h3>
</div>
<div class="taskboxtext">
- <p>Adium's message display, "WebKit Message View" (WKMV), is powered by WebKit (<a class="ext_link" href="http://trac.adium.im/wiki/WebKit">dedicated Adium Wiki entry</a>; <a class="ext_link" href="http://webkit.org/">official site</a>), the same layout engine which drives Apple's Safari web browser. This allows Adium to support an incredible variety of beautiful message display styles, and allows web-savvy users to become developers of Adium's appearance without touching a line of code.</p>
+ <p>Adium's message display, "WebKit Message View" (WKMV), is powered by WebKit (<a class="ext_link" href="https://trac.adium.im/wiki/WebKit">dedicated Adium Wiki entry</a>; <a class="ext_link" href="http://webkit.org/">official site</a>), the same layout engine which drives Apple's Safari web browser. This allows Adium to support an incredible variety of beautiful message display styles, and allows web-savvy users to become developers of Adium's appearance without touching a line of code.</p>
</div>
</div>
<div class="taskboxline">
@@ -41,7 +41,7 @@
<li>yMous</li>
</ul>
<p>Hundreds of additional message styles are available from the <a class="ext_link" href="http://xtras.adium.im/">Adium Xtras site</a>, and can be installed by clicking the install link on the Xtra's page. To install a message style that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put it into the correct place for you.</p>
- <p>Information on making custom message styles is available at <a class="ext_link" href="http://trac.adium.im/wiki/CreatingMessageStyles">CreatingMessageStyles</a>.</p>
+ <p>Information on making custom message styles is available at <a class="ext_link" href="https://trac.adium.im/wiki/CreatingMessageStyles">CreatingMessageStyles</a>.</p>
</div>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html
--- a/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Wed Jul 10 14:11:14 2013 +0200
@@ -33,7 +33,7 @@
<div class="taskboxtext">
<p>Yes and no.</p>
<p>Yes: The third-party <a href="http://xtras.adium.im/index.php?a=xtras&xtra_id=5011">Skype Plugin</a> allows Adium to use the <a class="ext_link" href="https://developer.skype.com/Docs/ApiDoc">Skype API</a> to display your Skype contacts within Adium and let you chat with them via text-based instant messaging. By the nature of the Skype API, it requires that the Skype program be installed and running.</p>
- <p>No: It's not supported natively within Adium (i.e., without a plugin). The library that we use to support most protocols, <a href="http://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
+ <p>No: It's not supported natively within Adium (i.e., without a plugin). The library that we use to support most protocols, <a href="https://trac.adium.im/wiki/LibPurple">libpurple</a>, doesn't support Skype at all right now, not even for chat. Until it does Adium most likely won't, either.</p>
<p>Keep in mind that Skype is a proprietary, closed protocol, so it must be reverse-engineered before third-party clients like Pidgin and Adium can use it. Protocols like OSCAR (which AIM and ICQ are based on) and MSN have already been reverse-engineered, but they're much older than Skype, and reverse-engineering is hard. It will take a long time and won't happen at all unless someone chooses to take interest in it and dedicate significant time to the effort.</p>
<p><strong>What about the Skype API?</strong></p>
<p>Using the Skype API, as the Skype Plugin does, means that Skype must be running. We don't accept piggybacking on the official client as a substitute.</p>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Miscellaneous-PasswordProtection.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Miscellaneous-PasswordProtection.html Wed Jul 10 14:11:14 2013 +0200
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="password, protection, security, FileVault, transcripts, logs, settings, preferences" />
+<meta name="description" content="Password-protecting Adium" />
+<title>Password-protecting Adium</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="groups" id="groups"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Password-protecting Adium</h1>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>I have friends and family who use Adium on the same machine I use. How do I keep them from seeing my contacts and transcripts, or worse, chatting with my friends?</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Adium doesn't provide a facility to password-protect your accounts (other than the account password that every service requires) or your transcripts.</p>
+ <p>Our opinion is that it would be duplicated effort. Mac OS X allows you to set up multiple password-protected user accounts. Our recommendation is that you should use this feature. Similarly, if you want the transcripts to be encrypted, we recommend using Mac OS X's built-in ​<a class="ext_link" href="http://support.apple.com/kb/ht4790">FileVault</a> feature, which encrypts everything in your Home folder.</p>
+ <p>Adium does let you require you to enter your account password to log into your account; simply don't enter it into the AccountEditor, and don't check the “Save password†checkbox in the password prompt. Of course, if you have multiple accounts, this will become something of a hassle.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Steps to protect your transcripts (and everything else in your Home folder)</h3>
+ </div>
+ <div class="taskboxtext">
+ <p><strong>Use Mac OS X's own login system</strong></p>
+ <p>Set up a Mac OS X account for every person who uses Adium on your system. Then, your settings (accounts, contacts, transcripts, AdiumXtras, preferences) will be totally separate from theirs—they won't even be in the same folder.</p>
+ <p><strong>Set a Mac OS X login password</strong></p>
+ <p>You only need to do this if you don't already have a Mac OS X login password set.</p>
+ <ul>
+ <li>Open the Accounts pane of System Preferences.</li>
+ <li>Click “Change Passwordâ€.</li>
+ <li>Enter your desired password in the “New Password†field, then again in the Verify field. Alternatively, click the button with a key icon to have Mac OS X generate your password. Either way, be sure to remember your new password, or write it down and store it in a safe place (not on, under, behind, or near your computer).</li>
+ <li>Optionally, enter a hint to your password. Mac OS X will present this clue after three incorrect attempts, in case you forget your password. For that reason, it should be a clue that you would understand and an attacker wouldn't. (For the same reason, don't simply put your password in this field, or you will show your password to an attacker after three incorrect attempts.)</li>
+ </ul>
+ <p><strong>Require a login password to use Mac OS X</strong></p>
+ <ul>
+ <li>Open the Accounts pane of System Preferences.</li>
+ <li>Click on the padlock icon in the lower-left corner of the window. Enter the username and password of an administrator account on the system.</li>
+ <li>Uncheck the “Automatically log in as:†checkbox (also known as the “Make my system insecure†checkbox).</li>
+ <li>For added security, switch the “Display login window as:†setting from “List of users†to “Name and passwordâ€. This will require you to type in both your username and your password, rather than pick the username from a list. In a sense, this turns your username into a second, weak password, since anybody attempting to login must already know a username rather than be able to pick it from the list.</li>
+ <li>From the View menu, choose the Security pane.</li>
+ <li>Check the “Require password to wake this computer from sleep or screen saver†box.</li>
+ </ul>
+ <p>Afterward, whenever you leave your computer, you can put it to sleep (easy to do on laptops: just close the lid) or turn on the screen saver.</p>
+ <p><strong>Enable the easy way to activate the screen saver (desktops only)</strong></p>
+ <p>You can do this on a laptop as well, but on those machines, it's easier to just close the lid.</p>
+ <ul>
+ <li>Launch Keychain Access (in /Applications/Utilities).</li>
+ <li>Choose Preferences from the Keychain Access menu.</li>
+ <li>Check the “Show Status in Menu Bar†box.</li>
+ </ul>
+ <p>Afterward, you can activate the screen saver by choosing “Lock Screen†from the Keychain Menu Extra (which is a black padlock in the menu bar).</p>
+ <p><strong>Turn on FileVault encryption</strong></p>
+ <p>Apple's Knowledge Base has <a class="ext_link" href="http://support.apple.com/kb/ht4790">​instructions for turning on FileVault</a>.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>I'm not on a shared computer, but I need to encrypt my transcripts for another reason and can't use FileVault (e.g., PortableAdium). What do I do?</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>In this case, you can set up an encrypted disk image and an alias directing Adium to it.</p>
+ <ul>
+ <li>Quit Adium.</li>
+ <li>Find your Logs folder. It's this folder: (Your Home folder)/Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
+ <li>Get Info on it, to find out how large it is.</li>
+ <li>Use Disk Utility to create an encrypted disk image at least twice that size.</li>
+ <p align="center"> <img src="../gfx/PasswordProtection-DiskUtilityCreateEncryptedDiskImage.png" width="400" " alt="" /></p>
+ <li>Copy your Logs folder to the encrypted disk image.</li>
+ <li>Move the original Logs folder from the Default folder to the Trash.</li>
+ <li>Choose “Secure Empty Trash†from the Finder menu. (This obliterates the contents of the unencrypted files, so that nobody—not even you—can recover them later.)</li>
+ <li>Hold down ⌘ and Option, and drag the Logs folder back to where you copied it from. This creates the alias pointing from the alias's location (in the Default folder) to the real Logs folder's location (on the disk image).</li>
+</li>
+ </ul>
+ <p>When you launch Adium and start a chat, it will mount the disk image automatically. You should regularly make backups of both the disk image file and your keychain.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Wouldn't it be easier to let my partner/relatives/friend to use Adium in my OS X user account?</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>No, it is more complicated.</p>
+ <p>Compare:</p>
+ <p><strong>The all-accounts-on-one-Mac-account way</strong></p>
+ <ul>
+ <li>Have all of everyone's IM accounts in one list.</li>
+ <li>Turn off “Remember password†on every account so that nobody can, accidentally or intentionally, log in as someone else.</li>
+ </ul>
+ <p>And when someone else sits down at the computer, they'll need to:</p>
+ <ol>
+ <li>Disconnect from all accounts.</li>
+ <li>Open up the accounts list.</li>
+ <li>Turn on every one of their accounts.</li>
+ <li>Enter their password for each of their accounts.</li>
+ <li>Close Preferences.</li>
+ </ol>
+ <p>They will also have to use the same settings you use for things like the message view style. If they change those settings, they will be changing them for you, too, and you'll probably want to change them back.</p>
+ <p><strong>The separate Mac accounts way</strong></p>
+ <p>All your partner/relative/friend will need to do is:</p>
+ <ul>
+ <li>Click on the user icon/your username in your menubar.</li>
+ <li>Choose their own Mac OS X account from the menu.</li>
+ <li>Enter the password for their Mac OS X account.</li>
+ <li>Launch Adium.</li>
+ </ul>
+ <p>This takes less than half the time of the other way.</p>
+ <p>Each of you can set Adium in its Preferences to automatically set you as Away or log out (Offline) when you switch to a different account, so you won't need to do that manually before switching accounts.</p>
+ <p>This is better not only because it's easier and faster, but also because each of you can have your own settings. Each of you can have your own choice of contact list theme, message view style, fonts, emoticon set, desktop picture, etc. Transcripts and other data are also stored separately for each user (in each user's Home folder).</p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Miscellaneous-SupportOtherOS.html
--- a/AdiumHelp/pgs/Miscellaneous-SupportOtherOS.html Tue Jul 09 23:02:41 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Support for other operating systems</title>
-<meta name="keywords" content="windows, linux, os 9, osn" />
-<meta name="description" content="Support for Other Operating Systems" />
-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
-</head>
-<body>
-<div id="banner"> <a name="ax-discover" id="ax-discover"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Support for other operating systems</h1>
- </div>
- <p>Adium is only available on <a class="ext_link" href="http://www.apple.com/macosx">Mac OS X</a>.</p>
- <p>Adium is written with very Mac specific code—mostly, but not entirely, Cocoa. Porting it to another platform would require rewriting the entire application.</p>
- <p>Read below which alternatives we suggest for each operating system.</p>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Windows</h3>
- </div>
- <div class="taskboxtext">
- <p>Several multi-protocol IM clients already exist for Windows. We recommended <a class="ext_link" href="http://pidgin.im/">Pidgin for Windows</a>; it is open-source and free and Adium uses Pidgin's core (libpurple) for most protocols. Other options include:</p>
- <ul>
- <li><a class="ext_link" href="http://www.trillian.im/">Trillian</a> (commercial; free 'lite' version available)</li>
- <li><a class="ext_link" href="http://www.miranda-im.org/">Miranda</a> (open source; free).</li>
- </ul>
- <p>There are some skins available for Trillian and Miranda which modify them to look like Adium in some ways, such as <a class="ext_link" href="http://isynack.com/index.php?2007/10/02/33-miranda-im-to-adiumx">this skin for Miranda</a>.</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Linux</h3>
- </div>
- <div class="taskboxtext">
- <p>Several multi-protocol IM clients already exist for Linux operating systems.</p>
- <p>If you're using <a class="ext_link" href="http://www.gtk.org/">GTK+</a>, we recommend <a class="ext_link" href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
- <p>If you're using <a class="ext_link" href="http://www.kde.org/">KDE</a>, we recommend <a class="ext_link" href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
- <p><b>But couldn't you use <a class="ext_link" href="http://www.gnustep.org/">GNUStep</a>?</b></p>
- <p>We use Cocoa Bindings, Carbon, Quartz, Core Foundation, and Search Kit, among other APIs. These features are not available in GNUStep.</p>
- <p>There was a GNUStep implementation very long ago, but it fell out of date and was missing features.</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Mac OS 9</h3>
- </div>
- <div class="taskboxtext">
- <p>Look on <a class="ext_link" href="http://www.macupdate.com">MacUpdate</a> to see if there are any clients that may work for you. Otherwise you may want to start looking at moving to OS X.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
\ No newline at end of file
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Miscellaneous-SupportWindowsLinuxMacOS9.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Miscellaneous-SupportWindowsLinuxMacOS9.html Wed Jul 10 14:11:14 2013 +0200
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>Support for Windows, Linux and Mac OS 9</title>
+<meta name="keywords" content="windows, linux, os 9" />
+<meta name="description" content="Support for Windows, Linux and Mac OS 9" />
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="ax-discover" id="ax-discover"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Support for Windows, Linux and Mac OS 9</h1>
+ </div>
+ <p>Adium is only available on <a class="ext_link" href="http://www.apple.com/macosx">Mac OS X</a>.</p>
+ <p>Adium is written with very Mac specific code—mostly, but not entirely, Cocoa. Porting it to another platform would require rewriting the entire application.</p>
+ <p>Read below which alternatives we suggest for each operating system.</p>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Windows</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Several multi-protocol IM clients already exist for Windows. We recommended <a class="ext_link" href="http://pidgin.im/">Pidgin for Windows</a>; it is open-source and free and Adium uses Pidgin's core (libpurple) for most protocols. Other options include:</p>
+ <ul>
+ <li><a class="ext_link" href="http://www.trillian.im/">Trillian</a> (commercial; free 'lite' version available)</li>
+ <li><a class="ext_link" href="http://www.miranda-im.org/">Miranda</a> (open source; free).</li>
+ </ul>
+ <p>There are some skins available for Trillian and Miranda which modify them to look like Adium in some ways, such as <a class="ext_link" href="http://isynack.com/index.php?2007/10/02/33-miranda-im-to-adiumx">this skin for Miranda</a>.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Linux</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Several multi-protocol IM clients already exist for Linux operating systems.</p>
+ <p>If you're using <a class="ext_link" href="http://www.gtk.org/">GTK+</a>, we recommend <a class="ext_link" href="http://pidgin.im/">Pidgin</a>. Adium uses Pidgin's core (libpurple) for most protocols.</p>
+ <p>If you're using <a class="ext_link" href="http://www.kde.org/">KDE</a>, we recommend <a class="ext_link" href="http://kopete.kde.org/">Kopete</a>. Kopete even works with <a href="http://xtras.adium.im/index.php?a=search&cat_id=5">Adium message view styles</a>.</p>
+ <p><b>But couldn't you use <a class="ext_link" href="http://www.gnustep.org/">GNUStep</a>?</b></p>
+ <p>We use Cocoa Bindings, Carbon, Quartz, Core Foundation, and Search Kit, among other APIs. These features are not available in GNUStep.</p>
+ <p>There was a GNUStep implementation very long ago, but it fell out of date and was missing features.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Mac OS 9</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Look on <a class="ext_link" href="http://www.macupdate.com">MacUpdate</a> to see if there are any clients that may work for you. Otherwise you may want to start looking at moving to OS X.</p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
\ No newline at end of file
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Troubleshooting-ConnectionProblemsMSN.html
--- a/AdiumHelp/pgs/Troubleshooting-ConnectionProblemsMSN.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Troubleshooting-ConnectionProblemsMSN.html Wed Jul 10 14:11:14 2013 +0200
@@ -22,7 +22,7 @@
<h3>"Retrieving Contact List 100%" / "Reading error"</h3>
</div>
<div class="taskboxtext">
- <p>This is caused by "incorrect" contacts in contact lists. If you're running into this error you need you need to remove the offending contact. You can identify it by getting a debug log (see <a class="ext_link" href="http://trac.adium.im/wiki/CurrentAdiumDebug">CurrentAdiumDebug</a> for instructions) and looking for the following sequence in the log:</p>
+ <p>This is caused by "incorrect" contacts in contact lists. If you're running into this error you need you need to remove the offending contact. You can identify it by getting a debug log (see <a class="ext_link" href="https://trac.adium.im/wiki/CurrentAdiumDebug">CurrentAdiumDebug</a> for instructions) and looking for the following sequence in the log:</p>
<pre>(Libpurple: msn) FQY error 241
(Libpurple: msn) FQY response says
<offending contact> is from network 0
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Troubleshooting-RecoveringDeletedTranscripts.html
--- a/AdiumHelp/pgs/Troubleshooting-RecoveringDeletedTranscripts.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringDeletedTranscripts.html Wed Jul 10 14:11:14 2013 +0200
@@ -29,6 +29,7 @@
<li>Press ⇧⌘H. This opens your Home folder.</li>
<li>Navigate to Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
<li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your AIM username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named “AIM.jdoe†that contains a subfolder named “jsmithâ€.</li>
+ <p align="center"> <img src="../gfx/RecoveringDeletedTranscripts-AdiumLogsFolder.png" width="400" " alt="" /></p>
<li>Move each chatlog file from the Trash to the appropriate subfolder of the Logs folder. (It is important that you put it in the right folder. Otherwise, Adium won't be able to find those transcripts correctly in the Transcript Viewer window.)</li>
</ol>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html
--- a/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Wed Jul 10 14:11:14 2013 +0200
@@ -24,7 +24,7 @@
<h3>Looking your password up in Keychain Access</h3>
</div>
<div class="taskboxtext">
- <p>If you don't remember what service you use, you'll first need to open up the Accounts pane of Adium's Preferences, and then refer to the <a href="http://trac.adium.im/wiki/ListOfServices">"ListOfServices"</a> entry on the online Adium Wiki to determine the name of the service.</p>
+ <p>If you don't remember what service you use, you'll first need to open up the Accounts pane of Adium's Preferences, and then refer to the <a href="https://trac.adium.im/wiki/ListOfServices">"ListOfServices"</a> entry on the online Adium Wiki to determine the name of the service.</p>
<ol>
<li>Launch Keychain Access.
<div style="float:right"><img src="../gfx/RecoveringLostPasswords-KeychainAccess.png" alt="Path to Keychain Access." /></div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/TroubleshootingTips.html
--- a/AdiumHelp/pgs/TroubleshootingTips.html Tue Jul 09 23:02:41 2013 +0200
+++ b/AdiumHelp/pgs/TroubleshootingTips.html Wed Jul 10 14:11:14 2013 +0200
@@ -91,7 +91,7 @@
</div>
<div class="taskboxtext">
<p>Occasionally, an issue in Adium can be caused by a strange setting for your OS X user, or other installed software (especially system mods and hacks). Temporarily creating a new user (in System Preferences → Accounts) is the best way to check against these issues.</p>
- <p>Create the account, log out of your account (Apple Menu → Log Out), and log into the new one. If the problem doesn't occur on the other user account, then you know it's something in your current account. If you don't know where to go from there, <a href="http://trac.adium.im/wiki/ContactUs">Contact Us</a> and we'll help you narrow the field.</p>
+ <p>Create the account, log out of your account (Apple Menu → Log Out), and log into the new one. If the problem doesn't occur on the other user account, then you know it's something in your current account. If you don't know where to go from there, <a href="https://trac.adium.im/wiki/ContactUs">Contact Us</a> and we'll help you narrow the field.</p>
</div>
</div>
<div class="taskboxline">
@@ -108,7 +108,7 @@
<h3>If it still doesn't work</h3>
</div>
<div class="taskboxtext">
- <p>Still have your problem? Please see <a href="http://trac.adium.im/wiki/ReportingBugs">Reporting Bugs</a>, which tells you how to search for existing tickets (in case there already is one) and how to file a new one if one doesn't already exist.</p>
+ <p>Still have your problem? Please see <a href="https://trac.adium.im/wiki/ReportingBugs">Reporting Bugs</a>, which tells you how to search for existing tickets (in case there already is one) and how to file a new one if one doesn't already exist.</p>
<p>Not sure whether the problem lies with Adium? Ask on the <a class="ext_link" href="http://forum.adium.im">Adium forums</a>, in the <a href="irc://irc.freenode.net/#adium">Adium IRC channel</a>, or on <a href="http://getsatisfaction.com/adium">getsatisfaction.com</a>.</p>
</div>
</div>
diff -r 991f62ac6f10 -r 1af72510ff18 AdiumHelp/pgs/Whats-New.html
--- a/AdiumHelp/pgs/Whats-New.html Tue Jul 09 23:02:41 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="new, features" />
-<meta name="description" content="Discover the New Features." />
-<title>What's new in Adium?</title>
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-</head>
-<body>
-<div id="banner"> <a name="whats-new.html" id="Whats-New.html"></a><a name="ax-whats-new" id="ax-whats-new"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>What's new in Adium?</h1>
- </div>
- <p>Adium 1.4 was over 2 years in development (after the release of Adium 1.3 on 8/25/2008) and sports many new features. Just a few of the major improvements are listed below. We hope Adium makes instant messaging wonderful for you.</p>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Twitter support</h3>
- </div>
- <div class="taskboxtable">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
- <tr>
- <td width="150" rowspan="2" valign="top"><img src="../gfx/IRC from account selection.png" alt="Image of Adium account types with IRC selected" height="auto" width="150" border="0" /> </td>
- <td><ul>
- <li>Timeline messages appear in a group chat.</li>
- <li>Direct messages as a one-on-one chat with a contact</li>
- <li>Adding and removing contact list buddies follows and unfollows them, respectively.</li>
- <li>Also includes support for StatusNet servers, such as Identi.ca</li>
- </ul></td>
- </tr>
- </table>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>IRC support</h3>
- </div>
- <div class="taskboxtable">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
- <tr>
- <td width="150" rowspan="2" valign="top"><img src="../gfx/Twitter from account selection.png" alt="Image of Adium account types with Twitter selected" height="auto" width="150" border="0" /> </td>
- <td><ul>
- <li>Execute commands on connect.</li>
- <li>Display of operator status in chats, as well as user's /away status</li>
- <li>Mass-modify attributes of user list members from the group chat's action widget below the user list.</li>
- </ul></td>
- </tr>
- </table>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Greatly improved group chats and group chat bookmarks</h3>
- </div>
- <div class="taskboxtable">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
More information about the commits
mailing list