[evolvis-commits] r13576: Merged from 4.8
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 02:45:08 CET 2011
Author: mirabilos
Date: 2011-02-28 02:45:07 +0100 (Mon, 28 Feb 2011)
New Revision: 13576
Modified:
trunk/gforge_base/evolvisforge-5.1/Makefile
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/Forum.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumFactory.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/forum/ForumMessage.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/Group.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/System.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/User.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/account.php
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/system/pgsql.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/fusionforge.spec
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/aclcheck.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/common/Snoopy.class.php
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/cron.d/fusionforge-plugin-scmcvs
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/db/scmsvn-init.sql
trunk/gforge_base/evolvisforge-5.1/gforge/translations/bg.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/ca.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/de.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/el.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/en.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/eo.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/es.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/eu.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/fr.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/gforge.pot
trunk/gforge_base/evolvisforge-5.1/gforge/translations/he.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/id.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/it.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/ja.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/ko.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/la.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/nb.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/nl.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/pl.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/pt.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/pt_BR.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/ru.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/sv.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/th.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/zh_CN.po
trunk/gforge_base/evolvisforge-5.1/gforge/translations/zh_TW.po
trunk/gforge_base/evolvisforge-5.1/gforge/www/account/lostpw.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/export/search_plugin.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/admin/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/attachment.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/include/user_home.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/css/gforge.css
trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge/Theme.class.php
Log:
Merged from 4.8
Modified: trunk/gforge_base/evolvisforge-5.1/Makefile
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/Makefile 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/Makefile 2011-02-28 01:45:07 UTC (rev 13576)
@@ -7,9 +7,11 @@
BUILDRESULT=$(CURDIR)/result
VER=$(shell LANG=C grep '>software_version' gforge/common/include/FusionForge.class.php | cut -d\' -f2)
-TAG=$(shell LANG=C svn log -r HEAD -l 1 2>/dev/null | awk '{ if ($$1=="Tag-Release") print $$2}')
+ID=$(shell LANG=C svnversion)
+URL=$(shell LANG=C svn info | grep 'Root:' | awk '{print $$3}')
+TAG=$(shell LANG=C svn log $(URL) -r $(ID) -l 1 2>/dev/null | awk '{ if ($$1=="Tag-Release") print $$1}')
ifeq ($(TAG),)
- VERSION=fusionforge-$(VER)-$(shell LANG=C svn info | grep Revision | cut -d: -f2| sed 's/ //g')
+ VERSION=fusionforge-$(VER)-$(ID)
else
VERSION=fusionforge-$(VER)
endif
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-28 01:45:07 UTC (rev 13576)
@@ -28,6 +28,13 @@
-- Roland Mas <lolando at debian.org> Wed, 29 Apr 2009 15:21:31 +0200
+gforge (4.8-2) unstable; urgency=low
+
+ * Upload to Debian unstable, with a new upstream snapshot as of SVN
+ r7945.
+
+ -- Roland Mas <lolando at debian.org> Thu, 06 Aug 2009 11:25:16 +0200
+
gforge (4.8-1) experimental; urgency=low
* New upstream release.
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/project_home.php 2011-02-28 01:45:07 UTC (rev 13576)
@@ -93,7 +93,7 @@
}
print '<br />'.sprintf (_('Activity Ranking: %d'). $actv_res) ;
print '<br />'.sprintf(_('View project <a href="%1$s" >Statistics</a> or <a href="%2$s">Activity</a>'), util_make_url ('/project/stats/?group_id='.$group_id),util_make_url ('/project/report/?group_id='.$group_id));
- print '<br />'.sprintf(_('View list of <a href="%1$s">RSS feeds</a> available for this project.</a>'), util_make_url ('/export/rss_project.php?group_id='.$group_id)). ' ' . html_image('ic/rss.png',16,16,array('border'=>'0'));
+ print '<br />'.sprintf(_('View list of <a href="%1$s">RSS feeds</a> available for this project.'), util_make_url ('/export/rss_project.php?group_id='.$group_id)). ' ' . html_image('ic/rss.png',16,16,array('border'=>'0'));
}
if($GLOBALS['sys_use_people']) {
@@ -260,7 +260,7 @@
}
?>
-<p />
+<p> </p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="50%">
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php 2011-02-28 01:45:07 UTC (rev 13576)
@@ -427,7 +427,7 @@
'<img src="'.$HTML->imgroot.'ic/'.$img.'" alt="'._('Delete').'" height="16" width="16" border="0" />') ;
echo '</td>
- <td>'.util_make_link_g (db_result($result,$i,'unix_group_name'),db_result($result,$i,'group_id'), db_result($result,$i,'group_name')).'</td>
+ <td>'.util_make_link_g (db_result($result,$i,'unix_group_name'),db_result($result,$i,'group_id'),db_result($result,$i,'group_name')).'</td>
<td>'. htmlspecialchars(db_result($result,$i,'role_name')) .'</td></tr>';
}
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/css/gforge.css
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/css/gforge.css 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/css/gforge.css 2011-02-28 01:45:07 UTC (rev 13576)
@@ -17,7 +17,7 @@
font-size:13px;
color: #202020;
text-decoration: none;
- font-weight: none
+ font-weight: normal
}
@@ -36,7 +36,7 @@
h1, h2, h3, h4, h5, h6 {
font-family: arialverdana,arial,helvetica,sans-serif;
- font-weight:none;
+ font-weight:normal;
padding:0;
}
@@ -118,7 +118,7 @@
/* definition for content table */
.tableheading {
background-color:#D0D0D0;
- text-align=center;
+ text-align:center;
font-weight: bold
}
@@ -136,7 +136,7 @@
.prev, .next, up, down {
font-family: arial,helvetica, sans-serif;
font-size: small;
- text-decoration: bold
+ font-weight: bold
}
/* top */
@@ -165,7 +165,7 @@
Use this style if you need to display a warning*/
.warning {
- color: red:
+ color: red;
text-decoration: none
}
@@ -241,12 +241,12 @@
.altRowStyleEven {
background-color: #EAEAEA;
- font-weight: none
+ font-weight: normal
}
.altRowStyleOdd {
background-color: #E0E0E0;
- font-weight: none
+ font-weight: normal
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge/Theme.class.php 2011-02-28 01:44:51 UTC (rev 13575)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/themes/gforge/Theme.class.php 2011-02-28 01:45:07 UTC (rev 13576)
@@ -255,7 +255,7 @@
return '
<!-- Box Top Start -->
- <table cellspacing="0" cellpadding="0" width="100%" border="0" background="'.$this->imgroot.'vert-grad.png">
+ <table cellspacing="0" cellpadding="0" style="table-layout:fixed" width="100%" border="0" background="'.$this->imgroot.'vert-grad.png">
<tr align="center">
<td valign="top" style="text-align:right" width="10" background="'.$this->imgroot.'box-topleft.png"><img src="'.$this->imgroot.'clear.png" width="10" height="20" /></td>
<td width="100%" background="'.$this->imgroot.'box-grad.png"><span class="titlebar">'.$title.'</span></td>
More information about the evolvis-commits
mailing list