 z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
2014-08-15 14:30:01 +08:00 |
 chenmin
|
19c5ebf450
|
修复贴吧标签有删除标识后删除失败的bug；
修复删除后没刷新的bug；
|
2014-08-15 14:07:13 +08:00 |
|
chenmin
|
05ed41615e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-15 11:23:53 +08:00 |
|
chenmin
|
33b5f821c4
|
修复贴吧标签不能删除的bug
|
2014-08-15 11:21:11 +08:00 |
|
z9hang
|
af869deb8e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-15 08:55:12 +08:00 |
|
z9hang
|
7b14be7310
|
错误提示页面导航栏丢失问题、新建问题跟踪red_project_scores问题
|
2014-08-15 08:54:19 +08:00 |
 sw
|
e923fd1e5b
|
1.注释代码
|
2014-08-15 08:38:02 +08:00 |
|
sw
|
b92f385202
|
#1309 项目缺陷项目下拉框固定宽度
|
2014-08-14 16:40:12 +08:00 |
|
sw
|
5f559fcb67
|
#1309 项目缺陷项目下拉框固定宽度
|
2014-08-14 16:39:07 +08:00 |
|
sw
|
4a0f11dfce
|
#1130 项目讨论区回复对非汉字自动换行
|
2014-08-14 16:33:43 +08:00 |
 zhanghaitao
