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

1718 Commits

Author SHA1 Message Date
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
huang 89de36ec65 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 15:24:02 +08:00
daiao e508cba951 1.游客进入班级，资源出现了两个入口 2016-09-14 15:10:26 +08:00
daiao 41ab10410f 1. PullRequest后面加入请求数目 2016-09-14 13:15:00 +08:00
huang 2222776a26 课程推荐代码简化 2016-09-14 11:02:28 +08:00
daiao 3e38b09219 修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名 2016-09-14 10:42:30 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
huang 3a6237a6e4 修复里程碑样式问题 2016-09-09 16:32:15 +08:00
cxt 5d83c66949 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-09-09 15:58:42 +08:00
huang 7899bfe985 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb
 2016-09-09 16:00:05 +08:00
Tim f6efefd38d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-09 15:50:05 +08:00
cxt 355f0580cb 作业状态的api 2016-09-09 15:28:32 +08:00
huang 4900ff5492 里程碑中添加 完成者姓名 2016-09-09 14:36:03 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
 2016-09-09 13:30:10 +08:00
cxt b3f738ee5d 与班级相关平台班级名称规范调整 2016-09-09 10:23:18 +08:00
huang c025e40905 解决正式版管理员界面选择跟踪标签500问题 2016-09-09 09:51:02 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
huang 6dbb2e4e94 Pull request数量为0的时候显示在更多中 2016-09-08 16:03:32 +08:00
cxt 1e7f3db946 分组作业：组内每个成员都复制一份组长的作业，得分相同 2016-09-06 15:07:43 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
cxt f78595bbbb 管理员界面中的学校列表支持按用户数排序 2016-09-01 17:11:39 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
huang 9ab68625df Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-31 13:50:57 +08:00
huang 4320fbf945 Merge branch 'dev_blankdatabase' into develop 2016-08-31 10:30:46 +08:00
huang 936198a8bd 隐藏非项目信息 2016-08-31 10:30:23 +08:00
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
cxt 23ff5f6449 匿评时具有多重身份的教辅打的分变成了“我的评分” 2016-08-30 15:01:41 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
daiao a3ec35c008 个人主页报500 2016-08-24 15:56:03 +08:00
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 078900088a 修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500 2016-08-24 14:41:26 +08:00
daiao 5088770214 修复：文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +08:00
huang d7177713ff 勾选游客后，游客能够下载资源 2016-08-14 11:16:43 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
cxt 4a25b6357b 我的作业报500 2016-08-11 16:12:48 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
huang a9942fd4b3 change integer to A 2016-08-11 10:48:48 +08:00
huang 98a8702ba6 记录谁合并的pull request请求 2016-08-10 16:49:48 +08:00
cxt 71326c901d 学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品” 2016-08-10 16:09:13 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang f4bda16469 fork分支PR 2016-08-04 18:30:04 +08:00
daiao 7f62de59e1 优化周二代码审查的代码 2016-08-03 17:36:04 +08:00
huang b8cccdffda 完成changes数据获取及展示 2016-08-03 15:56:07 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
huang 7658844a28 鼠标经过弹框消息提示 2016-08-02 14:53:33 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
huang 685f9d8090 项目左侧权限控制 2016-08-01 16:19:15 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
huang 450217e7c2 同意加入消息发送，及添加成员 2016-07-29 15:58:24 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang c6bc5c9cb8 Merge branch 'dev_shcool' into rep_quality 
Conflicts:
	db/schema.rb
 2016-07-28 10:19:37 +08:00
huang 7413298aad 项目邀请码申请及弹框 2016-07-28 10:18:35 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang 2c8f94c899 去掉ID转换成用户login 2016-07-26 09:02:47 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
daiao 4646d13234 1.修改资源课程名称，竟可能显示全。 
2.班级动态下，去掉“班级动态>”
 2016-07-25 18:54:44 +08:00
huang 920a599417 Merge branch 'develop' into rep_quality 2016-07-25 14:11:04 +08:00
huang 7984affe36 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-25 14:10:48 +08:00
huang be88914e39 去掉id转换用户名 2016-07-25 13:59:10 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +08:00
huang 43c6301223 id转换成用户名 2016-07-25 09:47:14 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 10:35:44 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
daiao b7cf7a2468 Merge branch 'develop' into daiao_dev 2016-07-21 09:55:47 +08:00