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

3944 Commits

Author SHA1 Message Date
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
cxt cfeece0c76 新建班级样式调整 2016-10-24 17:21:09 +08:00
huang d97c559e9c PULL Request部分功能 2016-10-24 14:34:54 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +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
Tim 20bba5bfe5 课程中不能删除创建班级教室title模拟 2016-10-21 15:37:26 +08:00
huang d024bb1236 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:18:52 +08:00
huang 76b2ca1d7c pull_request index页面 2016-10-21 14:18:34 +08:00
yuanke 108c28be9d Merge branch 'weixin_guange' into develop 2016-10-21 14:12:19 +08:00
yuanke 1f0e8649b9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:07:14 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
huang 1f4e8ca931 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 11:20:08 +08:00
huang ac54d02bdc pull request 列表页面 2016-10-21 11:19:56 +08:00
Tim f4690f0cab 回复，二级回复，删除时，回复框宽度控制 2016-10-21 11:09:54 +08:00
huang 733a91d160 新版pull 新建功能 2016-10-21 10:32:38 +08:00
cxt 86946f9d2c 鼠标放在自动保存“恢复”、“不恢复”上要变成手型 2016-10-21 09:20:58 +08:00
daiao 295524af5c 项目里程碑样式 2016-10-20 13:58:41 +08:00
yuanke e802629d27 Merge branch 'develop' into weixin_guange 
Conflicts:
	app/models/student_work.rb
	app/models/student_work_test.rb
	app/views/blog_comments/show.html.erb
	public/javascripts/homework.js
 2016-10-20 13:28:23 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 096bc145da 问卷样式调整 2016-10-19 20:05:21 +08:00
cxt 9c1630b682 问卷的标题显示过长 2016-10-19 19:43:35 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt 26121d895f 袁可 编程测试 2016-10-19 18:09:29 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
daiao b16a9d8ab6 项目配置样式调整 2016-10-19 17:45:24 +08:00
huang 2c795cf08c 项目样式 2016-10-19 17:41:19 +08:00
Tim af5db3713c issue详情页面，属性页面，回复页面，二级回复页面宽度调整 2016-10-19 14:57:31 +08:00
Tim e4a6a5f58d 项目issue状态宽度调整 2016-10-19 11:17:34 +08:00
yuanke b907b626a9 代码测试结果不全分数100分的BUG修复 2016-10-19 10:27:40 +08:00
Tim a58cebdf5c 提交改动页面宽度扩展 2016-10-18 17:30:07 +08:00
Tim aa379980d7 版本库显示页面宽度扩展 2016-10-18 15:40:23 +08:00
yuanke c0e6085e74 注册时登录名改为只能字母和数字、字母开头4-15长度 2016-10-18 14:47:06 +08:00
Tim 622fa382ca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 11:30:57 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
Tim fb9e1a02df 项目动态宽度调整 2016-10-18 11:30:42 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制；更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
cxt 61bfe405f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:35:13 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
cxt a709f5c720 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:16:39 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
Tim 0c481de79d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 13:41:45 +08:00
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +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 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
cxt d5eea455e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:53 +08:00
Tim ef9e9aca04 弹框居中显示 2016-10-14 19:35:53 +08:00
cxt 5870c3eaaf 子栏目讨论区列表的排序、作品内容的样式调整 2016-10-14 18:24:54 +08:00
cxt 142e301e53 必答换行 2016-10-14 18:03:49 +08:00
cxt e59f3f887a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:44:42 +08:00
cxt d247109819 编程作业提示信息 2016-10-14 16:44:37 +08:00
Tim 75a68e9844 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:34:09 +08:00
Tim a302dcca04 匿评分数tip 2016-10-14 16:33:56 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
cxt 38d43cfb67 必答不应换行 2016-10-14 16:11:46 +08:00
cxt 45008d9868 班级问卷：鼠标点击描述框，光标却自动定位到第二行了 2016-10-14 15:55:47 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
Tim 2735aca331 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-14 14:51:09 +08:00
Tim 86de58f793 问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整 2016-10-14 14:50:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +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
cxt 252da9c3d3 Merge branch 'cs_optimize_txz' into develop 2016-10-13 14:24:01 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
huang e2ee75d8c1 项目宽版架构优化（主要是model及与课程等模块的分离） 2016-10-13 10:52:48 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
Tim 0773c12cde 暂时保留project.css中共用的班级主页css 2016-10-13 10:12:40 +08:00
Tim 746e27903e 版本显示与提交变更页面宽度调整 2016-10-13 09:49:34 +08:00
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 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
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
Tim c693afdee8 project.css去重，提取到public.css 2016-10-11 17:26:36 +08:00
Tim 005cd09d4a 大纲中按钮样式移到common.css中；project.css中部分样式去重；翻页去掉灰色边线；大纲项目公用样式提取到public.css中 2016-10-11 14:58:50 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +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
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
Tim 7d3847656b 分班名称过长折行显示问题；分班编辑按钮定位；分班icon css 2016-09-30 17:01:55 +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 4da5144cd5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-29 11:29:49 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
huang 6f8957ee99 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 17:02:31 +08:00
huang f9fcc5d961 修改项目顶头空白太多的问题 2016-09-28 17:02:17 +08:00
Tim daa887fe0a issue列表样式调整 2016-09-28 16:56:46 +08:00
Tim 3f559a04bb issue列表边框颜色更改；issue题目宽度增长；回复数和编辑删除位置调整及显隐js实现 2016-09-28 15:20:42 +08:00
Tim 69a9171430 分班列表样式调整；作业动态翻页居中 2016-09-28 10:47:58 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
daiao 8fb440c593 项目issue功能修改 2016-09-27 17:01:04 +08:00
yuanke 89d91f69c2 Merge branch 'weixin_guange' into develop 2016-09-27 16:20:07 +08:00
Tim edd03d05d0 日历中issue号与完成度超出边框问题修复 2016-09-27 14:03:26 +08:00
Tim 86835fc916 全局设置input框聚焦后边框不显示css删除 2016-09-27 09:58:04 +08:00
yuanke 1620a13565 修改图片放大js的一个BUG 2016-09-27 09:13:46 +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
daiao 0ec1ecc2bf issue功能优化 2016-09-26 16:22:14 +08:00
Tim 0e531aa529 题库标题颜色加深，common.css去重 2016-09-26 14:27:33 +08:00
yuanke 60a936bcee Merge branch 'weixin_guange' into develop 2016-09-23 17:47:40 +08:00
daiao 73089e6a6a issue开始时间与结束时间改动 2016-09-23 17:23:12 +08:00
Tim 60cce7c781 微信作业新增提交作品数，最后提交及评阅动态 2016-09-23 17:16:15 +08:00
cxt 398a6f1da7 Merge branch 'cxt_course' into develop 2016-09-23 16:50:45 +08:00
cxt 0a74660cfb Merge branch 'cs_optimize_txz' into develop 2016-09-23 16:49:04 +08:00
Tim 13f3ffec9f 侧导航调整 2016-09-23 16:47:12 +08:00
daiao 7b5fc8b323 issues列表功能 2016-09-23 14:53:36 +08:00
Tim 56a55eb911 作业动态和详情添加提交作品数及提交动态 2016-09-23 14:41:09 +08:00
Tim 86a3ce185d 个人主页侧导航宽度限制更改，提示框效果及js实现 2016-09-23 14:17:23 +08:00
daiao ca00f0b9f8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 11:31:31 +08:00
daiao 8336fb2684 项目issue功能 2016-09-23 11:31:23 +08:00
huang 751665089c 完成项目base搭建 2016-09-23 11:28:00 +08:00
daiao e16b5b2f5d issue界面功能调整 2016-09-23 09:27:34 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
daiao 1da7b79cfb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:05:37 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
yuanke 61c2f8fdd6 修改增加分班名称过长问题 2016-09-22 16:17:23 +08:00
Tim 0431d28fd1 分班管理样式调整 2016-09-22 15:35:43 +08:00
Tim 8a46d66e5c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/edit_class_group.html
	public/assets/wechat/join_classgroup.html
 2016-09-22 15:29:28 +08:00