|
20f183799f
|
#828 删除上传的文件不可用修复
|
2014-08-14 16:19:40 +08:00 |
|
zhanghaitao
|
4d870ca9e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 15:58:42 +08:00 |
|
zhanghaitao
|
9ac53e5a0b
|
点击用户名出异常修改
|
2014-08-14 15:58:32 +08:00 |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
2014-08-14 15:55:43 +08:00 |
|
sw
|
fb50defbec
|
修复按钮回去不正确的问题
|
2014-08-14 15:54:03 +08:00 |
|
zhanghaitao
|
1b4b21fc19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 15:47:46 +08:00 |
|
zhanghaitao
|
0215c96ec9
|
错误修改
|
2014-08-14 15:47:36 +08:00 |
|
sw
|
2a831136ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 15:16:20 +08:00 |
|
sw
|
daeab7ef64
|
1.修改新建、修改贴吧时描述编辑框
2.增加字段长度限定的提示
3.修改帖子内容展示
|
2014-08-14 15:15:52 +08:00 |
|
zhanghaitao
|
36004913c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 15:11:25 +08:00 |
|
zhanghaitao
|
43cfcce44e
|
#826 ：资源标签不能删除Bug修复
|
2014-08-14 15:11:14 +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
|
445d29d036
|
1.修改新建帖子的长度上限设置，设置为2G
2.修改新建贴吧时贴吧的描述字段类型
|
2014-08-14 14:38:18 +08:00 |
|
sw
|
08115c9de4
|
1.修复文本格式化报错的问题
2.修改作业留言清除按钮描述不正确的问题
|
2014-08-14 14:11:02 +08:00 |
|
zhanghaitao
|
e18129c935
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 11:37:15 +08:00 |
|
zhanghaitao
|
d21bda87a7
|
#938 下拉框任选某项，点击“查询”发生异常问题解决
|
2014-08-14 11:37:03 +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
|
86cb7d13d5
|
新建竞赛通知bug修复
|
2014-08-14 10:24:01 +08:00 |
|
zhanghaitao
|
a4441bca37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-14 09:43:11 +08:00 |
|
zhanghaitao
|
9d0f759a71
|
#939 项目动态旗帜时间的修改
|
2014-08-14 09:42:58 +08:00 |
|
sw
|
22bbf45269
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 18:06:33 +08:00 |
|
sw
|
df0c1e5917
|
修复缺陷标题超出界面的问题
|
2014-08-13 17:37:00 +08:00 |
|
chenmin
|
bd97356090
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 17:35:27 +08:00 |
|
z9hang
|
b8acd13f25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 17:14:01 +08:00 |
|
chenmin
|
361e48fea8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 17:08:57 +08:00 |
|
sw
|
8c59abc070
|
#1279 修改搜索提示
|
2014-08-13 16:55:42 +08:00 |
|
sw
|
440395f26f
|
#1290 修改admin配置管理--用户列表--项目列表界面以及相关功能问题
|
2014-08-13 16:52:07 +08:00 |
|
z9hang
|
e65487d527
|
项目成员个人得分显示
|
2014-08-13 16:50:32 +08:00 |
|
zhanghaitao
|
bc6ad5d416
|
#936 输入文档标题非汉族显示bug修复
|
2014-08-13 16:45:50 +08:00 |
|
zhanghaitao
|
ce7d91d164
|
#932 输入主题为非汉字类型且字数较多时，显示超出边框Bug修改
|
2014-08-13 16:29:26 +08:00 |
|
sw
|
a7e22a7379
|
修复admin用户列表界面，查询结果显示不正常的问题
|
2014-08-13 16:10:47 +08:00 |
|
sw
|
f2f06a9d28
|
调整管理员用户配置界面，表格样式
|
2014-08-13 16:06:40 +08:00 |
|
z9hang
|
14026d0e0b
|
个人得分细节显示
|
2014-08-13 15:59:19 +08:00 |
|
zhanghaitao
|
88aa66b15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 15:38:20 +08:00 |
|
zhanghaitao
|
4934c8c801
|
# 页面返回异常处理
|
2014-08-13 15:37:28 +08:00 |
|
sw
|
a54676c583
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-08-13 15:24:38 +08:00 |
|
sw
|
0e35967433
|
修改wiki编辑页面初始化高度
|
2014-08-13 15:19:05 +08:00 |
|
sw
|
582ccd2ecf
|
添加wiki插件，修改项目讨论区模块回去格式化字符串不正确的BUG
|
2014-08-13 14:45:10 +08:00 |
|
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-08-13 11:21:37 +08:00 |
|
z9hang
|
caed78327a
|
积分计算修改
|
2014-08-13 11:17:22 +08:00 |
|
chenmin
|
ecccbf1cf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-12 14:19:30 +08:00 |
|
sw
|
0064018a37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-12 11:35:53 +08:00 |
|
sw
|
339a06007c
|
增加课程资源分离出来相关表
|
2014-08-12 11:31:42 +08:00 |
|
sw
|
835ef97510
|
wiki编辑页面插件更新
|
2014-08-12 11:22:37 +08:00 |
|
zhanghaitao
|
7b3468718f
|
#898 引用回帖不转义的问题
|
2014-08-12 10:24:27 +08:00 |
|
zhanghaitao
|
64f6175f22
|
1.#912 admin管理配置窗口：项目列表、用户列表界面的文字超出显示框的修改
|
2014-08-11 17:06:45 +08:00 |
|
chenmin
|
f6f1bddaff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 17:06:24 +08:00 |
|
chenmin
|
50e172a25a
|
删除课程留言前增加提示
|
2014-08-11 16:51:45 +08:00 |
|
zhanghaitao
|
d7bfdc8de4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 16:39:35 +08:00 |
|
zhanghaitao
|
b9ee7fe00d
|
1.#878 缺陷输入计划完成时间小于开始时时间修改
2.修改时间选择的最小默认值
|
2014-08-11 16:39:18 +08:00 |
|
sw
|
0c597d23a2
|
Merge branch 'szzh' into develop
|
2014-08-11 15:09:25 +08:00 |
|
sw
|
33855f721d
|
优化课程首页效率
|
2014-08-11 15:07:56 +08:00 |
|
sw
|
f7635370d7
|
优化课程首页效率
|
2014-08-11 14:49:58 +08:00 |
|
sw
|
8724b79296
|
清理页面代码
|
2014-08-11 13:37:54 +08:00 |
|
sw
|
8c6160f496
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 09:19:20 +08:00 |
|
chenmin
|
e3ab21e409
|
修复当登陆的用户的学校没有课程时的课程列表显示bug
|
2014-08-11 09:19:40 +08:00 |
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:44:00 +08:00 |
|
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
|
sw
|
6ab17a2bf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:41:36 +08:00 |
|
sw
|
db826a71ff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:19:58 +08:00 |
|
chenmin
|
6037421c7d
|
修复没有课程的学校显示bug
|
2014-08-08 15:45:06 +08:00 |
|
chenmin
|
dd64f13e49
|
课程列表空行bug
|
2014-08-08 15:37:26 +08:00 |
|
sw
|
006d1eac8f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-08 15:34:44 +08:00 |
|
z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 15:09:48 +08:00 |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
2014-08-08 15:09:32 +08:00 |
|
z9hang
|
683cd9f918
|
个人积分修改
|
2014-08-08 13:47:02 +08:00 |
|
sw
|
b5e8b12806
|
修改密码页面查询按钮改为确定
|
2014-08-08 11:32:15 +08:00 |
|
linhk
|
3d76b26e26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 09:31:42 +08:00 |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
2014-08-08 09:30:48 +08:00 |
|
zhanghaitao
|
dbe8456fd5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:56:49 +08:00 |
|
zhanghaitao
|
eac85b338f
|
标示错误修改
|
2014-08-07 17:56:29 +08:00 |
|
linhk
|
192bc8d89c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:16:26 +08:00 |
|
linhk
|
cb4869fd20
|
解决新建版本库名长255个字符时异常
解决版本库名长时，界面显示错误
|
2014-08-07 17:16:00 +08:00 |
|
chenmin
|
f2f7dfaf12
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 16:21:00 +08:00 |
|
chenmin
|
d087c52314
|
课程动态为空判断
|
2014-08-07 16:20:46 +08:00 |
|
linhk
|
af683f917d
|
解决新建版本库名非法类型成功新建
|
2014-08-07 16:09:50 +08:00 |
|
linhk
|
5e8eda6a40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 15:58:37 +08:00 |
|
linhk
|
387d482059
|
解决用户注册无地区、身份可注册成功
|
2014-08-07 15:58:00 +08:00 |
|
zhanghaitao
|
4c71af51f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 15:54:22 +08:00 |
|
zhanghaitao
|
f3fe5d918e
|
#832 状态联动问题的解决
|
2014-08-07 15:54:05 +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 |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:36:08 +08:00 |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
sw
|
dac4042ee9
|
ttt
|
2014-08-07 11:31:24 +08:00 |
|
z9hang
|
722a568466
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:29:38 +08:00 |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
2014-08-07 11:28:58 +08:00 |
|
zhanghaitao
|
68a86c5e5d
|
#873 #829问题修改
|
2014-08-07 11:20:24 +08:00 |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
2014-08-07 10:45:56 +08:00 |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-07 09:23:28 +08:00 |
|
linhk
|
0c00754057
|
解决谷歌浏览器再上传相同文件时不可用
|
2014-08-07 09:13:01 +08:00 |
|
z9hang
|
17e6f0ee4f
|
部分私有的项目提交次数显示问题
|
2014-08-07 08:51:19 +08:00 |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
2014-08-06 16:02:26 +08:00 |
|
sw
|
a4199e4c54
|
修改错误代码
|
2014-08-06 15:39:06 +08:00 |
|
sw
|
22335b23a6
|
修复新建账号申请项目时在申请列表无法显示的BUG #1180
|
2014-08-06 15:10:53 +08:00 |
|
z9hang
|
0eca547ec5
|
修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题
|
2014-08-06 15:03:43 +08:00 |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
2014-08-06 14:41:22 +08:00 |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
2014-08-06 11:46:38 +08:00 |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
2014-08-05 17:31:05 +08:00 |
|
linhk
|
d8964d81a8
|
用户注册lastname超长报错
|
2014-08-05 17:13:50 +08:00 |
|
z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
2014-08-05 16:41:23 +08:00 |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
2014-08-05 16:39:33 +08:00 |
|
sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 15:38:01 +08:00 |
|
chenmin
|
fbe3e535b4
|
修复课程资源排序bug
修复课程动态时间段约束bug
|
2014-08-05 15:23:01 +08:00 |
|
linhk
|
3862f857f7
|
解决当帖子回复条件为空排列次序错误
|
2014-08-05 14:02:39 +08:00 |
|
chenmin
|
8b217735c3
|
1029 修复部分课程资源排序不可用问题
|
2014-08-05 12:00:39 +08:00 |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
2014-08-05 11:10:41 +08:00 |
|
linhk
|
65174ad8ef
|
项目--wiki--重定向/重命名：“重”字被掩盖
|
2014-08-05 09:19:05 +08:00 |
|
linhk
|
f8d7aeebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 08:49:28 +08:00 |
|
chenmin
|
226d19b912
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 17:36:44 +08:00 |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
2014-08-04 17:36:07 +08:00 |
|
chenmin
|
8c8127c8d9
|
1016 修复课程显示界面空行问题；
|
2014-08-04 17:36:04 +08:00 |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
2014-08-04 17:30:29 +08:00 |
|
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
2014-08-04 15:49:23 +08:00 |
|
sw
|
8b3b1bdcfa
|
取消编辑参赛作品时注意提示
|
2014-08-04 15:36:19 +08:00 |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
2014-08-04 15:01:39 +08:00 |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
2014-08-04 12:23:20 +08:00 |
 linhk
