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

1271 Commits

Author SHA1 Message Date
guange e3633e702c firefox样式问题 2015-05-19 08:53:51 +08:00
yutao df24007dbb 修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开 2015-05-18 11:16:41 +08:00
guange 1226f74750 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-05-16 10:00:37 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
sw a44cba2e6a Merge branch 'develop' into guange_dev 2015-05-15 17:36:44 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
sw 659ff254e1 background背景图片拉伸 2015-05-15 17:12:01 +08:00
guange 66e2bc5ef2 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-15 16:19:13 +08:00
guange 588d96a0c0 头像上传只允许图片 2015-05-15 16:18:44 +08:00
sw a8e7590b16 Merge branch 'szzh' into guange_dev 2015-05-15 16:13:47 +08:00
sw 99e3d09e83 IE浏览器中li前面有个点 2015-05-15 15:17:47 +08:00
guange 907d89e1cc merge 2015-05-15 13:39:26 +08:00
yutao 233c68e965 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:47:57 +08:00
yutao 68cf5fa55e 修复:当1个页面存在多个上传控件时的各种bug 2015-05-15 11:45:15 +08:00
huang 7db9e2eb7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:28:59 +08:00
huang 2fb5871058 缺陷显示新界面 2015-05-15 11:26:50 +08:00
guange e5a9d87ce1 新建贴吧如果放个图片就会撑坏版面 2015-05-15 11:18:58 +08:00
alan 372bf71ca5 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-15 10:08:12 +08:00
alan cc5738c12f 课程讨论区回复样式错误 
Signed-off-by: alan <547533434@qq.com>
 2015-05-15 10:07:52 +08:00
sw a77a572a4d Merge branch 'szzh' into guange_dev 2015-05-14 17:46:08 +08:00
guange 06b17581b1 图片撑出在firefox上的问题 2015-05-14 17:45:02 +08:00
sw 9bbae3d7ac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/application.css
 2015-05-14 16:59:27 +08:00
sw 3dc1b2642a 发布竞赛日期选择图标有问题 2015-05-14 16:53:36 +08:00
sw c241fc00e9 测试版--课程--课程作业：如图作业附件显示与图标重叠 2015-05-14 16:48:08 +08:00
sw c129e767e5 测试版：公共贴吧：显示页数应该与虚线分开 2015-05-14 16:26:01 +08:00
huang 574e79ff57 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 16:06:41 +08:00
huang 725a6e4238 解决发布竞赛日历问题 2015-05-14 16:03:37 +08:00
alan 0708279c5e Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:42:20 +08:00
alan 8a52225f4d Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:19:15 +08:00
alan f9d9ffe4d9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 15:11:36 +08:00
alan 72ef4e1db4 修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 15:11:20 +08:00
sw 963a21283f 1、修改作业打分插件星星移位 
2、修改返还批改结果显示不正确
 2015-05-14 15:09:15 +08:00
guange 52217efcb6 issue中图片超出边框 2015-05-14 14:12:50 +08:00
guange d88b5dbbed Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-14 12:44:56 +08:00
guange 69afe8809e 经测试，转到rspec各方面成熟一点。 2015-05-14 11:41:50 +08:00
huang d60639f557 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 09:58:08 +08:00
huang aef91be36c 修复新建缺陷样式冲突 2015-05-14 09:57:13 +08:00
alan 0af8c1cc38 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-13 17:25:49 +08:00
alan bd77ad9ac1 展开。收起 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 17:25:31 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
guange 9f4d7fc033 merge 2015-05-13 16:00:35 +08:00
guange 80d44e4f4c 新版项目的上传图标问题解决 2015-05-12 17:46:54 +08:00
alan fe92b05026 讨论区编辑添加附件 
Signed-off-by: alan <547533434@qq.com>
 2015-05-12 17:14:07 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
alan ee18ba7051 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
	app/views/boards/_project_show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:25:17 +08:00
alan 25bcc676b9 增加附件功能以及修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:23:15 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
sw 25e80cefb8 Merge branch 'szzh' into guange_dev 2015-05-08 15:44:47 +08:00
sw d4f73ae472 111 2015-05-08 15:43:55 +08:00
sw 5f6f7b7cdf 引用功能图片显示不正常 2015-05-08 15:31:13 +08:00
sw ee051f6a37 1、课程讨论区回复取消功能 
2、课程讨论区回复时不现实主题
 2015-05-08 14:55:56 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +08:00
alanlong9278 f9a25373b0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 09:55:33 +08:00
alanlong9278 f638dd6810 课程讨论区 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:55:19 +08:00
sw 78f30344b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 09:55:00 +08:00
sw db6218a487 教师列表界面增加角色显示、教师显示真实姓名 2015-05-08 09:54:40 +08:00
alanlong9278 3d74734607 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:48:43 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
alan 4bf08e49da Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 16:10:22 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
sw 5ea295f8b5 1、第一次进入作品列表界面 返回顶部按钮不显示 
2、第一次点击返回顶部按钮无用
 2015-05-07 15:58:41 +08:00
