Commit e6c6daa2 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/7.x 34406 to 34442

parent 162dfeea
Tiki! The wiki with a lot of features!
Version 7.0beta1
Version 7.0beta2
DOCUMENTATION
......
This diff is collapsed.
......@@ -12,7 +12,7 @@ This is how we implement the Tiki Social Contract.
http://tiki.org/Social+Contract
List of members of the Community
As of 2011-04-22, the community has:
As of 2011-05-16, the community has:
* 505 members on SourceForge.net,
* 249 of those people who made at least one code commit
......@@ -316,8 +316,8 @@ SF Role: Developer
Nickname: bubi
Name: Burghard W.V. Britzke
First Commit: 2010-05-19
Last Commit: 2010-06-06
Number of Commits: 7
Last Commit: 2011-05-16
Number of Commits: 8
Nickname: bulldogtor
Name: Nick Rapitosovich
......@@ -397,8 +397,8 @@ SF Role: Packager (.rpm, .deb etc)
Nickname: chealer
Name: Philippe Cloutier
First Commit: 2003-09-27
Last Commit: 2011-04-16
Number of Commits: 1057
Last Commit: 2011-05-15
Number of Commits: 1074
SF Role: Developer
Nickname: chessy
......@@ -408,8 +408,8 @@ SF Role: Developer
Nickname: chibaguy
Name: Gary Cunningham-Lee
First Commit: 2006-02-04
Last Commit: 2011-04-22
Number of Commits: 1565
Last Commit: 2011-05-11
Number of Commits: 1590
SF Role: Web Designer
Nickname: chris_holman
......@@ -883,8 +883,8 @@ SF Role: Developer
Nickname: gregmartin
Name: Greg Martin
First Commit: 2006-12-19
Last Commit: 2010-10-15
Number of Commits: 8
Last Commit: 2011-05-15
Number of Commits: 9
SF Role: Developer
Nickname: grom_3
......@@ -1165,8 +1165,8 @@ SF Role: Developer
Nickname: jonnybradley
Name: jonny Bradley
First Commit: 2007-08-15
Last Commit: 2011-04-22
Number of Commits: 3380
Last Commit: 2011-05-16
Number of Commits: 3466
SF Role: Developer
Nickname: jorgercosta
......@@ -1357,8 +1357,8 @@ SF Role: Developer
Nickname: lindonb
First Commit: 2009-05-10
Last Commit: 2011-04-22
Number of Commits: 402
Last Commit: 2011-05-15
Number of Commits: 424
Nickname: llunax
Name: Lluna
......@@ -1387,8 +1387,8 @@ Name: Louis-Martin Richard
Nickname: lphuberdeau
Name: Louis-Philippe Huberdeau
First Commit: 2004-04-10
Last Commit: 2011-04-21
Number of Commits: 2074
Last Commit: 2011-05-13
Number of Commits: 2136
SF Role: Developer
Nickname: lrargerich
......@@ -1468,8 +1468,8 @@ SF Role: Developer
Nickname: marclaporte
Name: Marc Laporte
First Commit: 2003-11-28
Last Commit: 2011-04-15
Number of Commits: 1104
Last Commit: 2011-05-10
Number of Commits: 1125
SF Role: Project Manager
Nickname: marcmont
......@@ -1756,8 +1756,8 @@ Number of Commits: 3
Nickname: nkoth
Name: Nelson
First Commit: 2007-05-17
Last Commit: 2011-03-28
Number of Commits: 879
Last Commit: 2011-05-14
Number of Commits: 892
SF Role: Developer
Nickname: normandaoust
......@@ -1927,8 +1927,8 @@ Number of Commits: 1
Nickname: pkdille
First Commit: 2007-03-14
Last Commit: 2011-04-22
Number of Commits: 1646
Last Commit: 2011-05-13
Number of Commits: 1652
SF Role: Developer
Nickname: plillevold
......@@ -2111,8 +2111,8 @@ SF Role: Developer
Nickname: robertplummer
Name: Robert Plummer
First Commit: 2010-06-30
Last Commit: 2011-04-15
Number of Commits: 193
Last Commit: 2011-05-04
Number of Commits: 202
Nickname: robferguson
Name: Rob Ferguson
......@@ -2190,8 +2190,8 @@ Number of Commits: 3
Nickname: sampaioprimo
Name: Rodrigo Sampaio Primo
First Commit: 2005-10-17
Last Commit: 2011-04-19
Number of Commits: 722
Last Commit: 2011-05-13
Number of Commits: 753
SF Role: Developer
Nickname: scarle
......@@ -2215,8 +2215,8 @@ SF Role: Developer
Nickname: sept_7
Name: Stéphane Casset
First Commit: 2007-07-03
Last Commit: 2011-03-03
Number of Commits: 1033
Last Commit: 2011-05-12
Number of Commits: 1038
Nickname: sewilco
Name: Scot Wilcoxon
......@@ -2328,8 +2328,8 @@ SF Role: Developer
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
Last Commit: 2011-04-14
Number of Commits: 6529
Last Commit: 2011-05-15
Number of Commits: 6575
SF Role: Developer
Nickname: syracine
......@@ -2524,8 +2524,8 @@ SF Role: Developer
Nickname: xavidp
Name: Xavier de Pedro
First Commit: 2005-07-08
Last Commit: 2011-04-16
Number of Commits: 442
Last Commit: 2011-05-10
Number of Commits: 448
SF Role: All-Hands Person
Nickname: xbtheria
......
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.
......@@ -17,10 +17,15 @@ class Tracker_Field_Checkbox extends Tracker_Field_Abstract
{
$ins_id = $this->getInsertId();
if (isset($requestData[$ins_id]) && $requestData[$ins_id] == 'on') {
$val = 'y';
} elseif (!empty($requestData)) {
$val = 'n';
} else {
$val = $this->getValue();
}
return array(
'value' => (isset($requestData[$ins_id]) && $requestData[$ins_id] == 'on')
? 'y'
: $this->getValue('n'),
'value' => $val,
);
}
......
......@@ -98,9 +98,9 @@ function prefs_mobile_list() {
),
'mobile_use_latest_lib' => array(
'name' => tra('Use Latest Library'),
'description' => tra('Use latest test version of the jquery.mobile'),
'description' => tra('Use latest version of the jquery.mobile'),
'help' => 'Mobile',
'warning' => tra('Caution: Uses jqm development server, please use sparingly.'),
'warning' => tra('Uses latest build from jquery.com CDN.'),
'type' => 'flag',
'dependencies' => array(
'mobile_feature',
......
......@@ -33,10 +33,12 @@ if ( !isset($_REQUEST['mobile_mode']) || $_REQUEST['mobile_mode'] === 'y' ) {
$prefs['feature_sefurl'] = 'n';
$prefs['feature_wysiwyg'] = 'n';
$prefs['ajax_autosave'] = 'n';
$prefs['change_theme'] = 'n';
$headerlib->add_js('function sfHover() {alert("not working?");}', 100); // try and override the css menu func
$prefs['change_theme'] = 'n';
// a few requirements
$prefs['feature_html_head_base_tag'] = 'y';
$prefs['style'] = 'mobile.css'; // set in prespective but seems to need a nudge here
//$_SESSION['s_prefs']['style'] = 'mobile.css';
......
......@@ -141,6 +141,7 @@ class TWVersion
'6.1RC1',
'6.1',
'7.0beta1',
'7.0beta2',
);
}
......
This diff is collapsed.
......@@ -671,10 +671,10 @@ function flip_class(itemid, class1, class2) {
function tikitabs( focus, tabElement) {
var container;
if (tabElement === "undefined") {
container = $(".tabs:first").parent();
if (typeof tabElement === "undefined") {
container = $(".tabset:first");
} else {
container = $(tabElement).parents(".tabs:first").parent();
container = $(tabElement).parents(".tabset:first");
}
if (focus > $("> .tabs .tabmark", container).length) {
......
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.
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