jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,788 Commits 98 Branches 0 Tags 0 B
Commit Graph

2678 Commits

Author SHA1 Message Date
sw 5a7aabd7cf #1357 
1.注释无效代码
2.修改wiki、DTS测试logo不见的BUG
 2014-08-18 10:16:34 +08:00
sw 1cd00f55fb Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-18 10:14:29 +08:00
zhanghaitao 13717dc3a3 缺陷界面选项功能的屏蔽；私有缺陷的显示条件修改 2014-08-18 09:57:10 +08:00
z9hang fac973db20 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-18 09:29:38 +08:00
hhuai 8b121c3e50 fixed issue #998, 主页的通知公告区域显示优化 2014-08-17 20:56:58 +08:00
z9hang 7e00890667 项目工具集部分工具图标缺失问题 2014-08-16 17:14:04 +08:00
linhk ecae8d1f35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 17:02:58 +08:00
linhk 4f0817a146 项目--文档--文件--代码评审 中用户头像显示错误 2014-08-16 17:02:37 +08:00
sw 3d6ee127cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 16:15:47 +08:00
sw f4fd1b1133 修改创建竞赛时提示描述不正确的问题 2014-08-16 16:13:39 +08:00
z9hang c77a1fc2ef Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 15:08:38 +08:00
z9hang a3fb08817c 分数不能为0、更新readme 2014-08-16 15:08:14 +08:00
sw 2b12654796 Merge branch 'szzh' into develop 2014-08-16 13:33:07 +08:00
sw 0d398fdc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 13:31:03 +08:00
sw 9688a73aa1 1.新建竞赛作品增加js验证 
2.修复上传图片一次超过2张，上传失败的BUG
 2014-08-16 13:30:38 +08:00
z9hang 6f5df31d14 去掉多出来的图片 2014-08-16 13:23:50 +08:00
z9hang 12434e22c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 13:22:46 +08:00
z9hang 4cea972e56 micro版图片丢失问题 2014-08-16 13:22:28 +08:00
sw 8d03068ce2 Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-16 11:37:06 +08:00
linhk fcaeb86687 项目‘课程 添加成员显示Bug修改 2014-08-16 10:49:27 +08:00
z9hang dfae970d1c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-16 09:16:40 +08:00
z9hang 746022506d 用户列表排序问题、项目得分不一致问题 2014-08-15 17:43:10 +08:00
chenmin ace256bea1 修复竞赛模块用户留言挡住右边图标的问题 2014-08-15 16:06:41 +08:00
chenmin bd56286b4e 配置课程学时太长bug修复； 2014-08-15 15:58:12 +08:00
chenmin a420a41b78 单个帖子主题超出问题修复； 2014-08-15 15:12:26 +08:00
chenmin e44ece80f6 项目讨论区贴子主题超出边界bug处理 2014-08-15 14:45:04 +08:00
sw ae61ccaca9 修改动态首页显示样式 2014-08-15 14:42:28 +08:00
z9hang 2b6a376d31 修复数据库为初始状态时会出现的部分bug、去除部分连接的域名 2014-08-15 14:30:01 +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
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
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 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 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 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
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
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
zhanghaitao 68a86c5e5d #873 #829问题修改 2014-08-07 11:20:24 +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
sw a4199e4c54 修改错误代码 2014-08-06 15:39:06 +08:00
sw 22335b23a6 修复新建账号申请项目时在申请列表无法显示的BUG #1180 2014-08-06 15:10:53 +08:00
linhk 23c9d5381e 注册界面失败填写信息继续保留 
修改注册见面企业提交失败姓、名内容错误Bug
 2014-08-06 14:41:22 +08:00
z9hang 1ca6447478 修复项目缺陷、新闻、讨论区等页面无法查看bug 2014-08-05 17:31:05 +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
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
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
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
sw 8b80d99a70 修复资源标记搜索不正确的BUG issues#1089 2014-07-31 14:39:18 +08:00
sw 7b32debb92 修复谷歌浏览器用户列表翻到第5页后角色信息和翻页列表在同一行的BUG 2014-07-31 13:55:22 +08:00
sw a9fad79c8d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-31 11:35:50 +08:00
sw bb6be3ed8a 修改html错误 2014-07-31 11:35:16 +08:00
z9hang 27feeee03f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-31 10:21:33 +08:00
z9hang 8a9e2b47ad 调用存储过程刷新项目提交次数 2014-07-31 10:21:11 +08:00
sw a3cbcdad51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-31 10:13:51 +08:00
z9hang 290d9b1973 课程首页课程名过长导致个别信息显示不全问题 2014-07-30 16:31:59 +08:00
z9hang cb6c95c632 课程列表提示框里有html标签问题 2014-07-30 16:03:23 +08:00
sw 31e8ad98ae 1.修复竞赛作品每次修改之后，都会吧图片清空的BUG 
2.修改删除竞赛作品图片功能
 2014-07-30 15:48:13 +08:00
