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

562 Commits

Author SHA1 Message Date
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
huang b408b6ef97 组织历史版本删除功能 2016-10-14 14:46:48 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
huang dcbeea6dff 版本库可见权限优化 2016-10-14 09:01:25 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
cxt c1e2642a61 课程大纲上传的附件允许所有人下载 2016-10-09 09:56:36 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
cxt 1fa07b97e3 新建班级时的课程下拉列表应包含所在课程教师团队的课程 2016-10-08 14:03:37 +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
huang 98f47d8b81 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 15:11:06 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao a020ab8cd3 Issue导出excel带html标签问题 2016-09-27 14:27:32 +08:00
daiao d2d0c263d7 修改项目issue导出excel的时间输出格式及目标版本 2016-09-27 12:08:03 +08:00
huang 11c3c95c63 module中的样式 2016-09-27 09:49:03 +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 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
cxt 8ed3d6168e 主页报500 2016-09-26 09:00:42 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
daiao 984b540a63 游客身份，进入具体的班级和项目各功能入口的调整 2016-09-19 10:01:22 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
daiao 41ab10410f 1. PullRequest后面加入请求数目 2016-09-14 13:15:00 +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
cxt 355f0580cb 作业状态的api 2016-09-09 15:28:32 +08:00
huang 4900ff5492 里程碑中添加 完成者姓名 2016-09-09 14:36:03 +08:00
huang c025e40905 解决正式版管理员界面选择跟踪标签500问题 2016-09-09 09:51:02 +08:00
huang 6dbb2e4e94 Pull request数量为0的时候显示在更多中 2016-09-08 16:03:32 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +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
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +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 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
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
cxt 4a25b6357b 我的作业报500 2016-08-11 16:12:48 +08:00
cxt 71326c901d 学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品” 2016-08-10 16:09:13 +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 be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
huang 685f9d8090 项目左侧权限控制 2016-08-01 16:19:15 +08:00
huang be88914e39 去掉id转换用户名 2016-07-25 13:59:10 +08:00
huang 43c6301223 id转换成用户名 2016-07-25 09:47:14 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
huang 6357f5be2a 解决成员列表获取单位不准确的问题 2016-07-21 09:27:14 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 17:38:56 +08:00
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
cxt 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
huang 374a905d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:53:47 +08:00
cxt 0e2e1b09b5 title修改 2016-07-01 17:51:01 +08:00
txz 7178c50b1d branch's total commits 2016-07-01 15:37:39 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
huang bfa447c195 未登录状态下anonymos改为未登录 2016-06-06 15:11:07 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00