|
653c505471
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 09:39:14 +08:00 |
|
sw
|
209c1aeaab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 17:06:39 +08:00 |
|
sw
|
69f7f97bf8
|
修复个人动态主页缺陷描述超出页面的BUG
|
2014-08-02 17:05:56 +08:00 |
zhanghaitao
|
01ab676622
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 15:17:21 +08:00 |
|
zhanghaitao
|
5a5ac28833
|
用户列表显示修改
|
2014-08-02 15:16:51 +08:00 |
|
linhk
|
25cfb7aa71
|
解决谷歌浏览器新建版本库文本框会默认填写缓存内容的问题
|
2014-08-02 14:43:05 +08:00 |
|
z9hang
|
ff02c4f9f2
|
修正课程显示老师、学生人数与课程中老师、学生数量不一致问题
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
|
2014-08-01 17:43:06 +08:00 |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 17:36:50 +08:00 |
|
sw
|
63cfa9b35a
|
取消打包下载的ajax
|
2014-08-01 16:14:00 +08:00 |
|
z9hang
|
c78047ae98
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 16:01:33 +08:00 |
|
z9hang
|
acb41158e7
|
错误提示页面导航栏添加
登陆时自动忽略登陆名前后空格
|
2014-08-01 16:01:16 +08:00 |
 nwb
|
204ced9490
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 16:00:06 +08:00 |
|
nwb
|
5a2d0ce649
|
issue#1077 新建竞赛的奖金换行显示，长度约束
|
2014-08-01 15:52:18 +08:00 |
|
linhk
|
54a246b6e6
|
中国高校搜索文本Enter快捷操作
|
2014-08-01 15:46:05 +08:00 |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 14:55:55 +08:00 |
|
sw
|
9e5f7e6fc6
|
取消主页加入课程链接
|
2014-08-01 14:36:41 +08:00 |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
2014-08-01 14:08:38 +08:00 |
|
zhanghaitao
|
c1519984de
|
Issue#1091,文本显示修改
|
2014-08-01 13:56:12 +08:00 |
|
sw
|
b8f27b51c0
|
取消主页加入课程链接
|
2014-08-01 11:37:14 +08:00 |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
2014-07-31 17:27:01 +08:00 |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
2014-07-31 17:02:30 +08:00 |