www/adium.im 477:e90ced76a160: 1.5 takes its place as the ONE TR...

commits at adium.im commits at adium.im
Mon Dec 5 02:01:14 UTC 2011


details:	http://hg.adium.im/www/adium.im/rev/e90ced76a160
revision:	477:e90ced76a160
branch:		adiumx.com
author:		Eric Richie
date:		Sun Dec 04 21:01:08 2011 -0500

1.5 takes its place as the ONE TRUE BETA.

diffs (310 lines):

diff -r 81edc639ef18 -r e90ced76a160 beta/1.5/index.php
--- a/beta/1.5/index.php	Sun Dec 04 20:51:40 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-<?php
-
-// Adium Beta page
-// An empty $versions array will cause the "no beta" message to be displayed.
-// Place the array entries in reverse order (i.e., b5, b4, b3, b2, b1).
-
-// In the appcast, use <http://beta.adium.im/?notemplate=1> as the appcast URL.
-// This will load the beta page without any template (so clean inside Sparkle)
-
-// Update $versions and $repo below.
-// $repo specifies what repo on hg.adium.im to link to, and the $versions array
-// controls the actual contents.
-
-// --- Configure starting here ---
-
-$versions = array(
-		/*
-			Keep this example entry around.
-			Copy it below for actual use.
-
-					array(
-						"ver" => "1.3.4b1",
-						"rev" => "???",
-						"date" => "2009-04-24",
-						"md5" => "c94754b2d7c3d5609c47612efedf32da"
-					)
-		*/
-					array(
-						"ver" => "1.5b7",
-						"rev" => "5be91264f5d8",
-						"date" => "2011-12-04",
-						"md5" => "b7a4017f944c5e67b30cd7760932908e",
-						"dsa" => "MC0CFQCc1IKzJn5Cg39uhIUtPjnMyrEbswIUMjF0ZQAaqKKNJYF877C6ngr/WUk="
-						),
-					array(
-						"ver" => "1.5b6",
-						"rev" => "45eb40ad9991",
-						"date" => "2011-12-03",
-						"md5" => "778e37ee0f0012cdfd7a9e3a1cbf3b7c",
-						"dsa" => "MCwCFE0Lm7/CfKS9/hnE2DOq5q/9+YQ/AhQ+aVIWmBKOOk0yKK9LlUJ31D1V+w=="
-					),
-					array(
-						"ver" => "1.5b5",
-						"rev" => "b08eeb55787a",
-						"date" => "2011-11-26",
-						"md5" => "4b14cd65a60504cda5d7e48ac59f11b9",
-						"dsa" => "MC0CFQDOl/WQxXgI4SnXS/lZDy/9es+NYwIUEbfJcZyrup+X7VVenZScfzF6AJ8="
-					),
-					array(
-						"ver" => "1.5b4",
-						"rev" => "92981866ae1f",
-						"date" => "2011-11-20",
-						"md5" => "ea6136a94bbea428f397ab4681df89be",
-						"dsa" => "MC4CFQCj44iqGBqB3B+tMTIADBdP0vCdyAIVALfKODSBkDSj99b2Mv8fNtrqXmgl"
-					),
-					array(
-						"ver" => "1.5b3",
-						"rev" => "30193567ea2e",
-						"date" => "2011-11-05",
-						"md5" => "07b64eb678c38787f8a450440fc4111b",
-						"dsa" => "MCwCFAUggWX7kbjeV3HnTEDUqjsC/koRAhRhIqFtH+/zPD57EW+j9/0urttfcw=="
-					),
-					array(
-						"ver" => "1.5b2",
-						"rev" => "12536b2265ba",
-						"date" => "2011-10-29",
-						"md5" => "747096d7ab4e657d467976fae8eab340",
-						"dsa" => "MC0CFB9od+VUWXuxmo1sKdLhe1Pn8MjwAhUA0FtfpBMi0pUF+peO9pEWjW5pTtM="
-					),
-					array(
-						"ver" => "1.5b1",
-						"rev" => "e0ac5e1080a1",
-						"date" => "2011-10-22",
-						"md5" => "0b24da74b25b7c26b8c544c8749ae4d7"
-					)
-			);
-
-// $motd = 'Please check <a href="http://trac.adium.im/query?status=assigned&status=new&status=pending&group=severity&milestone=Adium+1.4">open tickets</a> for 1.4 before filing bugs!';
-
-$motd = '';
-
-$repo = "adium";
-
-// --- You shouldn't need to edit below ---
-
-// If we're asked to not display the main website, this is being displayed in Sparkle.
-$noTemplate = (isset($_GET['notemplate']));
-$forInclude = (isset($_GET['forinclude']));
-
-$latest = $versions[0];
-
-if (!$forInclude) {
-	?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-	<html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<?php
-	if(!$noTemplate) {
-		?>
-		<title>Adium Beta - <?=$latest['ver']?></title>
-		<link rel="stylesheet" type="text/css" href="http://adium.im/styles/layoutstyle.css">
-		<link rel="stylesheet" type="text/css" href="http://adium.im/styles/defaultstyle.css">
-		<link rel="shortcut icon" href="http://adium.im/favicon.ico">
-		<?php
-	}
-}
-	?>
-	<link rel="stylesheet" type="text/css" href="http://adium.im/styles/beta.css">
-	
-<?php
-	if (!$forInclude) {
-		echo('</head><body>');
-	}
-
-	if(!$noTemplate) {
-?>
-	<div id="container">
-		<div id="titlecontainer">
-			<a href="http://www.adium.im/">Adium</a>
-		</div>
-		<div id="navcontainer">
-			<a class="navtab" href="http://adium.im/">Download</a> 
-			<a class="navtab" href="http://adium.im/about/">About</a> 
-			<a class="navtab" href="http://adium.im/blog/">Blog</a> 
-			<a class="navtab" href="http://adium.im/help/">Help</a>
-			<a class="navtabcurrent" href="http://trac.adium.im">Development</a> 
-			<a class="navtab" href="http://adium.spreadshirt.com">Merchandise</a>
-			<a class="navtab" href="http://www.adiumxtras.com/">Xtras</a>
-		</div>
-		
-		<div id="content">
-<?php
-	}
-?>
-<?php	
-	if (count($versions) === 0) {
-		?><p>You can find the current version of Adium at the <a href="http://adium.im">main website</a>.</p>		
-<?php
-
-	if (strlen($motd)) {
-		printf('<p style="margin-top: 2em;">%s</p>', $motd);
-	}
-	
-	} else {
-		if(!$noTemplate || $forInclude) {
-?>			
-		<h2><?=$latest["ver"]?></h2>
-		<p id="download">
-			<a href="http://adiumx.cachefly.net/Adium_<?=$latest["ver"]?>.dmg">
-				<?php if (!$forInclude) { ?>
-					<img src="http://adium.im/images/logo_small.png" alt="Adiumy">
-				<?php } ?>
-				Adium_<?=$latest["ver"]?>.dmg</a> (MD5: <code><?=$latest["md5"]?></code>)<br>
-			Requires 10.6.0 or later. Released <?=$latest["date"]?><br>
-			Download hosted by <a href="http://www.cachefly.com/">CacheFly</a>
-		</p>
-
-		<?php
-			if (strlen($motd)) {
-				printf('<p style="margin-top: 2em;">%s</p>', $motd);
-			}
-		}
-
-		foreach($versions as $version) {
-			?>
-				<div class="version">
-					<div class="summary">
-						<h3>Version <?=$version["ver"]?> (<?=$version["date"]?>)</h3>
-						<p>Revision: <a class="changeset" href="http://hg.adium.im/<?=$repo?>/rev/<?=$version["rev"]?>"><?=$version["rev"]?></a></p>
-					</div>
-					<?php
-						readfile(sprintf("../../changelogs/%s.htmlfrag", $version["ver"]));
-					?>
-				</div>
-			<?php
-		}
-	}
-	if(!$noTemplate) {
-?>
-	</div>
-     	<!-- fix overlap -->
-         <div style="clear: both; margin-top: 30px;"> </div>
-		<!-- use footerfixed if this doesn't reach the bottom of a reasonable page; otherwise, use footer -->
-		<div id="footerfixed">
-			<div class="donate">
-				<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&submit.x=57&submit.y=8&encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDV!
 QQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsL!
 mNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4GBAIF!
 fOlaagFr
l71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----">Donate to Adium</a>
-			</div>
-			<div id="powered">
-				<a href="http://developer.apple.com/ada"><img class="libgaim" src="http://adium.im/images/ada.png" alt="Apple design awards 05 special mention"></a> <a href="http://www.pidgin.im"><img class="libgaim" src="http://www.adium.im/images/powered_by_libpurple.png" alt="Adium is powered by libpurple"></a> <a class="networkredux" href="http://networkredux.com/"><img src="http://adium.im/images/network_redux.png" alt="Network Redux Logo"></a>
-			</div>
-		</div>
-	</div>
-	<script type="text/javascript">
-		var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-		document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-	</script>
-	<script type="text/javascript">
-		var pageTracker = _gat._getTracker("UA-347527-8");
-		pageTracker._trackPageview();
-	</script>
-<?php
-	}
-	
-	if (!$forInclude) {
-		echo('</body></html>');
-	}
-?>
diff -r 81edc639ef18 -r e90ced76a160 beta/index.php
--- a/beta/index.php	Sun Dec 04 20:51:40 2011 -0500
+++ b/beta/index.php	Sun Dec 04 21:01:08 2011 -0500
@@ -25,27 +25,61 @@
 						"md5" => "c94754b2d7c3d5609c47612efedf32da"
 					)
 		*/