z9hang 03b212e363 首页定制，是否显示课程，竞赛 2014-07-30 15:26:55 +08:00
sw 1f4943483e 1.现在竞赛作品名称、开发人员、开发环境的长度 
2.修复竞赛作品一上传的图片，编辑时资源列表不显示的问题
 2014-07-30 13:52:55 +08:00
z9hang 847bb35906 修正谷歌浏览器贴吧图标偏移问题 2014-07-30 10:00:07 +08:00
sw 28606f030d 修复搜索参赛作品结果翻页跳转不正确的BUG 2014-07-29 17:55:14 +08:00
sw b05e112a3f 1.修改邮件服务器配置 
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
 2014-07-29 17:47:20 +08:00
sw 3119d9a9aa 增加竞赛作品的搜索功能 2014-07-29 17:35:22 +08:00
sw c1bbd8a535 对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件 2014-07-29 14:29:59 +08:00
z9hang d8fcf8eb9b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 10:07:02 +08:00
sw 2141fcc3ca 将是否启用DTS测试移入项目模块配置 2014-07-28 17:49:28 +08:00
z9hang 0d0fb7052e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 15:16:37 +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
z9hang 90a35fa24a 竞赛、课程首页，贴吧动态名字过长显示问题 
课程、项目编辑贴子导航丢失问题
 2014-07-28 15:06:54 +08:00
sw 18ddb8604b 取消参赛作品名称、描述的字数限制 2014-07-28 14:58:01 +08:00
z9hang 9bf8abd03b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 13:53:57 +08:00
z9hang a4ecccc048 修复贴吧动态中昵称过长回复被挤到不正确位置bug 2014-07-28 13:53:39 +08:00
nwb 1b589bf562 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 11:30:02 +08:00
nwb 74de064cca 1.文件删除权限判断优化 
2.课程通知附件删除BUG修改
 2014-07-28 11:29:55 +08:00
yanxd a8ed4272cc ckeditor: 描述中网址后面带有换行，projects列表出错 2014-07-28 11:03:39 +08:00
nwb f8328727cd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 10:46:15 +08:00
nwb dfdc58719a 课程主留言添加删除功能 2014-07-28 10:46:05 +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
sw cc215e6c7b 修复个人动态图片显示不准确的问题 2014-07-28 09:47:11 +08:00
nwb ef62fc1fac 修正缺陷搜索缺陷编号显示问题 2014-07-28 09:46:19 +08:00
nwb 983cdebbb6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 09:18:45 +08:00
nwb 00cf448bda 用户动态兼容空留言 2014-07-28 09:18:24 +08:00
yanxd 4fae105b96 project testing. 2014-07-25 17:43:19 +08:00
nwb f052d0d461 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 17:37:07 +08:00
z9hang a1e06991d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 17:36:11 +08:00
nwb f8a59220e3 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 17:08:01 +08:00
z9hang 97531960da 首页定制添加剂修改图片大小功能 2014-07-25 16:05:33 +08:00
sw b5b246f098 修复个性签名未自动换行的问题 2014-07-25 15:12:24 +08:00
sw ea322d6177 修复项目提交时间字的长度过长时会换行的BUG 2014-07-25 14:51:10 +08:00
nwb 1257e67380 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-25 14:06:59 +08:00
z9hang 2c08f39001 修改首页简介样式 2014-07-25 14:02:23 +08:00
z9hang d6a425849a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 13:38:20 +08:00
z9hang 34626e03a4 调整主页显示图片大小 2014-07-25 13:37:49 +08:00
z9hang 5a0d76c1e0 竞赛通知发布完成 2014-07-25 11:51:52 +08:00
z9hang 673ffb1819 提交次数刷新问题 2014-07-25 11:31:16 +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
z9hang 3b54def1c7 首页定制修改 2014-07-25 10:01:02 +08:00
sw 1b503f3b6d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 11:15:51 +08:00
nwb 0fc2e3be21 修改BUG 2014-07-24 10:43:19 +08:00
nwb d59ab02db8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 10:40:02 +08:00
nwb 990dc3cbff 修改项目文档显示 2014-07-24 10:39:42 +08:00
sw dd589c4811 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 08:50:44 +08:00
z9hang 80b5871756 竞赛首页定制中添加编辑通知通告的编辑框并存入数据库 
添加新的表记录个人得分相关细节，及各种得分更新方法
 2014-07-23 17:56:15 +08:00
sw da05ce5d61 t 2014-07-23 10:40:53 +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
sw a7debdae98 格式化代码 2014-07-23 09:16:06 +08:00
yanxd cccbd941ce 用户删除，管理界面用户去排序，删除后跳转，去无效参数 2014-07-22 17:17:42 +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 095cb7fc32 加强对chrome浏览器文件上传的支持 2014-07-22 15:02:58 +08:00
sw c2ff861fba 1.当作业文件列表为空时报403错提示改为alert提示 
2.异常捕获代码后给出js提示：暂时不能下载此文件
 2014-07-22 14:29:45 +08:00
nwb 3ba8ba010d Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-22 10:52:21 +08:00
sw d9b9b2152f 增加教师功能用户打包下载所有作业的功能 2014-07-22 09:56:29 +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 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
yanxd 87671e9d73 base footer merge bug. 2014-07-22 09:39:27 +08:00
nwb cf11cac0ad 项目文档权限判断优化 2014-07-22 09:32:46 +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 aebae800dd 竞赛首页修改 2014-07-22 08:37:07 +08:00
nwb 79eac39dc2 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-21 17:50:51 +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
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 aea41ba997 修改竞赛首页搜索功能 2014-07-21 15:45:00 +08:00
sw 890bc7459d 修改项目列表页面当管理人员过多时，显示更多。点击更多按钮，跳转到该项目的成员列表页面 2014-07-21 15:31:15 +08:00
nwb 35ab3a2c7d Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-21 13:53:45 +08:00
nwb d8d8473811 优化课程列表成员数计算 2014-07-21 13:52:23 +08:00
nwb 3a249e7196 修正课程通知编辑BUG 2014-07-21 13:40:38 +08:00
z9hang 5e4571d6af 修复部分页面导航丢失问题 2014-07-21 11:14:17 +08:00
nwb 2a8929b90f Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-21 10:11:36 +08:00
z9hang 162a4cfa84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-19 16:53:02 +08:00
z9hang 0322258386 去掉一个参加竞赛中多出来的项目创建 2014-07-19 16:52:43 +08:00
z9hang 376ba1d793 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/contests/show_attendingcontest.html.erb
	db/schema.rb
 2014-07-19 16:48:14 +08:00
sw e24323147d 修复项目描述过长不会自动换行的BUG 2014-07-19 16:45:27 +08:00
z9hang 5c0e3e96cc 修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件 2014-07-19 16:41:29 +08:00
sw ba66cde840 1.优化作业显示界面加载效率 
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
 2014-07-19 16:38:29 +08:00
nwb 0922715301 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-19 14:41:30 +08:00
sw 6186ff343e 去除无效的标签 2014-07-19 14:31:25 +08:00
nwb 4259d9c282 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-19 13:28:07 +08:00
sw fdfba199f3 修复评奖位置不正确的问题 2014-07-19 13:22:23 +08:00
sw 64f025fe70 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/contests/show_attendingcontest.html.erb
 2014-07-19 13:16:11 +08:00
sw 71ffdb9164 作品分类在下拉列表框中选择 2014-07-19 13:13:46 +08:00
nwb 206aeeccfb 优化2级菜单效果 2014-07-19 11:39:09 +08:00
nwb f20f0aaa45 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-19 11:11:58 +08:00
sw 9fe4c9f8a2 修改竞赛作品列表显示样式与创建作品样式 2014-07-19 10:44:23 +08:00
z9hang 599a277af3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-19 10:36:24 +08:00
z9hang 74ff5d505d 修改加入竞赛创建项目链接域名不正确问题 2014-07-19 10:36:11 +08:00
nwb e1edb46ba2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/course.rb
 2014-07-19 09:42:46 +08:00
nwb 908254b911 项目、竞赛首页描述优化，鼠标悬停显示内容优化 2014-07-19 09:39:48 +08:00
z9hang 40d8ec6c6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 16:58:25 +08:00
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/show.html.erb
 2014-07-18 16:56:00 +08:00
