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

2481 Commits

Author SHA1 Message Date
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
huang 3d06d5a503 Merge branch 'yuanke' into develop 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-14 17:31:53 +08:00
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题 2016-03-14 17:16:11 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
luoquan 006731ea61 修改以下问题： 
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
 2016-03-14 15:51:50 +08:00
luoquan 270a290df9 修改视频不能播放问题。 2016-03-14 15:18:56 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
luoquan e0922e9b19 调整视频播放默认图大小 2016-03-11 16:25:05 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
luoquan 1e256add7f 媒体播放默认样式 2016-03-11 13:17:15 +08:00
luoquan 033c7991e1 修改媒体播放 2016-03-11 13:16:44 +08:00
luoquan ec4b7e3744 视频默认图标 2016-03-11 11:24:10 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 62f91865e0 kindeditor视频添加默认图片 2016-03-11 10:21:16 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
luoquan e80caf87b2 还原行距问题 2016-03-11 09:52:36 +08:00
luoquan 2d14b26c11 还原行距问题 2016-03-11 09:52:11 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
yuanke 28b481cf36 修改KE点击上传图片时选择非图片格式时的提示信息 2016-03-10 15:37:07 +08:00
yuanke 6fa2fd8b47 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-03-10 15:11:33 +08:00
yuanke 9b5cd8f880 KE表格修改 2016-03-10 11:28:56 +08:00
yuanke 5ea618b520 修改KE插入图片没显示完全的问题 2016-03-10 11:16:39 +08:00
luoquan a6da304b56 修改KE编辑换行后发布对不齐问题 2016-03-10 11:10:05 +08:00
luoquan 1c6deadfd7 修改KE编辑的内容与发布的样式对其不一致问题 2016-03-10 10:58:43 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
yuanke 0805bfce6a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke 2016-03-09 15:32:24 +08:00
yuanke 5dcd3b6826 解决KE工具栏一行与两行显示不一致的情况 2016-03-09 15:32:08 +08:00
yuanke e073d58169 KE的几个问题修改 
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
 2016-03-09 10:16:27 +08:00
cxt 1cccf79bd8 课程资源库菜单中的删除资源无法点击 2016-03-09 09:20:53 +08:00
cxt f0e3fe8ff7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-08 09:13:27 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
Tim 56372fbdd5 积分规则显示样式调整 2016-03-07 16:50:30 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
huang 596d4e17e9 解决样式冲突 2016-03-04 09:57:54 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
cxt 9b573248d8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_show_user_homework_form.html.erb
	app/views/users/_show_user_homeworks.html.erb
 2016-03-03 17:07:35 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
Tim 11592bdbcc 导入题库题目弹框样式更改 2016-03-01 17:28:49 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
cxt f6f84b564e 在线测验的选项和候选答案的正确显示 2016-03-01 15:18:38 +08:00
cxt 072300331b 编程测试集的输入输出添加序号 2016-02-29 17:05:11 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +08:00
ouyangxuhua 8784c7cec6 超链接不能正常显示的问题 2016-02-26 16:13:14 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
Tim 100b002a1f 提交改动显示页面调整 2016-02-25 15:48:49 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-24 16:08:38 +08:00
cxt e499be999f 课程英雄榜的样式修改 2016-02-24 16:05:48 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
huang ea2033eb30 Git文件识别，换行 2016-02-24 11:24:05 +08:00
cxt 347efa275d Merge branch 'develop' into cxt_course 2016-02-24 09:50:53 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
Tim 87f5f9c380 上传头像预览图片排版，课程关联组织取消按钮 2016-02-23 15:26:34 +08:00
huang 78c70dce81 版本库用户名长度引起的错位 2016-02-22 15:52:16 +08:00
ouyangxuhua 808f9a6b7a 组织页面右上角样式还原 2016-02-20 17:40:00 +08:00
Tim 228857f20c 资源历史版本样式 2016-02-20 17:23:24 +08:00
huang 59d45f2d52 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 17:18:49 +08:00
Tim 55b13e7dde 历史版本样式更改 2016-02-20 17:00:21 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:49:19 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题 2016-02-20 11:06:21 +08:00
guange ac121ce585 组织文章无法编辑问题 2016-02-18 15:26:07 +08:00
ouyangxuhua 02f8007557 修改组织配置的样式；修改一个bug 2016-02-03 12:42:42 +08:00
cxt e6d4d7d0cb 描述框的自动增高 2016-02-02 17:16:50 +08:00
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/user_import_homeworks.js.erb
	db/schema.rb
 2016-02-02 15:55:07 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-01 10:41:30 +08:00
Tim 83a3c879d4 私信配置按钮显示 2016-02-01 10:40:42 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
ouyangxuhua c857fb734b 快捷回复中，设置回复框的高度和宽度 2016-01-28 10:16:45 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
cxt a04f136e9f Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-25 15:33:59 +08:00
Tim 900b861f31 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-25 10:38:04 +08:00
Tim 035e47510f 图片更改 2016-01-25 10:37:32 +08:00
cxt f632a3d4fb 编程弹框固定位置 2016-01-22 22:17:52 +08:00
cxt 8f1bffd28b 留言不能为空 2016-01-22 21:53:32 +08:00
cxt 4b25383531 学生列表的tip被遮盖 2016-01-22 21:42:05 +08:00