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
|
2013-11-08 15:50:28 +08:00 |
|
xianbo
|
3253f1cf28
|
modify show of some style
|
2013-11-08 15:49:08 +08:00 |
 huangjingquan
|
6e9f3d53e5
|
新增一个user列表页面
|
2013-11-08 11:25:33 +08:00 |
 nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
2013-11-08 11:01:28 +08:00 |
 baiyu
|
8f216a6723
|
统一了各个模块的按钮，修改了部分国际化
|
2013-11-08 10:53:18 +08:00 |
|
huangjingquan
|
165c392f31
|
各个列表添加当前位置
|
2013-11-08 10:29:29 +08:00 |
|
baiyu
|
a52944811b
|
修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”
|
2013-11-08 09:02:14 +08:00 |
|
nieguanghui
|
3966e0bc0b
|
修复课程列表bug
|
2013-11-08 08:57:48 +08:00 |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
2013-11-07 19:14:57 +08:00 |
yanxd
|
7c4e62cc40
|
add time describe
|
2013-11-07 17:21:32 +08:00 |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
|
huangjingquan
|
d71890526b
|
课程列表里面超出的部分自动隐藏
|
2013-11-07 16:35:20 +08:00 |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
2013-11-07 15:58:15 +08:00 |
|
yanxd
|
239a1484ae
|
remove useless code block
|
2013-11-07 14:38:37 +08:00 |
 fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
|
huangjingquan
|
019ab89899
|
修改了两个样式
|
2013-11-07 09:00:07 +08:00 |
|
huangjingquan
|
2fd63c80b3
|
修改了留言显示
|
2013-11-06 17:21:18 +08:00 |
|
huangjingquan
|
6499352d8e
|
修改了无项目时候 新建按钮重复提示
|
2013-11-06 17:00:14 +08:00 |
|
nieguanghui
|
8df3bcf76f
|
修改评分显示颜色，重构课程列表显示部分代码
|
2013-11-06 16:43:07 +08:00 |
|
huangjingquan
|
529a997991
|
修改了英文版主页界面的显示异常
|
2013-11-06 16:33:05 +08:00 |
|
nieguanghui
|
eeb22ab4a6
|
fix some little bug
|
2013-11-06 15:46:38 +08:00 |
|
xianbo
|
73424b0c59
|
fix
|
2013-11-06 11:14:42 +08:00 |
|
huangjingquan
|
bf2ae17e05
|
修改了数据读取错误
|
2013-11-06 11:10:26 +08:00 |
|
baiyu
|
3c9605c551
|
修复了课程配置里丢失的“开课时间”“结课时间”“课时”
|
2013-11-06 11:06:08 +08:00 |
|
xianbo
|
8d75d87ef5
|
fix the link of photo
|
2013-11-06 10:49:38 +08:00 |
|
xianbo
|
10a14d5e82
|
add the link to thieris homepage
|
2013-11-06 10:36:58 +08:00 |
|
huangjingquan
|
14445d0801
|
页面链接
|
2013-11-06 10:31:20 +08:00 |
|
nieguanghui
|
0c849c3216
|
解决按钮冲突
|
2013-11-06 10:28:18 +08:00 |
|
huangjingquan
|
9d2f7d1c28
|
add the link to projects
|
2013-11-06 09:44:10 +08:00 |
|
baiyu
|
0f3eb9cf87
|
kec
|
2013-11-06 09:25:05 +08:00 |
|
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
2013-11-06 09:13:02 +08:00 |
|
yanxd
|
2d4b9f8c52
|
nothing
|
2013-11-05 21:00:16 +08:00 |
|
yanxd
|
9526f6d67a
|
remove string unkown
|
2013-11-05 20:57:11 +08:00 |
|
nieguanghui
|
be72746a80
|
样式微调
|
2013-11-05 20:51:33 +08:00 |
|
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
2013-11-05 20:46:38 +08:00 |
|
huangjingquan
|
49c22fbec3
|
个人主页课程列表里面添加了学期
|
2013-11-05 20:04:45 +08:00 |
|
yanxd
|
6246b45fe2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 16:53:49 +08:00 |
|
yanxd
|
b7027405ce
|
fix some little bug!
|
2013-11-05 16:53:00 +08:00 |
|
huangjingquan
|
f15619d99d
|
样式
|
2013-11-05 16:42:03 +08:00 |
|
xianbo
|
88084990bf
|
fix
|
2013-11-05 15:59:12 +08:00 |
|
xianbo
|
82c597a163
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 15:40:51 +08:00 |
|
huangjingquan
|
d6aa6550d7
|
调整了主页及六个界面的样式
|
2013-11-05 15:38:12 +08:00 |
|
xianbo
|
83b30b1f9e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 12:54:57 +08:00 |
|
xianbo
|
b61f3ce79f
|
fix showw
|
2013-11-05 12:54:48 +08:00 |
|
huangjingquan
|
2a4539dc2c
|
几个主要页面样式
|
2013-11-05 12:49:57 +08:00 |
|
yanxd
|
b6df32e029
|
fix files under_line
|
2013-11-05 11:14:45 +08:00 |
|
huangjingquan
|
b9b0b06185
|
修改了一些链接bug
|
2013-11-05 10:58:23 +08:00 |
|
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
2013-11-05 09:17:36 +08:00 |
|
xianbo
|
8e922ef273
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-05 09:19:52 +08:00 |
|
xianbo
|
c8c4cecccd
|
fix course link location
|
2013-11-05 09:17:50 +08:00 |