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

12429 Commits

Author SHA1 Message Date
huang 5cf198c61a 课程教师、学生列表添加成员管理入口，项目成员列表入口 2016-03-03 17:59:36 +08:00
huang 8815e99db5 资源上传跳转问题 2016-03-03 17:25:52 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 22cbbc2476 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-02 18:41:46 +08:00
huang a0ef85f4da 导出样式 2016-03-02 18:41:20 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang c0077b7c9d 公共资源/我的资源JS实现 2016-03-02 16:54:07 +08:00
huang 6893b3dcab 修复分页问题 2016-03-02 14:56:25 +08:00
huang b3fea3e229 资源库代码封装 2016-03-02 11:30:19 +08:00
huang 79d162ecca Merge branch 'develop' into hjq_new_course 2016-03-01 17:34:06 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
huang 81f54e44b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-26 19:25:36 +08:00
huang a10e973c75 版本库配置默认分支 2016-02-26 19:25:12 +08:00
ouyangxuhua 6e85b38b09 1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章 2016-02-26 17:11:18 +08:00
cxt 61d9dc959c Merge branch 'szzh' into develop 2016-02-26 17:01:02 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
ouyangxuhua 1951d50bf7 组织文章不显示回复框的问题 2016-02-26 16:37:13 +08:00
cxt 0b6521c921 禁用匿评的作业动态仍然显示缺评扣分 2016-02-26 16:37:02 +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
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +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 555a9131c4 Gitlab端获取默认分支 2016-02-26 15:37:59 +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
newuser 43825fab31 Merge branch 'szzh' into develop 2016-02-26 14:57:14 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
newuser 2fb26c3ac4 Merge branch 'hjq_new_course' into szzh 2016-02-26 14:54:56 +08:00
cxt d409b14916 Merge branch 'cxt_course' into szzh 2016-02-26 14:51:59 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知 2016-02-25 16:22:42 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
Tim 100b002a1f 提交改动显示页面调整 2016-02-25 15:48:49 +08:00
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course 2016-02-25 11:19:20 +08:00
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/helpers/users_helper.rb
	app/views/users/_project_issue_detail.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
	db/schema.rb
 2016-02-25 11:17:54 +08:00
huang 8b839caa48 添加样式 2016-02-25 11:12:24 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt 5d5fcda475 Merge branch 'develop' into cxt_course 2016-02-25 10:24:33 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 758b044986 Merge branch 'szzh' into develop 2016-02-25 09:36:08 +08:00
cxt 95170b0b2b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-25 09:35:45 +08:00
cxt e5f899987b Merge branch 'develop' into szzh 2016-02-25 09:35:37 +08:00
guange 231df07c29 移除pry 2016-02-25 09:26:43 +08:00
ouyangxuhua a451680cf8 发送文件时，记录放在表forwards中 2016-02-24 17:09:43 +08:00
cxt e6ed988c10 Merge branch 'szzh' into develop 
Conflicts:
	db/schema.rb
 2016-02-24 17:00:08 +08:00
guange 296d6efbf1 单文件作业不压缩 2016-02-24 16:52:36 +08:00
cxt 5e330de31a 学生看到的作业个数不包含未发布的作业 2016-02-24 16:20:59 +08:00
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-24 16:08:38 +08:00