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

4241 Commits

Author SHA1 Message Date
huang 2a5bb6dcb8 Merge branch 'guange_dev' into develop 
Conflicts:
	Gemfile
 2016-12-09 09:35:12 +08:00
cxt 92871ff925 弹框样式调整、作业截止后附件不能删除 2016-12-08 16:24:17 +08:00
cxt 9ca4001c8c 追加附件的调整 2016-12-08 15:29:51 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
huang 8ba747e195 版本库diff页面（Issue和commit关联） 2016-12-08 09:16:14 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
huang 33a4186e69 完成issue和commit关联创建。去重，及相关局部刷新 2016-12-06 17:37:07 +08:00
cxt 03b00f0af5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-06 16:17:46 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt 
Conflicts:
	db/schema.rb
 2016-12-06 14:12:40 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
cxt 88c8c4144b 编程作业新建和编辑的时候，测试输出集很长的显示不友好，调整 2016-12-05 17:18:56 +08:00
huang 66066e6899 commit导出方法及显示页面 2016-12-05 14:52:46 +08:00
cxt bd458e1aef 班级的教师列表显示样式比较旧，更换样式 2016-12-05 14:17:33 +08:00
huang 6ebaa1c90a Merge branch 'develop' into dev_newproject 2016-12-05 11:12:52 +08:00
huang 5bc4c779ea issue和commit_id关联 2016-12-05 11:07:41 +08:00
guange 6c37645c9e at功能实现 2016-12-05 09:30:39 +08:00
guange d351827ba2 at功能实现 2016-12-04 19:20:02 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
cxt adac1d3d7a 班级问卷列表样式调整 2016-12-02 14:53:20 +08:00
黄井泉 9a83b81269 Merge branch 'develop' into 'develop' 
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

See merge request !35
 2016-12-02 13:36:25 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
huang aea81f2b10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:23:55 +08:00
huang bd31af108e 提交历史现实样式整体变更 版本库中提交详情也现实样式调整 2016-12-02 11:26:15 +08:00
daiao 7e5fda197e 组织列表增加新建组织按钮，并将我的issue与issue列表的issue标题显示加长 2016-12-02 10:21:56 +08:00
huang c3745be0eb 项目版本库历史记录代码优化及界面调整 2016-12-02 10:21:48 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
daiao 7a8c937173 项目issue列表，讨论区，版本库，pullrequests，里程碑及其里程碑详情页面，数据为空时，页面调整 2016-12-01 17:29:14 +08:00
cxt 423018fa15 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-01 15:47:46 +08:00
cxt c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
huang bbc8d11f80 项目issue关联commit(未完成) 2016-12-01 14:21:40 +08:00
guange 8d16926e66 Merge remote-tracking branch 'origin/develop' into guange_dev 2016-12-01 11:01:10 +08:00
guange d6e868b294 编程作业最大输出改为1000 2016-12-01 10:59:41 +08:00
cxt a2af654a91 具体作业的标题行右侧显示内容变更 2016-11-30 15:53:51 +08:00
huang a19f6ffd38 项目文件历史记录显示内容区分历史新增和删除 
项目变更文件高亮显示
 2016-11-29 17:05:14 +08:00
cxt fced64cc96 点击子域名申请消息报404 2016-11-29 16:22:58 +08:00
yuanke b6172fc31f Merge branch 'develop' into yuanke_youhua 2016-11-25 17:45:01 +08:00
yuanke 248276d088 KE工具栏不换行 2016-11-25 17:43:52 +08:00
黄井泉 00c8673f4a Merge branch 'dai_ao' into 'develop' 
项目头部样式修改，fork数目不对



See merge request !23
 2016-11-25 17:19:15 +08:00
