jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views/account/register.html.erb

348 lines
13 KiB
Plaintext
Raw Normal View History

Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<!-- added by bai <20><><EFBFBD>ӵ<EFBFBD><D3B5><EFBFBD>-->
增加了“地区”
2013-09-13 22:47:14 +08:00
<script type="text/javascript" language="javascript">
function showcity(province, cityField) {
switch (province) {
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>̨","ʯ<><CAAF>ɽ","<22><><EFBFBD><EFBFBD>","<22><>ͷ<EFBFBD><CDB7>",
"<22><>ɽ","ͨ<><CDA8>","˳<><CBB3>","<22><>ƽ","<22><><EFBFBD><EFBFBD>","ƽ<><C6BD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>Ϻ<EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","¬<><C2AC>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","բ<><D5A2>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><>ɽ","<22>ζ<EFBFBD>","<22>ֶ<EFBFBD>","<22><>ɽ","<22>ɽ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ϻ<EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>㶫" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>麣","<22><>ݸ","<22><>ɽ","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><>Դ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ï<><C3AF>",
"÷<><C3B7>","<22><>Զ","<22><>ͷ","<22><>β","<22>ع<EFBFBD>","˳<><CBB3>","<22><><EFBFBD><EFBFBD>","<22>Ƹ<EFBFBD>","տ<><D5BF>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22>Ͼ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><><EFBFBD>Ƹ<EFBFBD>","<22><>ͨ",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ǩ","<22><><EFBFBD><EFBFBD>","̫<><CCAB>","̩<><CCA9>","ͬ<><CDAC>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>γ<EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>żҸ<C5BC>","<22><><EFBFBD><EFBFBD>","<22><>ׯ");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD>ɿ<EFBFBD>","<22><><EFBFBD><EFBFBD>","ɳƺ<C9B3><C6BA>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22>ϰ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ʢ",
"˫<><CBAB>","<22>山","<22><><EFBFBD><EFBFBD>","ǭ<><C7AD>","<22><><EFBFBD><EFBFBD>","<22>뽭","<22><><EFBFBD><EFBFBD>","ͭ<><CDAD>","<22><><EFBFBD><EFBFBD>","<22>ٲ<EFBFBD>","<22><>ɽ",
"<22><>ƽ","<22>ǿ<EFBFBD>","<22>ᶼ","<22>潭","<22><>¡","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><>Ϫ",
"ʯ<><CAAF>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><>ˮ","<22><><EFBFBD><EFBFBD>","<22>ϴ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ϴ<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22>Ϸ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><>ɽ","<22>Ż<EFBFBD>ɽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>ɽ","<22><><EFBFBD><EFBFBD>","ͭ<><CDAD>","<22><>Ϫ","<22>ߺ<EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","Ȫ<><C8AA>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ƽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ػ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ȫ","<22><><EFBFBD><EFBFBD>","ƽ<><C6BD>","<22><>ˮ",
"<22>䶼","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ҵ");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><>ɫ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD>Ǹ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ӳ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><>˳","<22>Ͻ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>ˮ","ͭ<><CDAD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ˮ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ͨʲ","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>ӱ<EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"ʯ<><CAAF>ׯ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>е<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ˮ","<22>ȷ<EFBFBD>","<22>ϴ<EFBFBD><CFB4><EFBFBD>","<22>ػʵ<D8BB>",
"<22><>ɽ","<22>³<EFBFBD>","<22><>̨","<22>żҿ<C5BC>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD>˰<EFBFBD><CBB0><EFBFBD>","<22>׸<EFBFBD>","<22>ں<EFBFBD>","<22><>ľ˹","<22><><EFBFBD><EFBFBD>","ĵ<><C4B5><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"<22><>̨<EFBFBD><CCA8>","˫Ѽɽ","<22>绯","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"֣<><D6A3>","<22><><EFBFBD><EFBFBD>","<22>ױ<EFBFBD>","<22>괨","<22><><EFBFBD><EFBFBD>","<22><>Դ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ƽ<><C6BD>ɽ",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>Ͽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ܿ<EFBFBD>","פ<><D7A4><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>½<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22>人","<22><>ʩ","<22><><EFBFBD><EFBFBD>","<22>Ƹ<EFBFBD>","<22><>ʯ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","DZ<><C7B1>","ʮ<><CAAE>","<22><><EFBFBD><EFBFBD>","<22><>Ѩ",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>差","Т<><D0A2>","<22>˲<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><>ɳ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","¦<><C2A6>","<22><><EFBFBD><EFBFBD>","<22><>̶","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22>żҽ<C5BC>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22>ϲ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>ɽ","<22>Ž<EFBFBD>","®ɽ","Ƽ<><C6BC>",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>˴<EFBFBD>","ӥ̶");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>׳<EFBFBD>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><>Դ","÷<><C3B7>","<22><>ƽ","<22><>ԭ","ͨ<><CDA8>","<22>Ӽ<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><>Ϫ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>˳","<22><><EFBFBD><EFBFBD>","<22><>«<EFBFBD><C2AB>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22>̽<EFBFBD>","<22><><EFBFBD><EFBFBD>","Ӫ<><D3AA>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
var cityOptions = new Array("<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD>ɹ<EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD>ͺ<EFBFBD><CDBA><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><>ͷ","<22><><EFBFBD><EFBFBD>","<22><>ʤ","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ٺ<EFBFBD>","ͨ<><CDA8>","<22>ں<EFBFBD>",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD>ֺ<EFBFBD><D6BA><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><>Դ","ʯ<><CAAF>ɽ","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>ຣ" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>ľ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ͬ<><CDAC>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "ɽ<><C9BD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ӫ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ij<EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22>ൺ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","̩<><CCA9>","Ϋ<><CEAB>","<22><><EFBFBD><EFBFBD>","<22><>̨","<22><>ׯ","<22>Ͳ<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "ɽ<><C9BD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"̫ԭ","<22><><EFBFBD><EFBFBD>","<22><>ͬ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ʯ","<22>ٷ<EFBFBD>","<22><><EFBFBD><EFBFBD>","˷<><CBB7>","<22><><EFBFBD><EFBFBD>",
"<22><>Ȫ","<22>ܴ<EFBFBD>","<22>˳<EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","μ<><CEBC>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ͭ<><CDAD>","<22><><EFBFBD><EFBFBD>","<22>Ӱ<EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>Ĵ<EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22>ɶ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ﴨ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><>üɽ","<22><><EFBFBD><EFBFBD>","<22>㰲","<22><>Ԫ","<22><>կ<EFBFBD><D5AF>",
"<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","üɽ","<22>ϳ<EFBFBD>","<22>ڽ<EFBFBD>","<22><>֦<EFBFBD><D6A6>","<22><><EFBFBD><EFBFBD>",
"<22>봨","<22><><EFBFBD><EFBFBD>","<22>Ű<EFBFBD>","<22>˱<EFBFBD>","<22>Թ<EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "̨<><CCA8>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"̨<><CCA8>","<22><>¡","̨<><CCA8>","̨<><CCA8>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ͷ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>û<EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>԰","<22><><EFBFBD><EFBFBD>","̨<><CCA8>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><>ƽ","<22><><EFBFBD><EFBFBD>","<22>Ӷ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>Ͽ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ӱ<EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>½<EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><>³ľ<C2B3><C4BE>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>̩","<22><>ͼʲ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ʲ",
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22>⳵","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","ʯ<><CAAF><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>³<EFBFBD><C2B3>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>֥","<22><><EFBFBD><EFBFBD>","<22>տ<EFBFBD><D5BF><EFBFBD>","ɽ<><C9BD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Զ","<22>ٲ<EFBFBD>","<22><><EFBFBD><EFBFBD>",
"<22><><EFBFBD><EFBFBD>","º<><C2BA>","<22><><EFBFBD><EFBFBD>","˼é","<22><>ɽ","<22><>˫<EFBFBD><CBAB><EFBFBD><EFBFBD>","<22><>Ϫ","<22>е<EFBFBD>","<22><>ͨ");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22>㽭" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ϫ","<22><><EFBFBD><EFBFBD>","<22>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22>ٰ<EFBFBD>",
"<22>ٺ<EFBFBD>","<22><>ˮ","<22><><EFBFBD><EFBFBD>","걺<>","ƽ<><C6BD>","ǧ<><C7A7><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>ɽ","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>",
"̨<><CCA8>","<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD>","<22><>Ҧ","<22><>ɽ");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
case "<22><><EFBFBD><EFBFBD>" :
增加了“地区”
2013-09-13 22:47:14 +08:00
var cityOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22>ձ<EFBFBD>","Ӣ<><D3A2>","<22><><EFBFBD><EFBFBD>","<22>¹<EFBFBD>","<22><><EFBFBD><EFBFBD>");
增加了“地区”
2013-09-13 22:47:14 +08:00
break;
default:
var cityOptions = new Array("");
break;
}
cityField.options.length = 0;
for(var i = 0; i < cityOptions.length; i++) {
cityField.options[i]=new Option(cityOptions[i],cityOptions[i]);
/*
if (cityField.options[i].value==city)
{
//alert("here put City ok!");
document.oblogform["city"].selectedIndex = i;
}*/
}
}
</script>
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<!-- added by bai <20><><EFBFBD><EFBFBD>ְ<EFBFBD><D6B0>-->
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
<script type="text/javascript" language="javascript">
function showtechnical_title(identity, technical_titleField) {
switch (identity) {
case '0' :
$('#technical_title').show()
$('#no').hide()
var technical_titleOptions = new Array(
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
"<22><><EFBFBD><EFBFBD>","<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","<22><>ʦ","<22><><EFBFBD><EFBFBD>");
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
break;
case '1' :
$('#technical_title').hide()
$('#no').show()
var titleOptions = new Array("");
break;
default:
$('#technical_title').hide()
$('#no').hide()
var titleOptions = new Array("");
break;
}
technical_titleField.options.length = 0;
for(var i = 0; i < technical_titleOptions.length; i++) {
technical_titleField.options[i]=new Option(technical_titleOptions[i],technical_titleOptions[i]);
/*
if (cityField.options[i].value==city)
{
//alert("here put City ok!");
document.oblogform["city"].selectedIndex = i;
}*/
}
}
</script>
增加了“地区”
2013-09-13 22:47:14 +08:00
<!-- end -->
1、修复了丢失的国际化 2、增加了性别
2013-09-12 20:19:49 +08:00
<h3><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3>
first commit
2013-08-01 10:33:49 +08:00
<%= labelled_form_for @user, :url => register_path do |f| %>
<%= error_messages_for 'user' %>
<div class="box tabular">
<% if @user.auth_source_id.nil? %>
将issue加入活动中，添加读取活动数据的方法
2013-08-13 16:29:02 +08:00
<p><%= f.text_field :login, :size => 25, :required => true %>
稍该国际化
2013-08-13 16:37:08 +08:00
<em class="info"><%= l(:label_max_number) %></em></p>
first commit
2013-08-01 10:33:49 +08:00
<p><%= f.password_field :password, :size => 25, :required => true %>
<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
<% end %>
<p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p>
<p><%= f.text_field :mail, :required => true %></p>
修正 注册
2013-08-17 10:34:19 +08:00
<p>
<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
first commit
2013-08-01 10:33:49 +08:00
<p><%= f.select :language, lang_options_for_select %></p>
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<!-- added by bai <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݡ<EFBFBD><DDA1>Ա𡢵<D4B1><F0A1A2B5><EFBFBD><EFBFBD>ͽ<EFBFBD>ʦ<EFBFBD><CAA6>ְ<EFBFBD><D6B0>-->
1、增加“我的账号”里的了工作单位 2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
<td class="info" style="width: 10px">
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
<select onchange="showtechnical_title(this.value, document.getElementById(&#39;userTechnical_title&#39;));" name="identity" id="userProvince">
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<option value="">--<2D><>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--</option>
<option value="0"><3E><>ʦ</option>
<option value="1">ѧ<><D1A7></option>
<option value="2"><3E><>ҵ</option>
<option value="3"><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></option>
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
</select></td>
<td class="info" style="width: 100px">
<span id = 'technical_title' style = 'display:none'>
<select name="technical_title" id="userTechnical_title"></select></span>
<span id = 'no' style = 'display:none'>
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<input name="no" id="no" placeholder="<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѧ<EFBFBD><D1A7>"></select></span>
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
</td></tr></table></p>
<!-- end -->
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %></strong></td>
<td class="info" style="width: 10px">
<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
<option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></td></tr></table></p>
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_location) %></strong></td>
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
<td class="info" style="width: 80px">
<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
<option value="">--<2D><>ѡ<EFBFBD><D1A1>ʡ<EFBFBD><CAA1>--</option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>Ϻ<EFBFBD>"><3E>Ϻ<EFBFBD></option>
<option value="<22>㶫"><3E>㶫</option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>㽭"><3E>㽭</option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>ӱ<EFBFBD>"><3E>ӱ<EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD>ɹ<EFBFBD>"><3E><><EFBFBD>ɹ<EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>ຣ"><3E>ຣ</option>
<option value="ɽ<><C9BD>">ɽ<><C9BD></option>
<option value="ɽ<><C9BD>">ɽ<><C9BD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>Ĵ<EFBFBD>"><3E>Ĵ<EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22>½<EFBFBD>"><3E>½<EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><D8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD><EFBFBD>ر<EFBFBD><D8B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></option>
<option value="̨<><CCA8>">̨<><CCA8></option>
<option value="<22><><EFBFBD><EFBFBD>"><3E><><EFBFBD><EFBFBD></option>
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
</select></td>
<td class="info" style="width: 100px">
<select name="city" id="userCity"></select></td></tr></table></p>
1、增加“我的账号”里的了工作单位 2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
<!-- end -->
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
</div>
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00
<p><table><tr><td><%= submit_tag l(:button_submit) %></td></tr></table></p>
<% end %>
1、增加“我的账号”里的了工作单位 2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
修改了身份 增加了职称、学号
2013-09-23 09:41:36 +08:00
first commit
2013-08-01 10:33:49 +08:00
<% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p>
<% end %>
1、增加“我的账号”里的了工作单位 2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
first commit
2013-08-01 10:33:49 +08:00
<% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
<p><%= custom_field_tag_with_label :user, value %></p>
<% end %>
</div>
1、增加“我的账号”里的了工作单位 2、增加了“注册”里的“身份”
2013-09-12 08:38:47 +08:00
修正了“注册”和“我的账号”的显示格式
2013-09-16 21:56:12 +08:00