Tim b965e270e2 分班管理页面增加课程名，课程名与班级名之间点号同时显示，图标圆形显示 2016-09-22 15:27:16 +08:00
yuanke 0716d4fa38 默认图片不显示 2016-09-22 14:29:00 +08:00
yuanke 40d98887e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 14:04:17 +08:00
yuanke a169ad087b 加入分班时选择暂无返回班级列表刷新 2016-09-22 14:03:59 +08:00
Tim 0b1a22d9aa 分班管理样式更改 2016-09-22 13:56:57 +08:00
yuanke 11132d3459 修改加入班级时选择分班后跳入页面 2016-09-22 10:49:53 +08:00
yuanke 72190a3639 去掉调试 2016-09-22 10:47:02 +08:00
yuanke eeef2e78f3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 09:56:55 +08:00
yuanke 1798b8a086 微信班级logobug修改 2016-09-22 09:56:46 +08:00
Tim ab72bf5f08 分班管理界面調整 2016-09-22 09:48:37 +08:00
Tim 25b2418730 完善资料界面问题反馈框样式更新 2016-09-21 14:33:46 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
Tim fec493b287 Merge branch 'develop' into cs_optimize_txz 2016-09-21 09:44:59 +08:00
Tim e4f6852d1b 我的作业页面，按钮字体大小统一，作品数宽度增加 2016-09-21 09:44:02 +08:00
yuanke 930acd382c 微信图片点击调试 2016-09-20 15:14:48 +08:00
yuanke 8bb1323612 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/edit_userinfo.html
 2016-09-20 14:59:40 +08:00
yuanke 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
Tim 2856cd06d5 微信图片内容点击可放大 2016-09-20 14:42:36 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 8d2636e3e6 甘特图css样式引用 2016-09-19 15:43:40 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00