 baiyu
|
64f36f2c9d
|
修改了一些BUG
|
2013-09-30 17:27:58 +08:00 |
|
baiyu
|
19962f2695
|
修改了主页的显示样式，
修改了我的课程，使得可以直接创建课程
|
2013-09-30 16:20:56 +08:00 |
yanxd
|
3ec4e14bfd
|
fix sources bugs from zhangyang tmp code
|
2013-09-30 15:31:46 +08:00 |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
2013-09-30 11:02:04 +08:00 |
 huangjingquan
|
43a0a875f4
|
修改课程创建问题
|
2013-09-30 10:38:30 +08:00 |
|
huangjingquan
|
5c6bf7f9c8
|
修改课程退出的权限
|
2013-09-30 10:30:43 +08:00 |
|
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
2013-09-30 09:42:13 +08:00 |
|
huangjingquan
|
b6ca2c3d74
|
修改了讨论区bug
|
2013-09-29 20:04:03 +08:00 |
 fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
2013-09-29 19:58:57 +08:00 |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
2013-09-28 23:08:24 +08:00 |
|
baiyu
|
aed36229f8
|
修改了issues里“顶”和“踩”图标的位置
|
2013-09-28 16:03:23 +08:00 |
|
xianbo
|
a88cb3ad2b
|
fix nature
|
2013-09-28 10:51:28 +08:00 |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
2013-09-28 10:36:44 +08:00 |
|
william
|
a8c3808053
|
优化需求结束的展示方式。另外需求的货币奖励方式暂缺。
|
2013-09-28 10:00:40 +08:00 |
|
william
|
0be9de3a17
|
tag搜索中相关tag改成只显示10个，另外统一了按钮风格（除去留言按钮）
|
2013-09-27 16:02:49 +08:00 |
|
william
|
4f72b68442
|
bug 修复。
|
2013-09-27 15:02:22 +08:00 |
|
william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
|
baiyu
|
6e4e5ec577
|
修改了“顶”和“踩”的图标
|
2013-09-26 21:01:17 +08:00 |
|
fanqiang
|
4641f8cd63
|
修改引用作业中的显示样式
|
2013-09-26 10:10:53 +08:00 |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +08:00 |
|
baiyu
|
41fdc61fec
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-09-25 10:19:12 +08:00 |
|
xianbo
|
099c916bf5
|
modify setting
|
2013-09-25 08:37:18 +08:00 |
|
xianbo
|
75c9921231
|
modify work place in null but can create course
|
2013-09-24 16:18:50 +08:00 |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
2013-09-24 12:15:24 +08:00 |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
2013-09-24 09:52:08 +08:00 |
|
xianbo
|
29313d9ab5
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
|
2013-09-24 09:17:09 +08:00 |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
2013-09-24 09:14:21 +08:00 |
|
baiyu
|
24c99b8f49
|
add db migrate
|
2013-09-24 09:13:18 +08:00 |
|
baiyu
|
fffeec2044
|
add migrate
|
2013-09-24 09:09:40 +08:00 |
|
william
|
09fb972c96
|
分支合并
|
2013-09-24 09:05:07 +08:00 |
|
xianbo
|
ba12ff19eb
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
|
2013-09-24 08:56:44 +08:00 |
|
baiyu
|
540f06c769
|
add_student_id_to user
|
2013-09-24 08:52:57 +08:00 |
|
william
|
cdad47f0cc
|
切换分支 添加应标项目评价显示
|
2013-09-23 21:54:07 +08:00 |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
2013-09-23 21:47:07 +08:00 |
|
william
|
006f381a05
|
新增需求结束方式
|
2013-09-23 20:19:42 +08:00 |
|
xianbo
|
806fae7b19
|
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 |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
2013-09-23 20:12:32 +08:00 |
|
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
|
huangjingquan
|
c7c5ae54e5
|
课程里面新建会跳到项目里面！
|
2013-09-23 15:44:32 +08:00 |
|
huangjingquan
|
5dbef9e2c5
|
修改了日历和版本库bug
|
2013-09-23 15:12:06 +08:00 |
|
huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
2013-09-23 13:35:29 +08:00 |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
|
huangjingquan
|
2d6fdc1d5a
|
资料权限问题
|
2013-09-23 09:32:04 +08:00 |
|
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
 baiyu
|
1c4f7f99e8
|
一些修订
|
2013-09-22 16:11:39 +08:00 |
|
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
 nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |