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

4968 Commits

Author SHA1 Message Date
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 4348ae653f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:05 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
daiao b925ee312e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 16:28:02 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
huang 57d1397597 版本库界面优化（未完） 2016-10-12 10:45:14 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复 2016-10-11 14:08:44 +08:00
huang a206a471af Merge branch 'dev_newproject' into dev_newrep 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
 2016-10-11 10:58:37 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
daiao 850a88c6b0 组织帖子，回复有时不可用 2016-10-10 17:31:39 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00
yuanke 9ca685ea94 搜索课程 2016-10-09 16:10:33 +08:00
yuanke c4de8cf948 调试 2016-10-09 16:00:41 +08:00
cxt 38589641a3 删除未命名的问卷 2016-10-09 15:44:16 +08:00
huang acb6fcfc81 Merge branch 'develop' into dev_newrep 2016-10-09 15:36:49 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
yuanke 5d5306dede 搜索课程 2016-10-09 15:05:50 +08:00
cxt 3b44f05b2b 博客的详情页回复分页、博客列表的回复数未统计二级回复 2016-10-09 11:12:44 +08:00
yuanke eb3a463166 Merge branch 'develop' into weixin_guange 2016-10-09 10:36:18 +08:00
yuanke d407b5ab10 搜索中加入课程 2016-10-09 10:35:43 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
huang 45d8e64840 修改gitlab tree返回类型（lastrev） 2016-10-09 09:30:20 +08:00
cxt f0e334d33d 分组作业的迟交扣分和缺评扣分 2016-10-09 09:16:05 +08:00
daiao da630a728e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-10-09 09:02:39 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
cxt 12d70c6999 分组作业编辑时“基于项目实施”的设置不起作用 2016-10-08 18:06:09 +08:00
cxt f332f2a469 组织文章的回复作分页 2016-10-08 17:50:06 +08:00
huang 937f93e756 Merge branch 'develop' into dev_newrep 2016-10-08 16:05:47 +08:00
huang 54b66b86dc 0 2016-10-08 15:58:05 +08:00
huang b7b94fb050 版本库控制器代码优化一 2016-10-08 14:57:55 +08:00
cxt 6ef45a094f Merge branch 'cxt_course' into develop 2016-10-08 14:24:47 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
huang 137d62ae5d Merge branch 'rep_quality' into dev_newrep 2016-10-08 11:14:36 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
cxt 3b8dded2bc 新建课程的教师团队为空 2016-10-08 10:21:33 +08:00
huang 0906da5132 版本库代码简化 2016-10-08 10:10:59 +08:00
cxt ceb0913568 学生列表报500 2016-09-30 18:35:08 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
cxt 23f1c3175c 学生列表的导出 2016-09-30 17:04:19 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt b25e4ed5d7 新闻、通知的回复分页 2016-09-30 16:09:10 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt a9a53caa13 学生提交作品后，跳转至“作品列表”，而不是“作业信息” 2016-09-30 10:29:42 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
daiao fdca4ea968 项目与班级资源库导入资源重名时导入异常 2016-09-28 16:52:02 +08:00
huang 25b2602d3e 版本库路径唯一 2016-09-28 16:51:25 +08:00
huang bd383f5010 项目历史版本库提示删除一级setting中控制权限判断 2016-09-28 16:04:53 +08:00
huang 6ece9c0463 性能优化 2016-09-28 10:40:56 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
huang b96ab3676c issue过滤条件 2016-09-27 18:01:26 +08:00
yuanke 89d91f69c2 Merge branch 'weixin_guange' into develop 2016-09-27 16:20:07 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
huang 528aeaff89 Merge branch 'rep_quality' into develop 2016-09-26 22:20:08 +08:00
huang 5531a236fa 统计数字实时刷新 2016-09-26 21:02:12 +08:00
daiao bfa1f32214 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-26 16:22:24 +08:00
daiao 0ec1ecc2bf issue功能优化 2016-09-26 16:22:14 +08:00
huang 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
cxt 4db59ea0d3 我的题库 切换两次后作业丢失链接 2016-09-26 15:07:25 +08:00
yuanke 2ac827c66f 修改代码测试出错时的日志打印 2016-09-26 09:44:47 +08:00
cxt e1ce5d2305 教师团队的删除判断、“增加教师”链接跳转时展开添加成员 2016-09-23 18:34:03 +08:00
huang 6d419efaec issue列表修改 2016-09-23 17:47:53 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00
huang 56ac8b61c9 issue列表过滤条件 2016-09-23 14:51:44 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
huang f8fd3d79a0 issue列表 新查询的导出excel功能 2016-09-22 17:40:58 +08:00
huang de0f49f850 ISSUE列表添加新的分页 2016-09-22 14:38:45 +08:00
daiao c37c880eb2 里程碑加入导出excel功能 2016-09-22 08:40:41 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
daiao 673b68f2a2 修复：在公共贴吧，新建贴吧总提示“提拔名称已存在”的问题 2016-09-19 13:37:18 +08:00
cxt fa82860813 项目讨论区动态的过滤 2016-09-18 17:01:08 +08:00
huang 924db06cbf 项目版本库隐藏代码统计 2016-09-18 15:55:22 +08:00
huang ec8053b248 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-18 15:44:43 +08:00
huang 5b938aa11b 课程项目讨论区非成员现在资源权限 2016-09-18 15:44:27 +08:00
daiao 4504308403 修复管理员界面，项目列表的搜索功能 2016-09-18 15:16:31 +08:00
cxt 19721e20c5 Merge branch 'cxt_course' into develop 2016-09-18 15:11:11 +08:00
cxt 6c093f68cf 班级内的成员可以将帖子、通知、资源等发送到该班级 2016-09-18 11:18:02 +08:00
cxt b468134e3e Merge branch 'cxt_course' into develop 2016-09-14 21:19:01 +08:00
cxt abdc08c7af 提交作品时左侧导航栏对应班级的导航栏 2016-09-14 20:58:15 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
yuanke c7be9cadf1 Merge branch 'weixin_guange' into develop 2016-09-14 19:38:19 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
huang 9f5e257890 作品列表搜索问题 2016-09-14 17:36:20 +08:00
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
yuanke 154b77a3a7 微信班级名改为课程名。班级名 2016-09-14 15:10:24 +08:00
huang a309bf4f73 课程首页show方法优化 2016-09-14 11:31:48 +08:00
yuanke cb6a3e7161 微信公众号留言回复修改 2016-09-14 10:26:18 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
huang 64f9ed3e42 Merge branch 'rep_quality' into develop 2016-09-13 15:20:02 +08:00