sw 628ffc67dd 课程作品列表界面增加返回顶部功能 2015-05-07 10:43:23 +08:00
alan 4546095ed4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 09:53:50 +08:00
alan eee0df8d22 修改课程，项目的讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 09:53:34 +08:00
sw cba473269d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:31:22 +08:00
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
whimlex 3b5d8f76a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-06 17:41:36 +08:00
whimlex 3c72af69ea 版本库刷新页面时“git操作指南”展开收起保持一致 2015-05-06 17:41:18 +08:00
sw b456bc0e62 评分支持打0分 2015-05-06 16:55:59 +08:00
huang fd28310e15 修改issue列表太长换行问题 2015-05-06 16:37:18 +08:00
sw 6bbf8c8f45 课程通知、课程留言取消按钮删除编辑器内内容 2015-05-06 14:53:25 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中，刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
whimlex 9707a88790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 17:26:10 +08:00
whimlex 88bbd70102 项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
huang 431c6888a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 11:16:09 +08:00
huang 78c410b1ec 解决缺陷中多余的对勾图标 2015-04-30 11:10:41 +08:00
sw 0a8f3faf6a 1、project.css错误代码 
2、项目上传资源弹框
 2015-04-30 09:02:33 +08:00
whimlex 33fc193e65 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 17:50:51 +08:00
whimlex bbe4c15293 问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式 2015-04-29 17:50:35 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
sw a6a144d079 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-28 14:37:45 +08:00
sw 4c3013f1ac 修改作业评价上传附件功能500 
作业标题换行
 2015-04-28 14:37:25 +08:00
lizanle edd4bbbe96 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-28 14:10:04 +08:00
lizanle 404b3e3275 暂时去掉一些editor功能 2015-04-28 14:09:58 +08:00
sw 2d7e4278ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-28 13:35:36 +08:00
sw 9b15cbd6ee 1、老师评分、学生匿评增加附件上传，可上传批改后的作业 
2、修改作业列表作业数不显示
 2015-04-28 12:21:35 +08:00
lizanle df7b33fe48 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-28 10:51:28 +08:00
lizanle fb043f2451 暂时去掉有问题的功能 2015-04-28 10:51:17 +08:00
lizanle de640a59b6 没有push上传成功，打个空格继续push 2015-04-28 09:38:46 +08:00
lizanle 2aac345645 去掉重复的图片上传 2015-04-28 09:37:31 +08:00
lizanle 3fac34d942 删掉没有被修改的图片 2015-04-28 09:16:54 +08:00
sw 456dcf9d40 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:52:34 +08:00
sw a64b3940dd 1、当教师评论为空时，预留一部分 2015-04-27 17:50:03 +08:00
lizanle d07a1b945f kindeditor增加切换到简单功能按钮 2015-04-27 17:38:32 +08:00
lizanle 92b79b40da Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-27 17:38:21 +08:00
lizanle e5e0a5857a kindeditor增加切换到简单功能按钮 2015-04-27 17:38:05 +08:00
whimlex 4982c9f7d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:15:38 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开，样式调整 2015-04-27 17:15:21 +08:00
lizanle 99ae746bff Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-27 17:02:06 +08:00
lizanle 8b6369a84f kindeditor增加更多功能按钮 2015-04-27 17:01:52 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
sw 03044d0190 课程--资源库：加粗上传课件分类字样 2015-04-27 15:59:22 +08:00
lizanle aff7a97c4b Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 16:05:40 +08:00
lizanle 338a7d3ded 暂时去掉code icon 2015-04-24 16:05:32 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 091c6125d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 15:02:53 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
sw 91e37c7ab8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 14:58:51 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
lizanle 138fff1bf5 暂时去掉全屏icon 2015-04-24 12:05:23 +08:00
lizanle c384384b35 改变图标icon位置 2015-04-24 12:02:35 +08:00
lizanle 3810561fb1 改变图标icon 2015-04-24 12:02:09 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
lizanle 3e27acf03c Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 09:07:36 +08:00
lizanle f4b6b795e3 kindeditor增加代码编辑功能 2015-04-24 09:07:12 +08:00
whimlex 1f83950b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 18:18:50 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
lizanle cf9cc0af82 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-23 18:08:10 +08:00
lizanle 681f7b75d6 kindeditor图片上传改为一次弹框 2015-04-23 18:07:51 +08:00
whimlex e61822d74a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:56:11 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
sw e21dfe28fd Merge branch 'szzh' into guange_dev 2015-04-23 17:45:22 +08:00
lizanle f7dd4924c1 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2015-04-23 17:44:42 +08:00
lizanle 3b99c97617 kindeditor图片上传改为一次弹框 2015-04-23 17:43:34 +08:00
guange 5c0d0230fc 去掉首页底部留白和不对齐 2015-04-23 17:43:10 +08:00
whimlex b5781ac22b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:13:19 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
huang 4da77d8a71 wiki页面显示 2015-04-23 16:02:18 +08:00
huang c9bfe00a4f 修改成员列表的排列 
版本库页面色系
 2015-04-23 15:31:14 +08:00
sw cfe0635804 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 14:31:01 +08:00
huang de23c3c2a8 配置中子页面调整 
隔行换色显示
显示页面左对齐
 2015-04-23 14:04:22 +08:00
sw 5b5423b8c5 修改贴吧新建帖子、回复显示样式的问题 2015-04-23 10:47:54 +08:00
huang ee1c53bacc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:15 +08:00
whimlex 2070d69d44 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:01 +08:00
huang 348eae5c45 修改项目模式提示样式 
版本库
版本
 2015-04-23 10:19:59 +08:00
whimlex 19fe973b5b 上传头像 2015-04-23 10:19:43 +08:00
whimlex d66af82478 新建竞赛页面日历插件显示错误 2015-04-23 01:00:17 +08:00
sw 9a07989917 调整header的login的样式 2015-04-22 17:01:36 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
whimlex 36f2643ad8 上传logo 2015-04-22 16:33:12 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw 2f2d4257c2 调整提交作业按钮样式 2015-04-22 14:10:45 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00