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

2909 Commits

Author SHA1 Message Date
sw e112bb2803 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-21 10:38:35 +08:00
sw 16d86a1fbd 课程、项目模块增加分页功能 2014-08-21 10:37:53 +08:00
chenmin 532cb23141 修复标签和内容之间空白太多的问题； 2014-08-21 10:19:46 +08:00
chenmin 3a2754eb27 修复查看单个竞赛页面的竞赛详细信息被遮住的bug； 2014-08-21 10:16:01 +08:00
sw 8932633b23 Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-21 09:56:14 +08:00
chenmin 142d413544 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-21 09:22:57 +08:00
chenmin a328a934c8 修复查看单个竞赛页面的删除、编辑竞赛标签的显示bug； 2014-08-21 09:22:34 +08:00
luguo 075b43f836 解决版权符号问题 2014-08-21 09:18:10 +08:00
linhk 66dfa1ce4f 解决删除项目主留言分页Url错误和页数错误的Bug 2014-08-21 08:58:48 +08:00
luguo cc08cdc140 解决我的课程下面的课程描述带格式显示不正常。 2014-08-20 17:16:14 +08:00
sw 136c991060 #1413 
修复资源名称过长，在课程动态首页会超出边界的问题
 2014-08-20 16:28:04 +08:00
sw c13eeee56d 1.修改页面描述错误 
2.注释错误代码
 2014-08-20 15:51:35 +08:00
zhanghaitao 8f83c63c79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 14:55:44 +08:00
zhanghaitao 9bd22b1b99 1.#1011 当添加资源标签为多个时，“新增”按钮被掩盖的问题解决 
2.课程标签设置JS添加
 2014-08-20 14:55:32 +08:00
chenmin 86e377a228 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 11:40:14 +08:00
chenmin 73537a30cb 修复资源上传人不能下载项目讨论区非公开资源的问题 2014-08-20 11:39:41 +08:00
linhk 507235cd69 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 10:51:08 +08:00
linhk 4c57136a1d 项目留言删除功能 2014-08-20 10:50:29 +08:00
sw f396a45e1f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 10:47:42 +08:00
sw fae3c45920 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 10:46:50 +08:00
zhanghaitao 337f0ec270 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-20 09:42:15 +08:00
zhanghaitao 4905511060 #课程起止时间显示Bug的修改 2014-08-20 09:42:01 +08:00
chenmin 80bd535b4f 课程讨论区回复帖子的内容增加删除附件功能； 
增加可以编辑自己回复内容的功能；
 2014-08-20 09:30:26 +08:00
z9hang 1e234a9adf 优化积分计算速度问题 2014-08-19 17:03:26 +08:00
linhk a0a8868c24 个人主页的课程项目tab页显示优化 2014-08-19 15:44:02 +08:00
linhk 5e600380c7 课程实践平台课程名称与学校调换 2014-08-19 15:10:04 +08:00
sw 7b00008721 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-19 14:04:43 +08:00
chenmin c042add122 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-18 17:44:48 +08:00
chenmin bfe0299d40 修复部分帖子内容显示超出边框的bug 2014-08-18 17:44:37 +08:00
z9hang 9039755fc5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-08-18 17:15:43 +08:00
z9hang ed3e9e3a03 项目成员列表积分计算的初步优化（降低访问速度） 2014-08-18 17:14:31 +08:00
sw 5fb1b220e5 #1369 修复查看作业列表错误的BUG 2014-08-18 16:46:34 +08:00
chenmin e181f0ed4d 添加贴吧帖子存在性判断 2014-08-18 16:12:22 +08:00
chenmin 4ed9b13f0b 修复点击某些贴吧提示数据不存在的404page not found bug 2014-08-18 15:53:25 +08:00
sw a7e066add8 修复项目得分无法显示详细信息的BUG 2014-08-18 14:15:22 +08:00
sw 012791e44d Merge remote-tracking branch 'origin/szzh' into szzh 2014-08-18 11:09:40 +08:00
zhanghaitao 13becbefb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/show.html.erb
 2014-08-18 11:09:54 +08:00
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
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
z9hang 378c06379e 项目文档得分计算错误问题 2014-08-16 16:28:35 +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 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