-	array(
-	"ver" => "1.4.4b2",
-	"rev" => "59fdaa1f6928",
-	"date" => "2011-11-10",
-	"md5" => "e542ba6b75b7ba6b6805e3d914e92c5e",
-	"dsa" => "MC0CFQCEMDvPREpMJz4X5owFbKs1XNHQVQIUB7a6YTYjUbgYf6PdpKBFE/I9YMQ="
-	),
 					array(
-					"ver" => "1.4.4b1",
-					"rev" => "eb27108ac24a",
-					"date" => "2011-10-29",
-					"md5" => "4b9b165d25a68dd1b8e0238dd1f679ee",
-					"dsa" => "MCwCFE4xzsX53/FkQF1q+zE43/rmqtvRAhQk4yRO+Bd89ZQmxqqqH59l5BJ/Fg=="
+						"ver" => "1.5b7",
+						"rev" => "5be91264f5d8",
+						"date" => "2011-12-04",
+						"md5" => "b7a4017f944c5e67b30cd7760932908e",
+						"dsa" => "MC0CFQCc1IKzJn5Cg39uhIUtPjnMyrEbswIUMjF0ZQAaqKKNJYF877C6ngr/WUk="
+						),
+					array(
+						"ver" => "1.5b6",
+						"rev" => "45eb40ad9991",
+						"date" => "2011-12-03",
+						"md5" => "778e37ee0f0012cdfd7a9e3a1cbf3b7c",
+						"dsa" => "MCwCFE0Lm7/CfKS9/hnE2DOq5q/9+YQ/AhQ+aVIWmBKOOk0yKK9LlUJ31D1V+w=="
+					),
+					array(
+						"ver" => "1.5b5",
+						"rev" => "b08eeb55787a",
+						"date" => "2011-11-26",
+						"md5" => "4b14cd65a60504cda5d7e48ac59f11b9",
+						"dsa" => "MC0CFQDOl/WQxXgI4SnXS/lZDy/9es+NYwIUEbfJcZyrup+X7VVenZScfzF6AJ8="
+					),
+					array(
+						"ver" => "1.5b4",
+						"rev" => "92981866ae1f",
+						"date" => "2011-11-20",
+						"md5" => "ea6136a94bbea428f397ab4681df89be",
+						"dsa" => "MC4CFQCj44iqGBqB3B+tMTIADBdP0vCdyAIVALfKODSBkDSj99b2Mv8fNtrqXmgl"
+					),
+					array(
+						"ver" => "1.5b3",
+						"rev" => "30193567ea2e",
+						"date" => "2011-11-05",
+						"md5" => "07b64eb678c38787f8a450440fc4111b",
+						"dsa" => "MCwCFAUggWX7kbjeV3HnTEDUqjsC/koRAhRhIqFtH+/zPD57EW+j9/0urttfcw=="
+					),
+					array(
+						"ver" => "1.5b2",
+						"rev" => "12536b2265ba",
+						"date" => "2011-10-29",
+						"md5" => "747096d7ab4e657d467976fae8eab340",
+						"dsa" => "MC0CFB9od+VUWXuxmo1sKdLhe1Pn8MjwAhUA0FtfpBMi0pUF+peO9pEWjW5pTtM="
+					),
+					array(
+						"ver" => "1.5b1",
+						"rev" => "e0ac5e1080a1",
+						"date" => "2011-10-22",
+						"md5" => "0b24da74b25b7c26b8c544c8749ae4d7"
 					)
 			);
 
 // $motd = 'Please check <a href="http://trac.adium.im/query?status=assigned&status=new&status=pending&group=severity&milestone=Adium+1.4">open tickets</a> for 1.4 before filing bugs!';
 
