 sw
|
90e65825db
|
修复界面中英文问题
|
2014-08-18 14:00:43 +08:00 |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
2014-08-14 15:55:43 +08:00 |
|
sw
|
daeab7ef64
|
1.修改新建、修改贴吧时描述编辑框
2.增加字段长度限定的提示
3.修改帖子内容展示
|
2014-08-14 15:15:52 +08:00 |
|
sw
|
14a436a310
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 14:38:41 +08:00 |
|
sw
|
08115c9de4
|
1.修复文本格式化报错的问题
2.修改作业留言清除按钮描述不正确的问题
|
2014-08-14 14:11:02 +08:00 |
 chenmin
|
4acf5f3f06
|
添加文件提示页面元素变量处理
|
2014-08-14 11:09:34 +08:00 |
|
sw
|
79c6722aad
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-14 10:54:52 +08:00 |
|
sw
|
f99543ab4b
|
#1294
1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色
|
2014-08-14 10:54:42 +08:00 |
|
chenmin
|
027bd1ace6
|
修复参加竞赛页面显示错误
|
2014-08-14 09:56:22 +08:00 |
|
chenmin
|
e12a540061
|
项目日历页面描述错误修改；
|
2014-08-13 17:34:20 +08:00 |
|
sw
|
0c597d23a2
|
Merge branch 'szzh' into develop
|
2014-08-11 15:09:25 +08:00 |
|
sw
|
f7635370d7
|
优化课程首页效率
|
2014-08-11 14:49:58 +08:00 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
2014-08-08 09:30:48 +08:00 |
 zhanghaitao
|
d9a9867f96
|
#815 中英文显示问题修改
|
2014-08-07 16:41:31 +08:00 |
|
sw
|
7179943f8b
|
Merge branch 'szzh' into develop
|
2014-08-07 14:37:28 +08:00 |
|
sw
|
78343effaf
|
em.yml还原
|
2014-08-07 14:36:28 +08:00 |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
2014-08-07 14:03:06 +08:00 |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
zhanghaitao
|
45cc3ddb9b
|
#873提示信息修改
|
2014-08-07 11:23:01 +08:00 |
|
linhk
|
f173db4c9d
|
英文版用户注册页面身份下拉框显示错误的Bug
|
2014-08-06 15:58:38 +08:00 |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
2014-08-04 17:36:07 +08:00 |
|
sw
|
5f3ab0322b
|
修改竞赛上传图片提示 #1127
|
2014-08-04 16:04:36 +08:00 |
|
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
2014-08-04 15:49:23 +08:00 |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
2014-07-31 17:27:01 +08:00 |
 z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
2014-07-30 15:26:55 +08:00 |
 nwb
|
d6876fabc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 08:36:46 +08:00 |
|
nwb
|
1156387161
|
“文件密级”改为“是否公开”
|
2014-07-29 08:36:30 +08:00 |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:50:13 +08:00 |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
2014-07-28 17:49:28 +08:00 |
|
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:14:20 +08:00 |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
2014-07-28 17:14:02 +08:00 |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 15:09:14 +08:00 |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
2014-07-28 14:58:01 +08:00 |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 10:38:23 +08:00 |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
2014-07-28 10:37:22 +08:00 |
|
nwb
|
9c9778d433
|
项目的“资料下载”改为“作品下载”
|
2014-07-28 09:23:40 +08:00 |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:37:07 +08:00 |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
2014-07-25 16:05:33 +08:00 |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 14:06:59 +08:00 |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 11:12:08 +08:00 |
|
sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
2014-07-25 11:10:45 +08:00 |
|
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
2014-07-25 10:42:56 +08:00 |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
2014-07-22 09:52:16 +08:00 |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
|
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 17:50:51 +08:00 |