sw 6a42ce143b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 16:53:35 +08:00
z9hang b44b488807 导航栏调整 2014-07-18 16:51:41 +08:00
nwb 6780167674 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-18 16:45:58 +08:00
nwb 0e0da39113 修改BUG 2014-07-18 16:44:40 +08:00
sw 9f02003bb9 用户课程列表增加自动换行 2014-07-18 16:42:18 +08:00
nwb 0e9a15aad5 短描述修改 2014-07-18 16:41:55 +08:00
sw 41983833d7 用户项目列表增加自动换行 2014-07-18 16:40:57 +08:00
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复 2014-07-18 16:39:39 +08:00
sw e0f5708038 修改错误 2014-07-18 16:21:20 +08:00
sw 999a252f7b 修改软件创客搜索结果显示样式 2014-07-18 15:47:48 +08:00
nwb 5087f90a26 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 15:33:56 +08:00
nwb 3b9245d143 隐藏新建竞赛作品时的作品类型 2014-07-18 15:33:47 +08:00
nwb 0443f2085e 修改首页问题 2014-07-18 15:00:03 +08:00
sw 46c7a4bb9f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 14:15:52 +08:00
sw 4a04d47c3c commit 2014-07-18 14:15:30 +08:00
nwb b655f0c7b0 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-18 13:50:30 +08:00
nwb 29618d6a72 竞赛界面调整 2014-07-18 13:48:45 +08:00
yanxd df848ca756 print tag exception, course name valid test. 2014-07-18 11:08:36 +08:00
sw 5838b3e47d 不选择新闻时，取消"添加新闻"按钮的显示。不选择问题跟踪时，取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时，取消“发布新帖”按钮的显示 2014-07-18 10:54:22 +08:00
z9hang 057447f810 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 10:49:38 +08:00
nwb a4d06fbb12 课程成员设置为只能使用单一权限 2014-07-18 10:29:49 +08:00
sw 6f858795ef 项目模块配置未选中wiki时，取消左侧项目工具集的WIKI显示 2014-07-18 10:24:49 +08:00
sw bcaaa02bed 取消已完成课程在软件创客列表的显示 2014-07-18 10:01:54 +08:00
nwb b7c4f87a8f Merge remote-tracking branch 'remotes/origin/szzh' into develop 
Conflicts:
	app/views/welcome/index.html.erb
 2014-07-18 09:57:47 +08:00
z9hang 036f8a3870 user.trustie.net域名下的用户列表课程项目链接跳转域名不正确 2014-07-18 09:46:11 +08:00
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 09:21:21 +08:00
nwb 8eac756ac7 1.项目首页的描述更改，不再限制项目描述字数 
2.竞赛首页的描述更改，不再限制竞赛描述字数
 2014-07-18 09:21:09 +08:00
z9hang 5b7fc4048a user.trustie.net域名下课程主页导航栏多个课程实践菜单 
页面跳转时域名不正确问题重新修正
 2014-07-18 09:11:02 +08:00
z9hang 0f4933240b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-17 18:10:42 +08:00
z9hang 7c3a81735c user。trustie.net域名下跳转到项目页面时主域名没变bug（尚需测试） 
user.trustie.net域名下主导航栏多一个项目托管菜单问题
 2014-07-17 18:10:32 +08:00
nwb 3b1b057f0a 课程描述自动换行 2014-07-17 16:56:45 +08:00
nwb 634ef8df5f 界面修改 2014-07-17 16:11:32 +08:00
nwb 02b4029e8c 资源文件下载界面调整 2014-07-17 15:05:49 +08:00
nwb 615b3ac2ac 课程界面调整 2014-07-17 14:32:07 +08:00
nwb a58a747cfa 屏蔽用户界面的关注需求功能 2014-07-17 09:10:29 +08:00
z9hang d9e04bab0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 14:22:37 +08:00
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题 2014-07-16 14:22:12 +08:00
nwb 62af03debd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 10:36:32 +08:00
nwb ca7ad03a05 1.优化课程动态信息 
2.优化项目动态信息
 2014-07-16 10:36:22 +08:00
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 10:15:43 +08:00
nwb 3254c4a237 修正二级菜单名称显示问题 2014-07-16 09:45:39 +08:00
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-15 16:16:13 +08:00
z9hang 6a45a0287d 添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因） 2014-07-15 16:13:50 +08:00
sw 121ffa0342 修改缺陷时增加跟踪者的删除和增加功能 2014-07-15 15:09:52 +08:00
sw b142953a4b 1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示 2014-07-15 10:28:49 +08:00
sw 61ba2c47ee 1.修改历史数据中作业为项目时作业显示列表未改变的问题 
2.修改作业列表关联项目过长，增加省略号显示和鼠标移动到相应位置的气泡显示
 2014-07-15 09:43:13 +08:00
sw 8f8fb79a63 1.软件创客搜索功能修改表单提交为在js中提交 
2.增加判断搜索条件是不是为空
 2014-07-14 16:29:59 +08:00
