xianbo
|
df628aff9d
|
modify curse nil error
|
12 years ago |
|
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
12 years ago |
yanxd
|
a101be344c
|
add any remark
|
12 years ago |
 nieguanghui
|
6352ae7aa6
|
fix bug
|
12 years ago |
|
nieguanghui
|
57c28102e9
|
fix some thing
|
12 years ago |
 huangjingquan
|
59d0cc8e7a
|
修改了个人主页项目列表
|
12 years ago |
|
nieguanghui
|
f6c3f3609a
|
搜索显示改进
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
huangjingquan
|
22ce616a78
|
修改了按钮样式
|
12 years ago |
|
huangjingquan
|
718fa65fc4
|
整个界面样式协调
|
12 years ago |
|
huangjingquan
|
e8153c86ad
|
修改了项目里面各个子页面的样式
|
12 years ago |
|
yanxd
|
56cbca3ce8
|
fix little words
|
12 years ago |
|
huangjingquan
|
f13665959a
|
作业列表样式修改
项目新闻样式修改
|
12 years ago |
|
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
12 years ago |
|
huangjingquan
|
534c252bcb
|
修改了课程列表样式，部分国际化
|
12 years ago |
|
xianbo
|
7da2f421e0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/bids/_new.html.erb
app/views/projects/feedback.html.erb
|
12 years ago |
|
xianbo
|
3253f1cf28
|
modify show of some style
|
12 years ago |
|
huangjingquan
|
6e9f3d53e5
|
新增一个user列表页面
|
12 years ago |
|
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
12 years ago |
 baiyu
|
8f216a6723
|
统一了各个模块的按钮，修改了部分国际化
|
12 years ago |
|
huangjingquan
|
165c392f31
|
各个列表添加当前位置
|
12 years ago |
|
baiyu
|
a52944811b
|
修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”
|
12 years ago |
|
nieguanghui
|
3966e0bc0b
|
修复课程列表bug
|
12 years ago |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
12 years ago |
|
yanxd
|
7c4e62cc40
|
add time describe
|
12 years ago |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
12 years ago |
|
huangjingquan
|
d71890526b
|
课程列表里面超出的部分自动隐藏
|
12 years ago |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
12 years ago |
 fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题
