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

1859 Commits

Author SHA1 Message Date
huang f0a713f54e 解决部分项目提交数为0的问题，版本库登录名改成中文姓名 2016-11-01 14:54:29 +08:00
huang b5b6f49d7c 项目版本库提供时间显示 2016-11-01 12:17:52 +08:00
huang a2a40558f1 项目新建添加KE及样式调整 2016-10-31 14:39:50 +08:00
huang 27cbfc712f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 16:39:32 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
cxt 4d88fe727b 问卷 2016-10-28 15:42:45 +08:00
daiao 79df11bc0c 项目Isuue列表，鼠标经过时，编辑与删除展示；配置成员中，点击编辑角色后，增加失去焦点属性。 2016-10-28 15:30:03 +08:00
yuanke abbf39848b Merge branch 'yuanke_youhua' into develop 2016-10-28 13:23:59 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
yuanke 5d3ab1bb09 优化头像地址获取代码、屏蔽头像card代码 2016-10-27 14:30:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
huang 21d34bb4d4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 14:05:24 +08:00
huang 2702b5a197 项目收藏结构修改 2016-10-25 14:05:07 +08:00
Tim d72993b76c 日历tip文字加大 2016-10-25 13:36:18 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
cxt 40a895a786 issue动态附件点击后下载更新为直接查看 2016-10-24 10:57:40 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang bdfa28e762 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 17:14:22 +08:00
huang 5ebd829dbf pull request列表及详情页面（详情未完） 2016-10-21 17:14:04 +08:00
daiao fa453090aa 项目里程碑详情页面 2016-10-21 16:16:26 +08:00
daiao 624cba3228 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:22:44 +08:00
daiao 64dd693e6f 项目里程碑详情页面 2016-10-21 14:22:14 +08:00
huang 76b2ca1d7c pull_request index页面 2016-10-21 14:18:34 +08:00
huang a3da43b793 里程碑列表 2016-10-20 18:08:24 +08:00
cxt b0d089f85c 编程作业报500 2016-10-20 17:46:33 +08:00
huang 16b6c55637 注释掉id转换成登录名 2016-10-20 13:34:02 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang fbb2bfce91 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:35:46 +08:00
huang 601de5d67f 项目base中统计数字四舍五入，数字中添加链接 2016-10-19 17:35:33 +08:00
daiao 269c061053 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:56:36 +08:00
daiao a9fa958f7f 项目配置，信息与模块样式调整 2016-10-19 16:56:25 +08:00
huang a722cb0031 超过1w的用k+ 2016-10-19 16:35:26 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
daiao f8638d173a 项目配置，成员列表功能 2016-10-15 10:48:24 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
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 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt b240f801b8 创建班级，和班级设置里面，开始学期和结束学期的范围，请往前扩大3年 2016-10-13 11:30:41 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 3c15c4f315 版本库权限，及项目收藏用户列表 2016-10-11 10:03:00 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24: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 c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +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
Tim edd03d05d0 日历中issue号与完成度超出边框问题修复 2016-09-27 14:03:26 +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 5afaeeb76d issue列表数字不准确性判断 2016-09-26 21:54:05 +08:00
guange 9620603f17 issue条件选择错误 2016-09-26 21:19:10 +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 8ed3d6168e 主页报500 2016-09-26 09:00:42 +08:00
daiao 617565bf1f 项目issue功能调整 2016-09-25 16:05:04 +08:00
daiao a8ed5ebb63 项目issue功能，增加所有人与完成度筛选条件 2016-09-25 14:35:38 +08:00
huang 222ef3c6af 添加过滤条件 2016-09-23 19:36:43 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00
huang 56ac8b61c9 issue列表过滤条件 2016-09-23 14:51:44 +08:00
huang 751665089c 完成项目base搭建 2016-09-23 11:28:00 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +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
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
daiao 984b540a63 游客身份，进入具体的班级和项目各功能入口的调整 2016-09-19 10:01:22 +08:00
huang cfc5a2457c 课程500问题 2016-09-17 11:26:29 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
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