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

638 Commits

Author SHA1 Message Date
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
cxt d967a31ec9 课程报500 2016-03-18 16:07:34 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
cxt e167a28d49 课程推荐的作业统计 2016-03-18 14:59:34 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +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
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
cxt 2812fcd2fb 删除无用代码 2016-03-11 10:45:29 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
cxt c255325300 添加分班 2016-03-10 15:47:03 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
cxt cd1409f950 还原学生分班 2016-03-10 14:51:31 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
ouyangxuhua 713c28c0b5 个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确 2016-03-09 10:25:57 +08:00
Tim d6d8e231e6 课程推荐在ie中显示bug 2016-03-09 09:46:07 +08:00
cxt fcae91ecc1 “课程通知”改为“通知” 2016-03-07 11:27:47 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +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 5cf198c61a 课程教师、学生列表添加成员管理入口，项目成员列表入口 2016-03-03 17:59:36 +08:00
cxt 7d66c06a56 复制学期多次点击“完成”会复制多个学期 2016-02-26 17:44:46 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
Tim 87f5f9c380 上传头像预览图片排版，课程关联组织取消按钮 2016-02-23 15:26:34 +08:00
ouyangxuhua 39c913f941 解决某些页面二级回复工具栏乱码问题 2016-02-23 14:52:15 +08:00
cxt 278139104b 允许老师修改开始学期 2016-02-22 15:09:07 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-02 15:57:23 +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 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
ouyangxuhua d820977d5d Merge branch 'develop' into ouyang 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/courses/syllabus.html.erb
	app/views/messages/_org_subfield_show.html.erb
 2016-02-02 15:51:18 +08:00
Tim 105393548b 点击详情页面文本格式调整 2016-02-02 11:23:17 +08:00
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
cxt 4d048ec596 课程推荐的课程列表中，为0的不显示 2016-02-01 11:12:04 +08:00
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-01 10:14:04 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
cxt 82fb50ccd2 课程学生列表的作业积分不一致 2016-01-29 19:22:10 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
huang b3caa01540 修改课程作业链接 2016-01-22 20:45:25 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
huang faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
huang c7522067e6 修改base界面 2016-01-20 18:37:39 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
huang b6ae14a1ce 课程更多字体12 2016-01-15 12:51:50 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
ouyangxuhua 582880e54d 设置课程/项目的公开私有属性，使用局部刷新 2016-01-13 16:59:48 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
cxt eab8cc7231 复制学期的默认图片 2016-01-08 21:22:36 +08:00
cxt cc135503c2 Merge branch 'cxt_course' into szzh 2016-01-08 20:36:08 +08:00
cxt 75e2eecc37 课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通 2016-01-08 20:23:27 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
cxt f1e9718f56 隐藏复制学期的上传图片按钮 2016-01-08 18:03:17 +08:00
cxt c5a10c504e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-08 14:53:20 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
Tim 125479f671 课程复制样式调整 2016-01-08 10:49:02 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
cxt 3ddbeae100 课程的“更多”模式的文字不用粗体 2016-01-04 11:32:48 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
cxt 605ec52f8a 测验答题失败时提示网络异常 2015-12-29 16:31:19 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
guange b4016faeb6 编辑框消失 2015-12-18 10:40:12 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
ouyangxuhua acb604883d 项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。 2015-12-17 10:01:28 +08:00
cxt 44ce4fe592 多次点击留言不会重复提交 2015-12-15 17:34:08 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
huang b981f3dcea 修复项目删除403问题 
课程回复的时候不显示删除按钮
 2015-12-11 15:39:38 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang 9c472b9358 课程成员列表乱的问题 2015-12-11 11:23:02 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00