|
12 years ago |
|
huangjingquan
|
2fd63c80b3
|
修改了留言显示
|
12 years ago |
|
huangjingquan
|
6499352d8e
|
修改了无项目时候 新建按钮重复提示
|
12 years ago |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
12 years ago |
|
nieguanghui
|
eeb22ab4a6
|
fix some little bug
|
12 years ago |
|
xianbo
|
73424b0c59
|
fix
|
12 years ago |
|
huangjingquan
|
bf2ae17e05
|
修改了数据读取错误
|
12 years ago |
|
baiyu
|
3c9605c551
|
修复了课程配置里丢失的“开课时间”“结课时间”“课时”
|
12 years ago |
|
xianbo
|
8d75d87ef5
|
fix the link of photo
|
12 years ago |
|
xianbo
|
10a14d5e82
|
add the link to thieris homepage
|
12 years ago |
|
huangjingquan
|
14445d0801
|
页面链接
|
12 years ago |
|
nieguanghui
|
0c849c3216
|
解决按钮冲突
|
12 years ago |
|
huangjingquan
|
9d2f7d1c28
|
add the link to projects
|
12 years ago |
|
baiyu
|
0f3eb9cf87
|
kec
|
12 years ago |
|
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
12 years ago |
|
nieguanghui
|
be72746a80
|
样式微调
|
12 years ago |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
12 years ago |
|
huangjingquan
|
49c22fbec3
|
个人主页课程列表里面添加了学期
|
12 years ago |
|
yanxd
|
b7027405ce
|
fix some little bug!
|
12 years ago |
|
xianbo
|
88084990bf
|
fix
|
12 years ago |
|
xianbo
|
82c597a163
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
huangjingquan
|
d6aa6550d7
|
调整了主页及六个界面的样式
|
12 years ago |
|
xianbo
|
83b30b1f9e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
b61f3ce79f
|
fix showw
|
12 years ago |
|
huangjingquan
|
2a4539dc2c
|
几个主要页面样式
|
12 years ago |
|
yanxd
|
b6df32e029
|
fix files under_line
|
12 years ago |
|
huangjingquan
|
b9b0b06185
|
修改了一些链接bug
|
12 years ago |
|
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
12 years ago |
|
xianbo
|
8e922ef273
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
c8c4cecccd
|
fix course link location
|
12 years ago |
|
nieguanghui
|
a80e77bd01
|
修复bug
|
12 years ago |
|
huangjingquan
|
ee33583ae1
|
修改了竞赛页面
添加了搜索功能
|
12 years ago |
|
nieguanghui
|
5d83a03e5f
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
yanxd
|
397eb11dca
|
refactor memberlist
|
12 years ago |
|
nieguanghui
|
c6824c539b
|
修复作业搜索条出现在竞赛，需求页面的bug
|
12 years ago |
|
huangjingquan
|
ea8a87c3a6
|
需求里面增加了搜索功能
|
12 years ago |
|
baiyu
|
be20b2c7fe
|
增加了需求导航，超链接
|
12 years ago |
|
baiyu
|
f113cb7667
|
增加了需求导航，样式，超链接
|
12 years ago |
|
huangjingquan
|
bb994f8b7d
|
修改了搜索结果显示
|
12 years ago |
|
baiyu
|
be14669f6b
|
修改了个人主页导航超链接不能显示全名
|
12 years ago |
|
huangjingquan
|
c8427fe61e
|
修改了作业、项目、课程页面
|
12 years ago |
|
baiyu
|
20c2feef30
|
增加了“项目门户”的当前位置导航、样式、配套的超链接
|
12 years ago |
|
huangjingquan
|
8ee5381e44
|
修改了用户个人主页样式
|
12 years ago |
|
huangjingquan
|
29f058efba
|
修改了新建课程的时候报错
|
12 years ago |
|
huangjingquan
|
27299586c2
|
修改了top——mune
|
12 years ago |
|
huangjingquan
|
7e7534041e
|
课程列表新的权限设置
|
12 years ago |
|
yanxd
|
ce7b2ceba0
|
fix teacher/student search Identifier
|
12 years ago |
|
huangjingquan
|
c93ca4d2ed
|
添加了作业截止时间提醒功能！
|
12 years ago |
|
yanxd
|
0b61b4ef5b
|
move flash message to page top in course/setting
|
12 years ago |
|
yanxd
|
19b983e103
|
move flash message to top on base_project
|
12 years ago |
|
huangjingquan
|
84327892a9
|
加入/退出课程权限修改
|
12 years ago |
|
xianbo
|
003b4704cc
|
fix link to
|
12 years ago |
|
baiyu
|
606b2d0587
|
在我的主页的“课程”列表里加入了“主讲教师”
|
12 years ago |
|
huangjingquan
|
fb54fcbe86
|
修改了新闻页面两个图像重复bug
|
12 years ago |
|
huangjingquan
|
09eb16ad9a
|
修改了项目和课程里面成员配置显示错误
|
12 years ago |
|
huangjingquan
|
ac2b90ecfd
|
退出课程加入权限
|
12 years ago |
|
xianbo
|
c7b38e5bf2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/news/index.html.erb
|
12 years ago |
|
xianbo
|
ca0f63a817
|
del the link of .head portrait
|
12 years ago |
|
huangjingquan
|
775ebc3607
|
新闻界面添加删除功能
|
12 years ago |
|
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
12 years ago |
|
baiyu
|
b2080a4470
|
加入了开课时间，结课时间选项
增加了课时文本框
相应的增加了显示
|
12 years ago |
|
yanxd
|
0a21b87714
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
nieguanghui
|
75c0480071
|
增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug
|
12 years ago |
|
yanxd
|
54d9566a7b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
b55c5d20a3
|
added activity info from event, warning.
|
12 years ago |
|
xianbo
|
c7d96dd183
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
743ef9856a
|
only teacher can know his tag and modify it
|
12 years ago |
|
yanxd
|
369e5eccc0
|
member_list ,group by roles in course#show
|
12 years ago |
|
xianbo
|
08f1453dbd
|
modify some show in create course and project
|
12 years ago |
|
xianbo
|
9f8c764053
|
modify new cresate is_piublic? and leave some module about select
|
12 years ago |
|
xianbo
|
0706fdd6dc
|
let the homework show under class in homeworkpager
|
12 years ago |
|
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求，将关注需求统计显示
|
12 years ago |
|
yanxd
|
0b04b28024
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
12 years ago |
|
xianbo
|
5dfac1d8e3
|
add modify about homework and modify the show of toll bar
|
12 years ago |
|
baiyu
|
f55a06e76d
|
1、"活动“变成了动态，”只看自己“改成了”我的动态“
2、解释了项目是什么
|
12 years ago |
|
baiyu
|
5fb0bc945c
|
修改了删除“我的账号”后的小问题
|
12 years ago |
|
baiyu
|
9319a7f87b
|
去掉了top_bar上“我的账号”
|
12 years ago |
|
yanxd
|
868025bb40
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
67216ca463
|
fix back_url bug
|
12 years ago |
|
huangjingquan
|
b113719b46
|
课程里面添加了图片上传功能
|
12 years ago |
|
yanxd
|
8a37f924f9
|
remove nyancss
|
12 years ago |
|
nieguanghui
|
224a194759
|
修复成员 bug，修复作业显示bug‘
|
12 years ago |
|
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
12 years ago |
|
xianbo
|
cbe22e4e60
|
modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb
|
12 years ago |
|
yanxd
|
6dec8a9312
|
share previews
|
12 years ago |
|
xianbo
|
a50aff3fb4
|
1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
|
12 years ago |
|
xianbo
|
2fa6276829
|
fix natural
|
12 years ago |
|
nieguanghui
|
39580a04a2
|
修复项目列表成员显示bug
|
12 years ago |
|
xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
yanxd
|
666806ae28
|
fixed little bug
|
12 years ago |
|
yanxd
|
df73f34e71
|
share linkto better
|
12 years ago |
|
nieguanghui
|
cf40f9ff02
|
fix course list bug
|
12 years ago |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
12 years ago |
|
nieguanghui
|
5ce9bcdb2c
|
解决竞赛，需求，作业列表搜索bug
|
12 years ago |
|
xianbo
|
3f4a60b462
|
fix show
|
12 years ago |
|
xianbo
|
5a1bb0f2d4
|
fix bug in arrange to net
|
12 years ago |
|
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ，个人在项目中的评分机制
|
12 years ago |
|
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
12 years ago |
|
yanxd
|
dde65a5895
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
baiyu
|
a44713ba6d
|
修改了需求页面显示
|
12 years ago |
|
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
12 years ago |
|
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
12 years ago |
|
yanxd
|
e2447b4c88
|
truncate textilizable
|
12 years ago |
|
baiyu
|
9fa9aa0fb8
|
“返回课程”“返回主页”按钮变色。改边距，边框变圆润
|
12 years ago |
|
yanxd
|
081a8e9825
|
fixed issue#319
|
12 years ago |
|
baiyu
|
8ec86a27c4
|
xuehao
|
12 years ago |
|
baiyu
|
5b48826faf
|
修改了学号显示错误
|
12 years ago |
|
baiyu
|
1be0a7d23f
|
修改了“返回个人主页”和“返回课程”，修改了样式
|
12 years ago |
|
baiyu
|
19b030dd23
|
修改了需求和作业列表显示混乱
|
12 years ago |
|
yanxd
|
abe52df8d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
yanxd
|
332bc0765d
|
240 characters or less limited in activity info. ===> projects#show
|
12 years ago |
|
xianbo
|
520c5843ce
|
modify homework show and the link of style
|
12 years ago |
|
yanxd
|
534457547e
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
12 years ago |
 huangjingquan
