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

10342 Commits

Author SHA1 Message Date
yuanke b7cd1e8fa2 Merge branch 'cxt_course' into develop 2016-10-21 19:59:37 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
Tim ba1ef995fd 组织标题长单词显示不全bug 2016-10-21 19:38:52 +08:00
Tim ef141d82c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 19:33:18 +08:00
Tim a9a36d655e 提价作业界面长单词不折行bug 2016-10-21 19:33:08 +08:00
yuanke 992f8f5f75 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 19:14:18 +08:00
yuanke f785fe4fbd 修改路由 2016-10-21 19:14:07 +08:00
Tim f730b48eac Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-21 18:40:43 +08:00
Tim 82dcd5db00 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 18:39:06 +08:00
Tim dbadf409df 作品完整性校验描述scroll显示 2016-10-21 18:38:53 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
Tim 6b6584d764 分组作业关联项目提示 2016-10-21 17:12:05 +08:00
Tim 20bba5bfe5 课程中不能删除创建班级教室title模拟 2016-10-21 15:37:26 +08:00
Tim 912f70420a 讨论区帖子标题为长英文不折行bug修复 2016-10-21 14:56:48 +08:00
yuanke 0d885100b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:35:36 +08:00
huang 49c77312da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:23:20 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
yuanke 108c28be9d Merge branch 'weixin_guange' into develop 2016-10-21 14:12:19 +08:00
cxt f9505a24b9 题库发送的提示语不正确：应该是目标班级，而不是目标课程： 2016-10-21 08:59:16 +08:00
cxt f6e86866cb 个人主页调整 2016-10-21 08:55:17 +08:00
cxt ab0280aa30 样式调整 2016-10-20 17:19:08 +08:00
cxt 5bfb99083c 主页中间导航过长 2016-10-20 17:17:19 +08:00
cxt 7cc96b1569 样式调整 2016-10-20 16:57:19 +08:00
cxt 07458b35d9 学生列表的排序箭头方向错误 2016-10-20 16:27:41 +08:00
cxt e8d7e64f80 主页子页面链接 2016-10-20 16:18:45 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 453e91dcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 14:24:13 +08:00
huang df5458675e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 13:34:16 +08:00
cxt 59f0101a62 个人主页的链接改成登录名 2016-10-20 13:32:33 +08:00
huang 786110f711 还原 2016-10-20 13:31:05 +08:00
yuanke e802629d27 Merge branch 'develop' into weixin_guange 
Conflicts:
	app/models/student_work.rb
	app/models/student_work_test.rb
	app/views/blog_comments/show.html.erb
	public/javascripts/homework.js
 2016-10-20 13:28:23 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt dde8be3f94 主页内容自动识别链接 2016-10-19 20:13:26 +08:00
cxt 35caacf067 首页取消、添加关注不可用 2016-10-19 20:03:34 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt 800aaf8853 隐藏博客首页 2016-10-19 18:07:19 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
yuanke c0e6085e74 注册时登录名改为只能字母和数字、字母开头4-15长度 2016-10-18 14:47:06 +08:00
yuanke e999cac944 取消博客的设为首页功能 2016-10-18 10:09:25 +08:00
cxt 750a9c9d38 问卷答题报网络异常 2016-10-15 19:34:58 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制；更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00