 z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +08:00 |
|
z9hang
|
6b441760c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 17:57:34 +08:00 |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
 yanxd
|
f1a2effbd2
|
.
|
2014-07-23 14:57:58 +08:00 |
|
yanxd
|
9c3ff51633
|
remove useless navbar method called
|
2014-07-23 11:03:43 +08:00 |
|
yanxd
|
9be52f6cf7
|
testing doc.
|
2014-07-23 09:32:41 +08:00 |
|
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 09:25:17 +08:00 |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
2014-07-23 09:24:26 +08:00 |
 nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 08:43:36 +08:00 |
|
nwb
|
5d22bc5510
|
文件上传修改
|
2014-07-23 08:43:23 +08:00 |
|
yanxd
|
ee95d9b115
|
user_activity page
|
2014-07-22 17:57:11 +08:00 |
|
yanxd
|
18d096f0d8
|
删除项目，竞赛表project_id会置空，projecting_softapplications模型不知道干嘛用，此表也不存在
|
2014-07-22 17:40:32 +08:00 |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
2014-07-22 17:17:42 +08:00 |
|
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:56:34 +08:00 |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
2014-07-22 16:49:32 +08:00 |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:00:11 +08:00 |
|
z9hang
|
dee09aad75
|
修复导航bug
|
2014-07-22 15:59:35 +08:00 |
|
nwb
|
8f74241eda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 15:05:27 +08:00 |
|
nwb
|
095cb7fc32
|
加强对chrome浏览器文件上传的支持
|
2014-07-22 15:02:58 +08:00 |
 sw
|
47ae398748
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 13:49:25 +08:00 |
|
sw
|
de17a84061
|
增加异常捕获，当作业未找到相应文件时，跳到文件未找到页面(不报500错误)
|
2014-07-22 13:48:30 +08:00 |
|
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
2014-07-22 13:47:05 +08:00 |
|
sw
|
7e0210dd9d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 13:35:26 +08:00 |
|
sw
|
e5547b953e
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 13:35:10 +08:00 |
|
nwb
|
09f13409de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 10:51:12 +08:00 |
|
nwb
|
840a7b337b
|
添加课程资源内容类型更新脚本
|
2014-07-22 10:50:58 +08:00 |
|
sw
|
d9b9b2152f
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 09:56:29 +08:00 |
|
sw
|
58c3e98a21
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 09:44:24 +08:00 |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
|
nwb
|
5954ba1788
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:32:54 +08:00 |
|
nwb
|
cf11cac0ad
|
项目文档权限判断优化
|
2014-07-22 09:32:46 +08:00 |
|
yanxd
|
8496d6e0d2
|
删除project多余导致删除项目失败的关联关系
|
2014-07-22 09:17:21 +08:00 |
|
yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
2014-07-22 09:17:21 +08:00 |
|
nwb
|
67dfd72845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:15:28 +08:00 |
|
nwb
|
518edeac68
|
项目文档浏览BUG修改
|
2014-07-22 09:15:19 +08:00 |
|
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
2014-07-22 09:11:37 +08:00 |
|
z9hang
|
221aef4a7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 08:53:24 +08:00 |
|
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
2014-07-22 08:53:14 +08:00 |
|
nwb
|
b49344107c
|
用户动态权限判定修改
|
2014-07-22 08:51:35 +08:00 |
|
nwb
|
aebae800dd
|
竞赛首页修改
|
2014-07-22 08:37:07 +08:00 |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:45:01 +08:00 |
|
sw
|
bfda30ee80
|
1.增加修改竞赛作品页面作品类型、关联项目的默认选择
|
2014-07-21 17:44:14 +08:00 |
|
nwb
|
feaea8375e
|
优化资源下载界面
|
2014-07-21 17:33:13 +08:00 |
|
nwb
|
774eed0dbf
|
优化公开资源的下载权限判断
|
2014-07-21 17:29:30 +08:00 |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
2014-07-21 17:23:45 +08:00 |
|
nwb
|
5e462f1ae7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:00:36 +08:00 |
|
nwb
|
51e4d00691
|
课程回复后编辑框隐藏
|
2014-07-21 17:00:27 +08:00 |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
2014-07-21 16:59:00 +08:00 |
|
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
|
nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 16:19:54 +08:00 |