BugTrack/2408 Remove 'Waiting CVS' status from bugtrack and tracker

diff --git a/plugin/bugtrack.inc.php b/plugin/bugtrack.inc.php
index d0c0c58..7468803 100644 (file)
--- a/plugin/bugtrack.inc.php
+++ b/plugin/bugtrack.inc.php
@@ -22,9 +22,9 @@ function plugin_bugtrack_init()
 
        $_plugin_bugtrack = array(
                'priority_list'  => array('緊急', '重要', '普通', '低'),
-               'state_list'     => array('提案', '着手', 'CVS待ち', '完了', '保留', '却下'),
-               'state_sort'     => array('着手', 'CVS待ち', '保留', '完了', '提案', '却下'),
-               'state_bgcolor'  => array('#ccccff', '#ffcc99', '#ccddcc', '#ccffcc', '#ffccff', '#cccccc', '#ff3333'),
+               'state_list'     => array('提案', '着手', '完了', '保留', '却下'),
+               'state_sort'     => array('着手', '保留', '完了', '提案', '却下'),
+               'state_bgcolor'  => array('#ccccff', '#ffcc99', '#ccffcc', '#ffccff', '#cccccc', '#ff3333'),
                'header_bgcolor' => '#ffffcc',
                'base'     => 'ページ',
                'summary'  => 'サマリ',

diff --git a/wiki.en/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt b/wiki.en/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
index f65ebb5..65b428e 100644 (file)
--- a/wiki.en/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
+++ b/wiki.en/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
@@ -26,7 +26,6 @@ These settings below, are used when no tracker configuration is specified. (e.g.
 |Index         |Cell format        |h
 |Proposed      |BGCOLOR(#ffccff):%s|
 |Started       |BGCOLOR(#ccccff):%s|
-|Waiting commit|BGCOLOR(#ffccff):%s|
 |Fixed         |BGCOLOR(#ccffcc):%s|
 |Suspended     |BGCOLOR(#ccddcc):%s|
 |Refused       |BGCOLOR(#cccccc):%s|

diff --git a/wiki/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt b/wiki/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
index 980c843..ad22f3a 100644 (file)
--- a/wiki/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
+++ b/wiki/3A636F6E6669672F706C7567696E2F747261636B65722F64656661756C74.txt
@@ -26,7 +26,6 @@ trackerプラグインで設定を指定しなかった場合、この設定が
 |見出し |セルの書式         |h
 |提案   |BGCOLOR(#ffccff):%s|
 |着手   |BGCOLOR(#ccccff):%s|
-|CVS待ち|BGCOLOR(#ffccff):%s|
 |完了   |BGCOLOR(#ccffcc):%s|
 |保留   |BGCOLOR(#ccddcc):%s|
 |却下   |BGCOLOR(#cccccc):%s|