|
29e2a4c70b
|
修改了作业提交时学号显示错误
作业页面增加了内容
|
12 years ago |
|
huangjingquan
|
41a74a5254
|
提示信息国际化
|
12 years ago |
|
xianbo
|
5a234e6fb2
|
add the link of project contributers&&followers count number
|
12 years ago |
|
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
12 years ago |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
12 years ago |
|
yanxd
|
e1d8c8a992
|
remove nyan css & move another file
|
12 years ago |
|
baiyu
|
8335c111c7
|
1、修改了“加入课程”位置
2、修改了我的账号里的格式
|
12 years ago |
|
xianbo
|
13e7280245
|
1.modify show of data
2.modify tool bar show when differ user login
|
12 years ago |
|
huangjingquan
|
6e10f16c68
|
添加了注释
修改了作业提交显示错误（显示成需求）
|
12 years ago |
|
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
12 years ago |
|
xianbo
|
8c675c2a96
|
add show about setting about course
|
12 years ago |
|
xianbo
|
abc163887e
|
fix
|
12 years ago |
|
fanqiang
|
2fbf025c2f
|
调整需求的评价，隐藏个人账户的首选项内容
|
12 years ago |
|
huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
12 years ago |
|
huangjingquan
|
673850bd03
|
fix
|
12 years ago |
|
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
12 years ago |
|
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
12 years ago |
|
xianbo
|
2bd110c550
|
delete the icon show about course
|
12 years ago |
|
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
12 years ago |
|
xianbo
|
fd14457446
|
add delete homework in course
|
12 years ago |
|
xianbo
|
d7f7ff5fa9
|
delete homework
|
12 years ago |
|
huangjingquan
|
8ce8de09cb
|
修改了个人主页课程列表
|
12 years ago |
|
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
12 years ago |
|
huangjingquan
|
508eee45f2
|
修改了加入课程弹框显示错误！
|
12 years ago |
|
baiyu
|
6676110b11
|
修改了教授丢失
|
12 years ago |
|
baiyu
|
13a2cfe644
|
修改了fork页面，增加了教师超链接
|
12 years ago |
|
huangjingquan
|
3ff443b7b6
|
修改了自己的作业不能关注
只能关注别人的作业
|
12 years ago |
|
huangjingquan
|
0a5013edd1
|
修改了作业界面显示
修改了发布作业的时候在个人动态里面显示做（之前显示需求）
|
12 years ago |
|
fanqiang
|
962842d841
|
修改了提交作业数量显示问题，修改了创建需求的种类选择问题
|
12 years ago |
|
huangjingquan
|
ff21bca683
|
修改了老师访问学生页面的时候bug
|
12 years ago |
|
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
12 years ago |
 wanglinchun
