- reintegrated the changes (mostly bug fixes) from the 0.7.2 branch

SVN:trunk[83]
This commit is contained in:
Denis Flaven
2009-07-18 17:24:25 +00:00
parent 10442e65fa
commit 665d90175f
30 changed files with 114 additions and 105 deletions

View File

@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<bizPerson id="21">
<name>Denis</name>
<name>Verne</name>
<status>production</status>
<org_id>3</org_id>
<email>denis.flaven@gmail.com</email>
<email>jules.verne@gmail.com</email>
<phone></phone>
<location_id>29</location_id>
<first_name>Flaven</first_name>
<first_name>Jules</first_name>
<employe_number></employe_number>
</bizPerson>
<bizPerson id="20">
<name>Quetiez</name>
<name>Dumas</name>
<status>production</status>
<org_id>3</org_id>
<email>romain.quetiez@gmail.com</email>
<email>alexandre.dumas@gmail.com</email>
<phone></phone>
<location_id>1</location_id>
<first_name>Romain</first_name>
<first_name>Dumas</first_name>
<employe_number></employe_number>
</bizPerson>
<bizPerson id="7">
<name>Taloc</name>
<name>Hugo</name>
<status>production</status>
<org_id>3</org_id>
<email>erwan.taloc@gmail.com</email>
<email>victor.hugo@gmail.com</email>
<phone>33172382223</phone>
<location_id>1</location_id>
<first_name>Erwan</first_name>
<first_name>Victor</first_name>
<employe_number>e12345</employe_number>
</bizPerson>
</Set>
</Set>

View File

@@ -592,7 +592,7 @@ text-align:center;
&lt;p&gt;&lt;/p&gt;
&lt;p style=&quot;text-align:center; font-family:Georgia, &apos;Times New Roman&apos;, Times, serif; font-size:32px;&quot;&gt;Welcome to iTop&lt;/p&gt;
&lt;p&gt;&lt;/p&gt;
&lt;p style=&quot;text-align:center; font-family:Georgia, &apos;Times New Roman&apos;, Times, serif; font-size:14px;&quot;&gt;&lt;i&gt;Version 0.7&lt;/i&gt;&lt;/p&gt;
&lt;p style=&quot;text-align:center; font-family:Georgia, &apos;Times New Roman&apos;, Times, serif; font-size:14px;&quot;&gt;&lt;i&gt;Version 0.8&lt;/i&gt;&lt;/p&gt;
</template>
<rank>1</rank>