sw 90e28518f2 增加学校列表查询时，如查询条件为空，增加提示 2014-07-14 15:45:38 +08:00
nwb 1da147684a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-14 15:15:56 +08:00
nwb 2a1a051362 课程资源文件密级BUG修正 2014-07-14 15:15:28 +08:00
sw b704a44dfb Merge remote-tracking branch 'origin/szzh' into szzh 2014-07-14 13:54:14 +08:00
sw 7a9b5156c9 修复软件创客列表当用户姓名比较长时，用户姓名会被个人得分覆盖掉的BUG 2014-07-14 11:46:52 +08:00
nwb 0950ac2329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-14 11:32:01 +08:00
nwb 87b623bc51 1.文档添加密级设置 
2.新建文档、修改文档视图修改
 2014-07-14 10:44:07 +08:00
z9hang f44c715cfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-14 09:18:46 +08:00
z9hang 6b6fd2906f 竞赛列表。贴吧列表的非空判断 
数据迁移报错问题修改
 2014-07-14 09:18:31 +08:00
sw 59a5541e45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-11 14:52:15 +08:00
sw 9da70f9a20 调整项目列表样式 2014-07-11 14:51:33 +08:00
sw 9472a7eb5c 未登录时取消显示我的学校按钮 2014-07-11 13:41:05 +08:00
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-11 11:45:46 +08:00
z9hang 3dfcc90574 课程、竞赛首页定制 
超级管理员账户中首页定制界面优化
 2014-07-11 11:41:54 +08:00
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop 
Conflicts:
	ReadMe.txt
	app/views/layouts/_base_footer.html.erb
 2014-07-11 11:38:36 +08:00
sw 4f2298fd22 修复个人动态首页中留言等动态显示有误的问题 2014-07-11 10:31:52 +08:00
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop 
Conflicts:
	app/views/layouts/_base_footer.html.erb
 2014-07-11 09:11:37 +08:00
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/repositories_controller.rb
	db/schema.rb
 2014-07-11 09:08:50 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件 
2.资源文件添加文件密级设置
 2014-07-11 09:07:09 +08:00
sw bed662c2e5 修复项目缺陷列表描述显示不正常的BUG 2014-07-10 17:42:40 +08:00
z9hang b4dd8409eb 添加项目托管平台首页定制功能 2014-07-10 17:38:04 +08:00
sw 51ef3fa5a1 修复主页课程介绍显示有误的BUG 2014-07-10 16:58:57 +08:00
sw 7bcb1cbe2e 修复个人主页中作业、项目介绍不正确的BUG 2014-07-10 16:57:04 +08:00
sw 39434766e3 1.修复超级管理员无法访问课程作业列表的BUG 
2.修改作业描述样式
 2014-07-10 16:35:53 +08:00
sw a5518363c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-10 11:31:44 +08:00
z9hang 720c75478a 修正上传图片可传非图片文件bug 2014-07-10 10:15:20 +08:00
sw 76db0e61c3 调整页面样式 2014-07-10 09:21:24 +08:00
yanxd 91eb7751da issue global 859. 搜索处理空格 2014-07-10 09:02:28 +08:00
Administrator 6082eca117 test 2014-07-10 08:56:52 +08:00
z9hang 4d75fbfcb8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-09 16:02:36 +08:00
z9hang 9634046d11 权限管理机制优化 2014-07-09 16:02:15 +08:00
yanxd 0998438e67 bootstrap fine tuning. 2014-07-09 15:20:00 +08:00
z9hang fd71435b30 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-09 14:40:11 +08:00
z9hang b87abf1f68 权限管理优化 2014-07-08 18:02:10 +08:00
yanxd 449b87e38d remove cnzz 2014-07-08 15:38:37 +08:00
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq 2014-07-08 10:59:20 +08:00
yanxd ab03962e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-07 16:53:00 +08:00
yanxd aca63146e9 搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法 2014-07-07 16:52:39 +08:00
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-07 16:27:49 +08:00
nwb b4ee106ce9 竞赛搜索项为空时给出提示 2014-07-07 14:31:21 +08:00
nwb bc179fbc39 右上角菜单增加二级菜单 2014-07-07 13:41:44 +08:00
nwb 633c4278d8 修改课程列表视图 2014-07-07 10:12:07 +08:00
nwb 0471446ac8 新增、修改缺陷发送邮件的缺陷编写优化 2014-07-07 10:07:50 +08:00
nwb beeb707347 用户未登陆时首页不提示“该学校未开设任何课程” 2014-07-07 09:37:45 +08:00
nwb 5f18b1a38c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 15:11:57 +08:00
z9hang f5b69be967 新建贴吧描述为空不能新建、搜索空内容添加提示 2014-07-05 14:43:15 +08:00
nwb fb8e97ff61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/show.html.erb
 2014-07-05 13:51:41 +08:00