|
48a0f2f409
|
个人主页，课程相关国际化
|
12 years ago |
|
huangjingquan
|
64cddc8687
|
修改了课程设置里面bug
角色改成英文
|
12 years ago |
|
xianbo
|
b0d413a216
|
modify the admin select
|
12 years ago |
|
huangjingquan
|
72f2793b0a
|
修改了关注的显示
|
12 years ago |
|
xianbo
|
ad597695f5
|
fix register user.current bug
and course is show or hidden
|
12 years ago |
|
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
12 years ago |
|
baiyu
|
0226785f51
|
作业“关注”居左
|
12 years ago |
|
baiyu
|
011c38988a
|
需求列表显示
|
12 years ago |
|
fanqiang
|
c75391b3a0
|
修改了加入课程窗口里文本框的长度
|
12 years ago |
|
huangjingquan
|
82ce0ac8da
|
修改了参加竞标成提交作业
|
12 years ago |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
12 years ago |
|
huangjingquan
|
2a959a9b65
|
添加了学号
|
12 years ago |
|
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
12 years ago |
|
fanqiang
|
7d2bdbc935
|
在课程列表中添加加入课程按钮
在课程主页中添加关注按钮，修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
|
12 years ago |
|
huangjingquan
|
b14f0e2901
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
huangjingquan
|
e19fe844a2
|
新增
|
12 years ago |
|
baiyu
|
aefd9b545b
|
1、删除了“企业”里的“课程”
2、减小了顶和踩的图标
3、更改了课程图标
|
12 years ago |
|
huangjingquan
|
2c45fb8760
|
竞赛
|
12 years ago |
|
fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节
|
12 years ago |
|
huangjingquan
|
08aa5be7df
|
解决我的作业不显示问题
|
12 years ago |
|
baiyu
|
e5d06702c4
|
修改了新建“需求”的提示
修改了课程图标
|
12 years ago |
|
huangjingquan
|
cab5fb8b52
|
新的
|
12 years ago |
|
nieguanghui
|
606c998247
|
修改课程列表显示内容，修复作业列表显示bug
|
12 years ago |
|
fanqiang
|
bf6fe70ec9
|
修改了作业的fork界面显示提示内容
|
12 years ago |
|
baiyu
|
56e5e55589
|
修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
|
12 years ago |
|
baiyu
|
64f36f2c9d
|
修改了一些BUG
|
12 years ago |
|
baiyu
|
19962f2695
|
修改了主页的显示样式，
修改了我的课程，使得可以直接创建课程
|
12 years ago |
|
yanxd
|
3ec4e14bfd
|
fix sources bugs from zhangyang tmp code
|
12 years ago |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
12 years ago |
|
huangjingquan
|
5c6bf7f9c8
|
修改课程退出的权限
|
12 years ago |
|
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
12 years ago |
|
fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
12 years ago |
|
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
|
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
12 years ago |
|
baiyu
|
aed36229f8
|
修改了issues里“顶”和“踩”图标的位置
|
12 years ago |
 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