daiao f1b6e67e50 项目头部样式修改，fork数目错误 2016-11-25 17:10:49 +08:00
yuanke 5675c3ab67 Merge branch 'develop' into yuanke_youhua 2016-11-25 16:01:50 +08:00
yuanke b1ae697c3d 页面缩小时页面下方需要出现左右滚动条 2016-11-25 16:00:41 +08:00
huang 636721699e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 15:16:09 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 88c4a26303 Merge branch 'cxt_course' into develop 2016-11-25 14:03:01 +08:00
daiao bff5a36577 pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果 2016-11-25 11:32:45 +08:00
cxt a614b4eb93 班级的讨论区列表与通知列表、项目的讨论区列表、博客列表：显示请微调 2016-11-25 11:25:04 +08:00
daiao 599d233176 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 10:49:57 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
yuanke d28f597aed Merge branch 'develop' into yuanke_youhua 2016-11-24 10:53:41 +08:00
daiao f7db47be41 Merge branch 'dai_ao' into develop 2016-11-24 10:45:43 +08:00
daiao 5ed9d169f3 Merge branch 'develop' into dai_ao 2016-11-24 10:05:18 +08:00
huang 42dee92c60 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 17:18:42 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
yuanke 9720f84fce js的自动转换URL函数autoUrl加上个异常处理 2016-11-23 13:29:02 +08:00
daiao 0eb6a607b2 项目issue中，附件名称后缀显示不全 2016-11-22 09:23:16 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
cxt 62ea9d12f7 项目简介的样式调整 2016-11-21 14:11:35 +08:00
cxt 14e457dc6a 360浏览器的“请选择作业类型”没显示完全 2016-11-18 21:19:36 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
cxt 0338e80f34 班级左侧导航栏的“+” 2016-11-18 19:39:36 +08:00
cxt edca878701 输入框的边框不显示 2016-11-18 19:31:52 +08:00
cxt 2786495774 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:28:31 +08:00
cxt 58ee1eb745 去掉500页面的“给我留言” 2016-11-18 19:28:18 +08:00
daiao f9a384b253 Merge branch 'dai_ao' into develop 2016-11-18 19:18:36 +08:00
cxt afd90d6da3 500页面调整 2016-11-18 19:17:35 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
daiao f91722a422 我的issue样式调整 2016-11-18 17:46:51 +08:00
cxt 4da94a5bb0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 17:32:55 +08:00
huang 9b2d4b8a07 新建项目边框问题 2016-11-18 17:31:48 +08:00
cxt 6bb4e650c4 QQ反馈返回空白页、“返回上一页”不能点击时字体置灰 2016-11-18 17:21:23 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
daiao b8e59430e8 项目资源库，资源描述框宽度增加至800px 2016-11-18 09:46:28 +08:00
daiao 8f7e6004fd 我的issue居中显示 2016-11-17 17:09:07 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 3ab5ab4e4b 代码质量分析列表优化 2016-11-15 15:34:15 +08:00
cxt f754ac870d 导航栏题库-发送：如图发送弹框中当鼠标移至下拉条时，鼠标光标不要显示成可以左右拉动的图标 2016-11-15 14:18:15 +08:00
huang 1e5d3e05ad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 14:09:40 +08:00
huang 0ea9a49f86 质量分析界面调整 2016-11-15 14:09:25 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
cxt 79b6a99324 班级左侧导航栏的发布icon简化 2016-11-15 09:30:45 +08:00
daiao 5f481c2bf9 修改项目issue，所有，开启，关闭数的样式 2016-11-15 09:28:32 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
huang 8e36cd1374 attach弹框宽度 2016-11-11 19:19:26 +08:00
huang 5104340b78 Merge branch 'dev_newproject' into develop 2016-11-11 18:21:29 +08:00
cxt c352fb5604 学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数 2016-11-11 17:55:25 +08:00
daiao 1ec0100386 项目简介样式调整，并且输入网页能点击 2016-11-11 17:35:11 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
cxt 16c51e1eaa 基于项目的分组作业没有显示项目详情 2016-11-11 16:50:25 +08:00
daiao e1afe9d2d7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:36:13 +08:00
daiao 92531ce487 项目简介样式调整 2016-11-11 16:35:26 +08:00
huang 442fb8a531 添加fork成员列表 2016-11-11 16:09:43 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
cxt 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
daiao ae84afe43e 项目issue，新建和编辑issue时，上传附件时，保存按钮不可点击 2016-11-10 17:16:54 +08:00
daiao 4fc98308bc 项目简介样式问题 2016-11-10 13:34:43 +08:00
daiao c1cf633d2c 项目版本库样式调整 2016-11-09 10:01:56 +08:00
huang b5f035d286 版本库详情页面添加目录回退功能，部分功能及界面调整 2016-11-08 15:21:12 +08:00
huang 721a916a20 版本库按钮调整 2016-11-08 10:44:57 +08:00
huang cceadb02ce Merge branch 'develop' into dev_newproject 2016-11-07 17:19:47 +08:00
cxt 2bb018b0fe 导入问卷的弹框用新版样式 2016-11-07 17:12:29 +08:00
daiao e57e439210 新建，编辑issue时，上传附件尽课程展示全 2016-11-07 17:08:24 +08:00
daiao 3d2d526149 新建和编辑ISSUE，上传附件名称显示问题 2016-11-07 15:21:00 +08:00
daiao e70c66b5ac Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/views/projects/_act_issues.html.erb
 2016-11-07 13:30:15 +08:00
