Commit 82a2189a authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/9.x 43276 to 43286

parents 70f9d524 b9bc2ce3
......@@ -85,6 +85,7 @@ db/tiki-db-adodb.php -text
db/tiki-db-pdo.php -text
db/tiki-db.php -text
db/tiki-secdb_9.0_mysql.sql -text
db/tiki-secdb_9.2_mysql.sql -text
db/tiki.sql -text
db/tiki_1.8to1.9.sql -text
db/tiki_1.9to2.0.sql -text
......
Tiki! The wiki with a lot of features!
Version 9.0
Version 9.2beta1
DOCUMENTATION
* The documentation for 9.0 version is ever evolving at http://doc.tiki.org.
* The documentation for 9.2 version is ever evolving at http://doc.tiki.org.
You're encouraged to contribute.
* It is highly recommended that you refer to the online documentation:
* http://doc.tiki.org/Installation for a setup guide
* Notes about this release are accessible from http://tiki.org/ReleaseNotes90
* Notes about this release are accessible from http://tiki.org/ReleaseNotes92
* Tikiwiki has an active IRC channel, #tikiwiki on irc.freenode.net
INSTALLATION
......
......@@ -4,25 +4,25 @@ Tiki Copyright
The following list attempts to gather the copyright holders for Tiki
as of version 9.0.
Accounts listed below with commits have contributed source code to CVS or SVN.
Please note that even more people contributed on various other aspects (documentation,
Accounts listed below with commits have contributed source code to CVS or SVN.
Please note that even more people contributed on various other aspects (documentation,
bug reporting, testing, etc.)
This is how we implement the Tiki Social Contract.
http://tiki.org/Social+Contract
List of members of the Community
As of 2012-06-26, the community has:
* 533 members on SourceForge.net,
* 266 of those people who made at least one code commit
As of 2012-10-04, the community has:
* 539 members on SourceForge.net,
* 269 of those people who made at least one code commit
This list is automatically generated and alphabetically sorted
from subversion repository by the following script:
doc/devtools/release.php
Counting the commits is not as trivial as it may sound. If your number of commits
seems incorrect, it could be that the script is not detecting them all. This
has been reported especially for commits early on in the project. Nonetheless,
seems incorrect, it could be that the script is not detecting them all. This
has been reported especially for commits early on in the project. Nonetheless,
the list provides a general idea.
====================================================================
......@@ -95,8 +95,8 @@ SF Role: Developer
Nickname: amette
Name: Alexander Mette
First Commit: 2005-05-19
Last Commit: 2012-06-18
Number of Commits: 115
Last Commit: 2012-10-04
Number of Commits: 182
SF Role: Developer
Nickname: amotl
......@@ -148,8 +148,8 @@ Number of Commits: 24
Nickname: arildb
First Commit: 2011-09-04
Last Commit: 2012-06-12
Number of Commits: 159
Last Commit: 2012-10-04
Number of Commits: 168
SF Role: Developer
Nickname: as6o
......@@ -400,15 +400,15 @@ SF Role: Developer
Nickname: changi67
Name: Jean-François B.
First Commit: 2009-04-23
Last Commit: 2012-06-26
Number of Commits: 1033
Last Commit: 2012-10-04
Number of Commits: 1130
SF Role: Packager (.rpm, .deb etc)
Nickname: chealer
Name: Philippe Cloutier
First Commit: 2003-09-27
Last Commit: 2012-06-02
Number of Commits: 1842
Last Commit: 2012-08-21
Number of Commits: 1843
SF Role: Developer
Nickname: chessy
......@@ -418,8 +418,8 @@ SF Role: Developer
Nickname: chibaguy
Name: Gary Cunningham-Lee
First Commit: 2006-02-04
Last Commit: 2012-06-25
Number of Commits: 1700
Last Commit: 2012-09-19
Number of Commits: 1752
SF Role: Web Designer
Nickname: chris_holman
......@@ -687,8 +687,8 @@ SF Role: Developer
Nickname: eromneg
First Commit: 2009-06-07
Last Commit: 2012-06-23
Number of Commits: 113
Last Commit: 2012-08-24
Number of Commits: 118
Nickname: essele
Name: Lee Essen
......@@ -769,6 +769,10 @@ First Commit: 2006-09-07
Last Commit: 2006-09-07
Number of Commits: 1
Nickname: fmg-sf
Name: Frank Guthausen
SF Role: Developer
Nickname: fmjrey
Name: François Rey
SF Role: Developer
......@@ -858,8 +862,8 @@ SF Role: Developer
Nickname: gezzzan
Name: gezza
First Commit: 2009-05-02
Last Commit: 2012-05-04
Number of Commits: 61
Last Commit: 2012-08-09
Number of Commits: 62
SF Role: Translator (I18N/L10N)
Nickname: ggeller
......@@ -946,8 +950,8 @@ SF Role: Developer
Nickname: gta74
First Commit: 2011-01-29
Last Commit: 2012-06-09
Number of Commits: 108
Last Commit: 2012-09-22
Number of Commits: 122
Nickname: guideweb
Name: Samuel Denis D'Ortun
......@@ -1165,6 +1169,9 @@ SF Role: Developer
Nickname: jfnoubel
Name: Jean-François Noubel
Nickname: jjermann
Name: Jonas Jermann
Nickname: jjolly
Name: John Jolly
First Commit: 2004-10-13
......@@ -1218,11 +1225,22 @@ Last Commit: 2008-11-20
Number of Commits: 1
SF Role: Developer
Nickname: johndpar
Name: John
SF Role: Developer
Nickname: johndparker
Name: John Parker
First Commit: 2012-07-08
Last Commit: 2012-07-10
Number of Commits: 2
SF Role: Developer
Nickname: jonnybradley
Name: jonny Bradley
First Commit: 2007-08-15
Last Commit: 2012-06-26
Number of Commits: 4601
Last Commit: 2012-10-04
Number of Commits: 4849
SF Role: Developer
Nickname: jorgercosta
......@@ -1284,8 +1302,8 @@ Name: Jyes Beat
Nickname: jyhem
Name: Jean-Marc Libs
First Commit: 2006-12-11
Last Commit: 2012-06-26
Number of Commits: 637
Last Commit: 2012-10-04
Number of Commits: 660
SF Role: Developer
Nickname: k2s
......@@ -1418,9 +1436,10 @@ Name: Lee Wilson (aka stella12)
SF Role: Developer
Nickname: lindonb
Name: Lindon Barnfield
First Commit: 2009-05-10
Last Commit: 2012-06-09
Number of Commits: 550
Last Commit: 2012-10-01
Number of Commits: 657
Nickname: llunax
Name: Lluna
......@@ -1449,8 +1468,8 @@ Name: Louis-Martin Richard
Nickname: lphuberdeau
Name: Louis-Philippe Huberdeau
First Commit: 2004-04-10
Last Commit: 2012-06-20
Number of Commits: 2795
Last Commit: 2012-10-02
Number of Commits: 2938
SF Role: Developer
Nickname: lrargerich
......@@ -1484,8 +1503,8 @@ Name: Lucas Emanoel
Nickname: luciash
Name: luciash d' being
First Commit: 2003-08-05
Last Commit: 2012-05-29
Number of Commits: 992
Last Commit: 2012-08-23
Number of Commits: 1002
SF Role: Developer
Nickname: lueders
......@@ -1537,8 +1556,8 @@ SF Role: Developer
Nickname: marclaporte
Name: Marc Laporte
First Commit: 2003-11-28
Last Commit: 2012-06-25
Number of Commits: 1511
Last Commit: 2012-10-03
Number of Commits: 1590
SF Role: Project Manager
Nickname: marcmont
......@@ -1716,6 +1735,13 @@ Nickname: mixolyde
Name: Brian Williams
SF Role: Developer
Nickname: mjeanson3
Name: Michael Jeanson
First Commit: 2012-07-10
Last Commit: 2012-07-10
Number of Commits: 1
SF Role: Packager (.rpm, .deb etc)
Nickname: mlinton
Name: Michael Linton
First Commit: 2004-11-26
......@@ -1743,6 +1769,7 @@ Name: Loďc Monthorin
SF Role: Developer
Nickname: moresun
Name: Markus Bader
SF Role: Developer
Nickname: morgamic
......@@ -1772,8 +1799,8 @@ Number of Commits: 29
Nickname: muscote
Name: Torsten Fabricius
First Commit: 2011-07-07
Last Commit: 2011-08-29
Number of Commits: 3
Last Commit: 2012-09-05
Number of Commits: 5
Nickname: musus
First Commit: 2003-12-18
......@@ -1847,8 +1874,8 @@ Number of Commits: 3
Nickname: nkoth
Name: Nelson
First Commit: 2007-05-17
Last Commit: 2012-06-13
Number of Commits: 1400
Last Commit: 2012-09-20
Number of Commits: 1407
SF Role: Developer
Nickname: normandaoust
......@@ -1933,6 +1960,9 @@ Nickname: pablod
Name: Pablo Ariel Duboue
SF Role: Developer
Nickname: panamaus
Name: David Carter
Nickname: panathos
Name: Panathos
SF Role: Translator (I18N/L10N)
......@@ -2029,8 +2059,8 @@ Number of Commits: 1
Nickname: pkdille
First Commit: 2007-03-14
Last Commit: 2012-05-06
Number of Commits: 1879
Last Commit: 2012-09-01
Number of Commits: 1880
SF Role: Developer
Nickname: plillevold
......@@ -2071,6 +2101,9 @@ SF Role: Developer
Nickname: ppttrr
Name: Pete Jalajas
First Commit: 2012-06-30
Last Commit: 2012-07-08
Number of Commits: 3
SF Role: Tester
Nickname: pratesi
......@@ -2173,8 +2206,8 @@ SF Role: Developer
Nickname: ricks99
Name: Rick Sapir
First Commit: 2007-07-19
Last Commit: 2012-05-14
Number of Commits: 383
Last Commit: 2012-08-08
Number of Commits: 384
SF Role: Developer
Nickname: ripero
......@@ -2214,8 +2247,8 @@ SF Role: Developer
Nickname: robertplummer
Name: Robert Plummer
First Commit: 2010-06-30
Last Commit: 2012-06-26
Number of Commits: 1257
Last Commit: 2012-10-02
Number of Commits: 1486
Nickname: robferguson
Name: Rob Ferguson
......@@ -2450,8 +2483,8 @@ SF Role: Developer
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
Last Commit: 2012-06-08
Number of Commits: 7092
Last Commit: 2012-10-01
Number of Commits: 7107
SF Role: Developer
Nickname: syracine
......@@ -2510,8 +2543,8 @@ SF Role: Developer
Nickname: tikii18nbot
Name: Tiki i18n bot
First Commit: 2011-06-27
Last Commit: 2012-04-16
Number of Commits: 31
Last Commit: 2012-08-15
Number of Commits: 35
Nickname: tilttek
Name: Philippe Gamache
......@@ -2660,8 +2693,8 @@ SF Role: Developer
Nickname: xavidp
Name: Xavier de Pedro
First Commit: 2005-07-08
Last Commit: 2012-06-26
Number of Commits: 690
Last Commit: 2012-09-11
Number of Commits: 725
SF Role: All-Hands Person
Nickname: xbtheria
......@@ -2696,8 +2729,8 @@ SF Role: Developer
Nickname: yonixxx
Name: Bernard Sfez
First Commit: 2008-02-25
Last Commit: 2012-06-25
Number of Commits: 79
Last Commit: 2012-10-02
Number of Commits: 81
Nickname: ysoya
Name: YongHa Kim
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -402,7 +402,7 @@ class RegistrationLib extends TikiLib
if (!$pending) {
$logslib->add_log('register', 'created account ' . $registration['name']);
if ($this->merged_prefs['validateRegistration'] == 'y') {
$result=$smarty->fetch('mail/user_validation_waiting_msg.tpl');
$result=nl2br($smarty->fetch('mail/user_validation_waiting_msg.tpl'));
} else {
$result=$smarty->fetch('mail/user_validation_msg.tpl');
}
......
<?php
// (c) Copyright 2002-2012 by authors of the Tiki Wiki CMS Groupware Project
//
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
......@@ -170,6 +170,7 @@ class TWVersion
'9.0beta',
'9.0beta2',
'9.0',
'9.2beta1',
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment