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

4024 Commits

Author SHA1 Message Date
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