nwb eb15edd5ff 1.添加文档 
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
 2014-07-05 13:31:32 +08:00
z9hang 5c93442c79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 11:44:21 +08:00
z9hang 01da0852e3 新建贴吧错误提示修改 2014-07-05 11:44:05 +08:00
sw 6365d01051 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 11:21:27 +08:00
sw f1b8b7caed t 2014-07-05 11:20:59 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
yanxd db28ecd883 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 09:40:11 +08:00
yanxd 2fa9a4855c 最后创建人信息的正确显示（+去掉了乱78糟的table套table） 
div-class内标明activity-title等，内嵌css属性等没有问题再移动出html文件
 2014-07-05 09:39:58 +08:00
nwb efbffa7436 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-05 09:34:34 +08:00
nwb c927bb6fd6 首页课程列表修改 2014-07-05 09:33:52 +08:00
sw 8b389776a1 打开缺陷列表改为从新建窗口打开 2014-07-04 16:14:11 +08:00
sw 65c25feabb 修复项目的缺陷模块改版之后，新增缺陷界面找不到的问题 2014-07-04 16:00:18 +08:00
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接 2014-07-04 15:21:56 +08:00
sw 71b17cd98e 1 2014-07-04 14:47:38 +08:00
sw 62bcccedea 新建作业时给必填项添加*号 2014-07-04 14:04:31 +08:00
sw bc9f1e5a01 1.修改软件创客中每个用户内容显示不一致的BUG 
2.去掉用户项目列表最后一个项目后的逗号
 2014-07-04 13:59:08 +08:00
nwb 164d4f9e78 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-04 13:39:34 +08:00
sw b492ead0c0 修改学校链接 2014-07-04 11:51:26 +08:00
sw a1920ca54c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 11:31:09 +08:00
sw 1e6693cdcf 1.取消软件创客界面2个个人得分显示 
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
 2014-07-04 11:26:37 +08:00
yanxd d54f37e630 个人动态，判断留言人逻辑有误 2014-07-04 11:15:58 +08:00
nwb 3a7065bb2d Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-04 11:12:27 +08:00
nwb 08a6dec39d 课程讨论区回复时主题只读 2014-07-04 11:11:27 +08:00
sw 2506e8e50d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 10:30:14 +08:00
sw 108866b8ba 1 2014-07-04 10:29:31 +08:00
sw 016ef25019 1.注释无效代码 
2.修改软件总包列表分页统一使用@bid_count
 2014-07-04 10:22:35 +08:00
nwb dc0180988f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 09:10:36 +08:00
nwb d001b4416a 1.优化课程首页 
2.优化课程首页搜索逻辑
 2014-07-04 09:10:17 +08:00
sw 7acf73c4ca 修复未登陆用户进入学校主页列表出错的问题 2014-07-04 08:42:00 +08:00
sw fd1f3b45c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 18:21:18 +08:00
nwb 6e53796aa9 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 18:21:17 +08:00
sw f86e889c23 修复学校列表链接 2014-07-03 18:20:16 +08:00
nwb 42a602a9bc 修改首页 2014-07-03 18:20:03 +08:00
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/course.html.erb
 2014-07-03 18:14:44 +08:00
sw 3e185c3a4b 修改学校链接 2014-07-03 18:11:10 +08:00
nwb 1a666900c0 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 17:30:45 +08:00
nwb 98ba57b819 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 17:28:20 +08:00
nwb 4d25ec1623 1.添加课程垃圾数据清理迁移文件 
2.课程首页逻辑更改
 2014-07-03 17:28:13 +08:00
sw b42d742c06 1.增加我的学校链接 
2.修改当我的学校未开设课程时报出的BUG
 2014-07-03 17:25:51 +08:00