-$motd = '<b>Note:</b> Looking for the Adium 1.5 beta? Get it <a href="1.5/">here</a>.';
+$motd = '';
 
-$repo = "adium-1.4";
+$repo = "adium";
 
 // --- You shouldn't need to edit below ---
 
@@ -119,7 +153,7 @@
 					<img src="http://adium.im/images/logo_small.png" alt="Adiumy">
 				<?php } ?>
 				Adium_<?=$latest["ver"]?>.dmg</a> (MD5: <code><?=$latest["md5"]?></code>)<br>
-			Requires 10.5.8 or later. Released <?=$latest["date"]?><br>
+			Requires 10.6.0 or later. Released <?=$latest["date"]?><br>
 			Download hosted by <a href="http://www.cachefly.com/">CacheFly</a>
 		</p>
 
@@ -137,7 +171,7 @@
 						<p>Revision: <a class="changeset" href="http://hg.adium.im/<?=$repo?>/rev/<?=$version["rev"]?>"><?=$version["rev"]?></a></p>
 					</div>
 					<?php
-						readfile(sprintf("../changelogs/%s.htmlfrag", $version["ver"]));
+						readfile(sprintf("../../changelogs/%s.htmlfrag", $version["ver"]));
 					?>
 				</div>
 			<?php




More information about the commits mailing list