daiao 8b5879217d 调整新建项目issue页面 2016-11-07 13:28:50 +08:00
yuanke 44724c6905 弹框BUG修改 2016-11-04 21:07:57 +08:00
yuanke 76a62af858 Merge branch 'yuanke_youhua' into develop 2016-11-04 20:30:44 +08:00
yuanke d71ebb08b0 弹框BUG修复 2016-11-04 20:29:18 +08:00
cxt 15a88b76c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-04 19:18:53 +08:00
yuanke 9ef8f0f612 弹框BUG修改 2016-11-04 18:59:48 +08:00
cxt 94284e72a2 弹框样式调整、 
课程大纲的提示，在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框：如图当鼠标移至右上角关闭图标，图标丢失、
 2016-11-04 18:43:44 +08:00
cxt 0bbccab616 样式调整 2016-11-04 16:59:33 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
 2016-11-04 16:15:56 +08:00
cxt d762c68f7b 分组作业的页面显示和评分处理调整 2016-11-04 16:10:13 +08:00
cxt 20f112d5ad 作业评分设置的调整 2016-11-04 09:23:23 +08:00
cxt ecae600546 启动匿评、关闭匿评的提示 2016-11-02 16:46:47 +08:00
cxt 54f45f18a5 匿评设置的调整 2016-11-02 15:19:17 +08:00
huang 77e1a26e6c 修改issue搜索超出放大镜问题，以及鼠标经过就不显示放大镜的问题 2016-11-02 11:23:28 +08:00
huang f6f9464945 版本库显示调整 2016-11-02 11:19:23 +08:00
huang 368b27ef95 项目简介改成白底 2016-11-02 10:32:07 +08:00
huang 0b4caa3ebd Merge branch 'dev_newproject' into develop 2016-11-01 16:34:54 +08:00
huang 03dba25ab7 项目增加fork于某项目功能 2016-11-01 16:34:05 +08:00
huang a5193cd266 版本库显示调整，及汉字姓名 2016-11-01 15:24:02 +08:00
huang f0a713f54e 解决部分项目提交数为0的问题，版本库登录名改成中文姓名 2016-11-01 14:54:29 +08:00
huang b93946cd07 版本库时间显示调整，配置页面中选框高度一致 2016-11-01 13:45:13 +08:00
huang 2992414d62 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-31 16:40:20 +08:00
huang dda80a62d6 版本库样式 2016-10-31 16:39:49 +08:00
cxt a59981170f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-31 15:56:44 +08:00
cxt e65f9bd98b issue多级回复的调整 2016-10-31 15:56:37 +08:00
Tim b3abe74bf5 里程碑title长度问题 2016-10-31 15:40:34 +08:00
huang 5b2694359f 项目配置添加KE 2016-10-31 15:29:20 +08:00
huang dfbc2657d2 项目新建的时候加入Kindedit及标题为空样式调整 2016-10-31 15:14:52 +08:00
huang a2a40558f1 项目新建添加KE及样式调整 2016-10-31 14:39:50 +08:00
huang 60c064d27b 项目样式修改 2016-10-31 11:33:23 +08:00
huang 053e96b56c 版本库地址显示增宽 2016-10-31 11:16:59 +08:00
huang d5e2ae9407 Merge branch 'cxt_course' into develop 2016-10-28 18:42:29 +08:00
cxt 557f5d4e26 新建班级、新建课程的提示 2016-10-28 18:36:35 +08:00
huang 72f75b41d0 Merge branch 'cxt_course' into develop 2016-10-28 18:06:12 +08:00
cxt cfea5e9da4 分组作业的提示 2016-10-28 17:10:13 +08:00
huang df47c09fa4 版本库一些细节调整 2016-10-28 16:53:02 +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
huang 738d473ce1 里程碑统计数加上title及项目样式 2016-10-28 16:32:46 +08:00
huang 459c592f68 项目名称样式调整 2016-10-28 16:20:36 +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
huang 540c8ffa8e 标题过长 2016-10-28 14:43:59 +08:00
huang d2138dd872 里程碑中增加创建者、项目私有公开显示特性 2016-10-28 14:20:00 +08:00
huang 58da3924ab pull request设计效果验证修改 2016-10-28 12:28:41 +08:00
daiao 9749d11314 Issue列表，点击清楚按钮Tab页错误的问题 2016-10-28 10:46:33 +08:00
daiao 45f8b18270 Issue列表样式调整 2016-10-28 10:39:09 +08:00
huang fbfe0038ee Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 09:44:03 +08:00
daiao 3d5509593b 配置页面，里程碑页面点击名字跳错路径 2016-10-28 09:04:16 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
cxt 2bd044bea7 问卷 2016-10-27 15:38:10 +08:00
Tim ae0db01569 插入题目菜单显隐控制；多选题答题限制js 2016-10-27 15:07:46 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
Tim e035316cc7 里程碑，版本库table宽度限制 2016-10-27 10:53:01 +08:00
Tim e3fc304d35 项目动态回复栏展开更多时，回复框宽度扩展问题 2016-10-27 10:06:58 +08:00
huang 0e15ac00be 动态中链接为空问题 2016-10-27 09:27:48 +08:00
cxt 8cccaba9f3 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	public/stylesheets/css/courses.css
 2016-10-27 09:04:39 +08:00