yanxd 271af6ead5 Merge branch 'szzh' into develop 2014-07-03 17:23:29 +08:00
yanxd 0e2b7ba362 tag search fix 2014-07-03 17:22:48 +08:00
sw fe4e1cc175 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 16:41:48 +08:00
nwb a03cdf272e Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 16:17:01 +08:00
nwb 9f7951a22c 修改BUG 2014-07-03 16:16:21 +08:00
nwb 41ff47b839 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 16:08:36 +08:00
nwb 52ddee2b2f 界面优化 2014-07-03 16:07:30 +08:00
nwb bc50390a2e Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 15:51:49 +08:00
nwb 5c0b1f3a47 修改界面 2014-07-03 15:51:18 +08:00
nwb 8564f7a904 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 15:46:51 +08:00
nwb 8d22ccd23a 修改BUG 2014-07-03 15:45:50 +08:00
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-03 15:41:15 +08:00
nwb 39b4bd37d4 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 15:31:43 +08:00
nwb b928eb6ed8 修改课程首页“更多”链接错误 2014-07-03 15:30:52 +08:00
nwb ae8093c400 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 15:26:26 +08:00
nwb 2a6cbe28f0 修正课程首页错误 2014-07-03 15:24:06 +08:00
sw 3c7e680b1b Merge remote-tracking branch 'origin/szzh' into szzh 2014-07-03 10:33:35 +08:00
nwb 41999e64b7 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-03 10:14:12 +08:00
nwb 31e338f1e5 修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题 2014-07-03 10:12:30 +08:00
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 10:09:25 +08:00
yanxd 10a844c67f 合并导致的，任务列表分页错误 2014-07-03 10:06:57 +08:00
yanxd f664ec10b4 Merge branch 'szzh' into develop 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb
 2014-07-03 09:07:09 +08:00
yanxd 663634b9da Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-07-03 09:03:17 +08:00
nwb 898ecb443a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-02 14:59:02 +08:00
nwb e8705bccb1 修改文件上传界面样式 2014-07-02 14:58:52 +08:00
z9hang fe3861c1d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-02 11:33:00 +08:00
z9hang 54a2fb8a9c 主页项目得分与项目页面的项目得分保持一致 2014-07-02 11:32:49 +08:00
nwb fb0597ab4a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-02 09:11:56 +08:00
nwb 2b855badf9 修正课程资源库关联已有资源功能 2014-07-02 09:11:45 +08:00
xianbo 830e2d4fb4 隐藏 站长统计 2014-07-01 18:18:25 +08:00
sw 063460f119 tt 2014-07-01 17:49:12 +08:00
z9hang cc2862ae0f 修正缺陷不能踩自己提示错误 2014-07-01 17:21:16 +08:00
nwb e94ed86ead 部分BUG修正 2014-07-01 16:56:23 +08:00
sw 4470f0dd73 添加作业时增加教师评分所占比例设置 2014-07-01 11:53:55 +08:00
nwb 6141cc56e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-30 17:26:25 +08:00
nwb e863c30352 部分BUG修正 2014-06-30 17:26:11 +08:00
z9hang 9a8c5ebecc 个人得分规则显示 
留言回复未加分bug修改
 2014-06-30 16:19:28 +08:00
sw f6d9bfc91d 修改新建作业时传递参数 2014-06-30 11:15:52 +08:00
sw be2faea15b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/bids_controller.rb
	app/views/courses/new_homework.html.erb
 2014-06-30 11:15:25 +08:00
linchun 79f68c2231 Merge branch 'szzh' into develop 2014-06-28 08:51:23 +08:00
nwb 25a3114a5a 老师的学生列表显示为真实姓名 2014-06-27 16:44:53 +08:00
nwb 917288c84c 修正课程讨论区、课程通知等创建时BUG修正 2014-06-27 15:58:41 +08:00
sw 3f8f141107 修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG 2014-06-27 15:35:55 +08:00
nwb 99c9f81aea BUG修正 2014-06-27 15:26:42 +08:00
nwb 1a4ee62853 修正课程错误信息显示2遍的问题 2014-06-27 14:17:21 +08:00
nwb c0f0e294e5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-27 11:25:00 +08:00
nwb beeab518e8 课程动态中留言链接BUG修复 2014-06-27 11:24:48 +08:00
z9hang 0717148a0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-27 11:15:20 +08:00
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能 
修复个人分数计分异常
 2014-06-27 11:15:10 +08:00
nwb 3565b9da88 修正用户课程界面关闭、重启课程，数据刷新不及时的问题 2014-06-27 10:50:23 +08:00
sw 09d79ae4e0 添加作业增加默认日期为当前时间的下一天 2014-06-27 10:10:30 +08:00
sw 745727b8e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 17:55:18 +08:00
z9hang 74603e1256 解决直接访问ajax链接地址报错问题 2014-06-26 17:55:01 +08:00
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG 2014-06-26 17:49:23 +08:00
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG 
2.点击所属任务返回作业列表界面
 2014-06-26 16:47:49 +08:00
sw 392dc0c365 增加访问作业显示列表的权限 2014-06-26 14:58:59 +08:00
sw ed9b97f987 增加访问作业显示列表的权限 2014-06-26 14:42:32 +08:00
sw 56ce9e8bdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-26 11:41:10 +08:00
sw c4b2c47dc7 调整作业显示样式 2014-06-26 11:40:54 +08:00
sw 12087f40c7 1.当作业未选定项目时，项目得分为灰色的N/A，选定了项目，项目得分为橘色的分数 
2.当无人对作业进行互评、综评时，作业的互评、综评得分为灰色的N/A，有人进行评分则为橘色的分数
3.简化代码
 2014-06-26 11:22:48 +08:00
