IPFire-SCM December 2009

ipfire-scm@lists.ipfire.org

1 participants
5 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0c05402cdc2a47e9407265c4d7532e735f0f5568
by git＠ipfire.org 31 Dec '09

31 Dec '09

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f8d2a187d13dade92620f9e9278548742d5c9c83
by git＠ipfire.org 31 Dec '09

31 Dec '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via f8d2a187d13dade92620f9e9278548742d5c9c83 (commit) via fc25674950413fc6d224334c8c432865afd66b69 (commit) from 8c96ba3b5b8ce646c4a18708986bfe651fa5967c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f8d2a187d13dade92620f9e9278548742d5c9c83 Merge: fc25674950413fc6d224334c8c432865afd66b69 8c96ba3b5b8ce646c4a18708986bfe651fa5967c Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Dec 31 13:40:36 2009 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit fc25674950413fc6d224334c8c432865afd66b69 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Dec 31 13:39:21 2009 +0100 Updated ipfireseeder torrent link to core33. ----------------------------------------------------------------------- Summary of changes: lfs/ipfireseeder | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 83d45d6..ec667ac 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.5.i586-full-core28.iso.torrent +DL_FILE = ipfire-2.5.i586-full-core33.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 6 +PAK_VER = 7 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4c358851d28286606ea534f81d6b699d +$(DL_FILE)_MD5 = 48c79391fb9bd6156f96f70c0d05d6af install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8c96ba3b5b8ce646c4a18708986bfe651fa5967c
by git＠ipfire.org 31 Dec '09

31 Dec '09

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2dc28acc9c155f23c3387a64a22c2edaa29e1bd8
by git＠ipfire.org 28 Dec '09

28 Dec '09

1 0

[IPFire-scm] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 68b994443ce1ab666527ce9ccb2bd4b7fed4b9b9
by git＠ipfire.org 28 Dec '09

28 Dec '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 68b994443ce1ab666527ce9ccb2bd4b7fed4b9b9 (commit) from c146ac9b91517ecb1fad437769dc35d08e4a3c47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68b994443ce1ab666527ce9ccb2bd4b7fed4b9b9 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Mon Dec 28 17:06:43 2009 +0100 Added donation button to credit page. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 31 +++++++++++++++++++++++++------ langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 3 files changed, 31 insertions(+), 6 deletions(-) mode change 100644 => 100755 html/cgi-bin/credits.cgi Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi old mode 100644 new mode 100755 index 5ba5682..eae2d23 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -38,7 +38,26 @@ require "${General::swroot}/header.pl"; &Header::openbox('100%', 'left', 'Version'); print "This is ".`cat /etc/system-release`; print " - Pakfire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`; -print "<br>".`uname -a`; +print "<br />".`uname -a`; +print "<br /><br /><br /><br />"; +&Header::closebox(); + +&Header::openbox('100%', 'left', $Lang::tr{'donation'}); + +print <<END +<p>$Lang::tr{'donation-text'}</p> + <div align="center"> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="10718640"> + <input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online."> + <img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1"> + </form> + </div> +<br /> + +END +; &Header::closebox(); &Header::openbox('100%', 'left', $Lang::tr{'credits'}); @@ -60,15 +79,15 @@ Vice Project Leader - Christian Schmidt Developer - Arne Fitzenreiter (<a href='mailto:arne\@ipfire.org'>arne\(a)ipfire.org</a>)<br /> Developer - Stefan Schantl -(<a href='mailto:Stevee\@ipfire.org'>Stevee\(a)ipfire.org</a>)<br /> -Developer (Addons) - Peter Pfeiffer -(<a href='mailto:peterman\@ipfire.org'>peterman\(a)ipfire.org</a>)<br /> +(<a href='mailto:Stevee\@ipfire.org'>stevee\(a)ipfire.org</a>)<br /> +Developer - Jan Paul Tücking +(<a href='mailto:earl\@ipfire.org'>earl\(a)ipfire.org</a>)<br /> Developer & Webmaster - Heiner Schmeling (<a href='mailto:cm\@ipfire.org'>cm\(a)ipfire.org</a>)<br /> +Developer (Addons) - Peter Pfeiffer +(<a href='mailto:peterman\@ipfire.org'>peterman\(a)ipfire.org</a>)<br /> Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger (<a href='mailto:rowie\@ipfire.org'>rowie\(a)ipfire.org</a>)<br /> -Developer, Wiki-Admin & Sponsor - Jan Paul Tücking -(<a href='mailto:earl\@ipfire.org'>earl\(a)ipfire.org</a>)<br /> Supporter & Wiki-Admin - Silvio Rechenbach (<a href='mailto:exciter\@ipfire.org'>exciter\(a)ipfire.org</a>)<br /> Sponsor - Peter Schaelchli diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a82df3d..c0bf7ba 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -546,6 +546,9 @@ 'day after' => 'Tag danach', 'day before' => 'Tag davor', 'days' => 'Tage', +'donation' => 'Spenden', +'donation-text' => '<strong>IPFire</strong> wird von Freiwilligen in ihrer Freizeit betrieben und auch betreut. Um dieses Projekt am laufen zu halten entstehen uns natürlich auch Kosten, wenn sie uns unterstützen wollen würden wir uns über eine kleine Spende sehr freuen.', +'donation-link' => 'https://www.paypal.com/de_DE/DE/i/btn/btn_donateCC_LG.gif', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Tragen Sie Ihre ID (oder ID Liste durch ; getrennt) in das Feld "Hostname" ein', 'ddns help freedns' => 'Tragen Sie den Connect String im Feld "Benutzername" ein', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c880769..7522873 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -570,6 +570,9 @@ 'day after' => 'Day after', 'day before' => 'Day before', 'days' => 'days.', +'donation' => 'Donation', +'donation-text' => '<strong>IPFire</strong> is driven and maintained by volunteers in their free time. To keep this project running costs incurred, if you like to support us we would be pleased by a small donation.', +'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)', 'ddns help freedns' => 'In the fied username enter your connect string', hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2009