|
12 years ago |
|
william
|
a8c3808053
|
优化需求结束的展示方式。另外需求的货币奖励方式暂缺。
|
12 years ago |
|
william
|
0be9de3a17
|
tag搜索中相关tag改成只显示10个，另外统一了按钮风格（除去留言按钮）
|
12 years ago |
|
william
|
4f72b68442
|
bug 修复。
|
12 years ago |
|
william
|
2079c87362
|
增加tag删除。
|
12 years ago |
|
baiyu
|
6e4e5ec577
|
修改了“顶”和“踩”的图标
|
12 years ago |
|
fanqiang
|
4641f8cd63
|
修改引用作业中的显示样式
|
12 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
12 years ago |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
12 years ago |
|
xianbo
|
75c9921231
|
modify work place in null but can create course
|
12 years ago |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
12 years ago |
|
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
|
12 years ago |
|
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
|
12 years ago |
|
william
|
cdad47f0cc
|
切换分支 添加应标项目评价显示
|
12 years ago |
|
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
12 years ago |
|
william
|
006f381a05
|
新增需求结束方式
|
12 years ago |
|
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
|
12 years ago |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
12 years ago |
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
huangjingquan
|
c7c5ae54e5
|
课程里面新建会跳到项目里面！
|
12 years ago |
|
huangjingquan
|
5dbef9e2c5
|
修改了日历和版本库bug
|
12 years ago |
|
huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
12 years ago |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
12 years ago |
|
huangjingquan
|
2d6fdc1d5a
|
资料权限问题
|
12 years ago |
|
huangjingquan
|
3536883248
|
课程合并
|
12 years ago |
 baiyu
|
1c4f7f99e8
|
一些修订
|
12 years ago |
|
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
12 years ago |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
12 years ago |
|
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
12 years ago |
|
huangjingquan
|
960b59c807
|
修改了部分小bug
|
12 years ago |
|
fanqiang
|
17dc3bc3a9
|
修改新建需求界面
|
12 years ago |
|
fanqiang
|
9d2ea5639f
|
添加自动生成课程标识功能
|
12 years ago |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
12 years ago |
|
fanqiang
|
671b81035c
|
修改课程部分的权限设置，并且修改了作业的侧边栏显示
|
12 years ago |
|
huangjingquan
|
11370329dd
|
修改了部分功能
|
12 years ago |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
12 years ago |
|
huangjingquan
|
e4cbc7533e
|
tabs显示
|
12 years ago |
|
baiyu
|
313e66537e
|
增加了“地区”
|
12 years ago |
|
huangjingquan
|
3a6f055159
|
solve some little problem
|
12 years ago |
