 nwb
|
22c37602db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:59:14 +08:00 |
|
nwb
|
be73a232e8
|
修改显示
|
2014-05-15 13:58:54 +08:00 |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:54:06 +08:00 |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
2014-05-15 13:53:45 +08:00 |
 yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
2014-05-15 13:53:20 +08:00 |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
2014-05-15 13:37:24 +08:00 |
|
yanxd
|
13a5aa988a
|
issues#623
|
2014-05-15 11:45:49 +08:00 |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
 z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
2014-05-15 11:14:44 +08:00 |
 fanqiang
|
4ee9602621
|
..
|
2014-05-15 10:51:48 +08:00 |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 10:50:57 +08:00 |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
 wanglinchun
|
bb3536a7d5
|
调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
|
2014-05-15 10:46:05 +08:00 |
|
fanqiang
|
74169221a3
|
1234
|
2014-05-15 10:33:52 +08:00 |
|
wanglinchun
|
65f1e2a8d1
|
参赛作品页面添加托管项目网址+超链接+判断网址是否为空
|
2014-05-15 10:25:24 +08:00 |
|
wanglinchun
|
f88322f2a1
|
参赛作品页面添加托管项目网址+超链接
|
2014-05-15 10:06:51 +08:00 |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-15 10:05:25 +08:00 |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
2014-05-15 10:05:05 +08:00 |
xianbo
|
01865fe946
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:52:33 +08:00 |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
|
nwb
|
aa89900813
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/files/index.html.erb
|
2014-05-15 09:26:32 +08:00 |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
2014-05-15 09:20:36 +08:00 |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
2014-05-15 09:19:59 +08:00 |
|
nwb
|
cea01b4df5
|
优化错误提示
|
2014-05-14 18:33:27 +08:00 |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 18:27:06 +08:00 |
|
z9hang
|
d2fd2f90e6
|
作业删除图标添加
|
2014-05-14 18:26:11 +08:00 |
|
wanglinchun
|
cea41a7aab
|
df
|
2014-05-14 18:10:08 +08:00 |
|
wanglinchun
|
fd87245251
|
sdew
|
2014-05-14 17:27:20 +08:00 |
|
yanxd
|
14e4bf5bcc
|
typo
|
2014-05-14 17:20:31 +08:00 |
|
wanglinchun
|
75853bca01
|
调整竞赛中参赛作品各项指标的位置
|
2014-05-14 17:15:19 +08:00 |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-14 17:12:23 +08:00 |
|
yanxd
|
829c77879a
|
typo
|
2014-05-14 17:12:04 +08:00 |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
2014-05-14 17:11:22 +08:00 |
|
z9hang
|
a19a1b74a7
|
修正作业数显示不一致问题
|
2014-05-14 17:05:51 +08:00 |
|
wanglinchun
|
d019a4d9ce
|
重新调整了：评奖，暂未评奖，未评奖
|
2014-05-14 16:29:46 +08:00 |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
2014-05-14 16:19:12 +08:00 |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
2014-05-14 16:06:29 +08:00 |
|
nwb
|
4235ca8984
|
修正BUG
|
2014-05-14 15:23:26 +08:00 |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
2014-05-14 15:22:08 +08:00 |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
2014-05-14 15:16:11 +08:00 |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 15:08:30 +08:00 |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
2014-05-14 15:08:06 +08:00 |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
2014-05-14 15:03:04 +08:00 |
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
2014-05-14 12:03:50 +08:00 |
|
z9hang
|
77b5ce658b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 11:58:59 +08:00 |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
2014-05-14 11:58:05 +08:00 |
|
z9hang
|
91d2b58cf4
|
当前用户没有提交作业权限时屏蔽该按钮
|
2014-05-14 11:28:32 +08:00 |
|
yanxd
|
603010c30a
|
remove map
|
2014-05-14 11:22:59 +08:00 |
|
xianbo
|
a22e082cb5
|
fix repository info
|
2014-05-14 10:07:01 +08:00 |
|
xianbo
|
95dab82823
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-14 09:53:40 +08:00 |