nwb b4af75f289 部分界面优化 2014-06-26 11:15:06 +08:00
sw 7702b746c6 修复作业显示界面，提交作业按钮不显示的问题 2014-06-26 10:55:50 +08:00
nwb f4aa817f42 修改合并后首页出错的问题 2014-06-26 10:01:44 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
 2014-06-26 08:53:16 +08:00
z9hang 02e221eedb 修改：网站中的旧分数显示为新分数 2014-06-24 13:57:51 +08:00
sw c320ede205 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-24 09:24:29 +08:00
linchun c1e780a0f8 yan 2014-06-23 18:48:57 +08:00
linchun 0c501022fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-06-23 18:06:29 +08:00
z9hang dc1bd010f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 17:59:10 +08:00
z9hang df89e5e173 去掉多的一个分数显示 2014-06-23 17:49:20 +08:00
linchun e602c0f149 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-06-23 17:18:17 +08:00
nwb ef61e41d48 去掉首页缓存 2014-06-23 16:00:10 +08:00
linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	app/controllers/account_controller.rb
 2014-06-23 15:06:37 +08:00
sw 91408cc960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 14:59:41 +08:00
z9hang 773b728828 修改：自己不能踩或顶自己 2014-06-23 11:17:42 +08:00
z9hang 9d9bc76af4 定时刷新分数 2014-06-21 17:06:08 +08:00
z9hang f9612ca63f 实时刷新（ajax轮询） 2014-06-21 15:34:10 +08:00
sw 339b5b0296 缺陷编辑页面直接显示，不需要点击留言按钮才显示缺陷编辑页面 2014-06-20 17:14:43 +08:00
sw 18762e2da7 增加、修改作业时提交项目增加空值选择，即不选定任何关联项目 2014-06-20 13:52:17 +08:00
sw d2376eb0b1 将页面部分jS代码转为JQuary代码 2014-06-20 11:16:08 +08:00
sw d0c9390e91 增加什么是项目链接。点击什么是项目 实现jQuary窗帘效果显示解释 2014-06-20 10:52:34 +08:00
nwb 8cdab80d31 用户课程界面链接BUG修改 2014-06-20 10:32:51 +08:00
sw 5277eddb95 封装获取一个作业参与人员方法 2014-06-20 09:40:12 +08:00
sw 600ec536b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-19 20:15:46 +08:00
sw 09eae9e253 1.作业列表增加项目得分显示 
2.封装获取指定项目得分的方法，并保留2位有效数字
 2014-06-19 20:14:48 +08:00
sw 36fecfc635 1.界面颜色调整 
2.得分显示取消“分”字
 2014-06-19 19:48:03 +08:00
sw 19530df395 作业附件显示修改 2014-06-19 19:14:51 +08:00
z9hang 2ee5b422fb RolesController.rb移回app/controls 2014-06-19 18:16:55 +08:00
sw 463edeee71 1.修复未开启互评功能作业总评得分计算不正确的问题 
2.修复未选择项目新建、修改有误的BUG
 2014-06-19 17:49:18 +08:00
sw e43a84ab4b 1.修复作业无关联项目是进入编辑界面报错的问题 
2.修复作业综评页面不会及时更新的问题
 2014-06-19 17:00:40 +08:00
sw 4d06d26303 优化新建作业页面显示 2014-06-19 15:58:49 +08:00
sw f3f303e6e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-19 15:56:07 +08:00
sw ef234d8c50 1.按照新的评分规则修改作业得分 
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
 2014-06-19 15:55:42 +08:00
nwb 0736dd1254 课程讨论区回复权限和界面BUG修正 2014-06-19 15:50:42 +08:00
z9hang 9e4dbcc08e 加回学校主页学校的超链接 2014-06-19 15:31:30 +08:00
sw d38e009469 取消学号显示，增加参与人员在作业列表的显示 2014-06-19 14:01:18 +08:00
sw 71bb76ff91 作业显示界面页面改造，实现新的页面显示效果 2014-06-19 13:51:39 +08:00
nwb 8a5e1f5d9f 界面修改 2014-06-19 11:45:02 +08:00
z9hang 9061a77221 修改user.user_score为空问题的解决方式 2014-06-19 10:45:30 +08:00
z9hang 3c89de4c81 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-18 17:35:26 +08:00