Commit Graph

3247 Commits

Author SHA1 Message Date
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
zhanghaitao 019a1d4cba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-07 16:41:46 +08:00
zhanghaitao d9a9867f96 #815 中英文显示问题修改 2014-08-07 16:41:31 +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 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
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 45cc3ddb9b #873提示信息修改 2014-08-07 11:23:01 +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
linhk f173db4c9d 英文版用户注册页面身份下拉框显示错误的Bug 2014-08-06 15:58:38 +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