Tim acda8ca15c 单选题增加操作栏；多选题增加选项上下限；数字随选项数实时变化js实现 2016-10-27 09:02:56 +08:00
huang 5368d6755e 没有数据可供显示提示 2016-10-26 19:11:50 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
cxt 51e422c1a6 个人留言、课程留言的主留言增加自动保存 2016-10-26 16:12:51 +08:00
huang 68ff26e3ef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:41:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
huang 7b3b49d874 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 14:55:04 +08:00
huang 95eab901a9 modified analysis quality show 2016-10-26 14:54:55 +08:00
Tim d7194d908c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 17:46:44 +08:00
Tim bb071b8e5e 代码提交带动页面宽度扩展 2016-10-25 17:46:33 +08:00
huang b93b4ca3f3 quality analisis css of list 2016-10-25 17:27:38 +08:00
daiao c6bc304c04 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 15:38:01 +08:00
daiao 9042304794 项目ISSUE编辑和新建页面 2016-10-25 15:37:49 +08:00
huang 35c8157efa 修改版本库显示代码样式，改成与编辑器显示一致 2016-10-25 15:10:23 +08:00
cxt 891c0018e5 多层回复时的展现方式调整 2016-10-25 13:56:25 +08:00
cxt 15b6aaf2a2 新建班级、新建课程增加tip说明 2016-10-25 13:21:01 +08:00
daiao b097f678a8 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 11:23:43 +08:00
daiao a0ba21b397 新版Issue编辑和新建页面 2016-10-25 11:23:02 +08:00
huang 4bb13a0d3c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 11:11:40 +08:00
huang a86ad7d99a 项目配置各种局部刷新（新建编辑提示等） 2016-10-25 11:11:25 +08:00
daiao 1652ec9195 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:28:28 +08:00
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