Commit Graph

2125 Commits

Author SHA1 Message Date
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
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 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 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 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 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