 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 |
|
daiao
|
0eb6a607b2
|
项目issue中，附件名称后缀显示不全
|
2016-11-22 09:23:16 +08:00 |
 cxt
|
62ea9d12f7
|
项目简介的样式调整
|
2016-11-21 14:11:35 +08:00 |
|
cxt
|
94c4afd6de
|
样式调整
|
2016-11-18 20:11:32 +08:00 |
|
cxt
|
edca878701
|
输入框的边框不显示
|
2016-11-18 19:31:52 +08:00 |
|
daiao
|
f9a384b253
|
Merge branch 'dai_ao' into develop
|
2016-11-18 19:18:36 +08:00 |
|
daiao
|
f91722a422
|
我的issue样式调整
|
2016-11-18 17:46:51 +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
|
f754ac870d
|
导航栏题库-发送：如图发送弹框中当鼠标移至下拉条时，鼠标光标不要显示成可以左右拉动的图标
|
2016-11-15 14:18:15 +08:00 |
|
cxt
|
0ed878e718
|
404、403、500页面
|
2016-11-14 15:36:36 +08:00 |
|
cxt
|
c352fb5604
|
学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数
|
2016-11-11 17:55:25 +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 |
|
huang
|
b5f035d286
|
版本库详情页面添加目录回退功能，部分功能及界面调整
|
2016-11-08 15:21:12 +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
|
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 |
|
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
|
20f112d5ad
|
作业评分设置的调整
|
2016-11-04 09:23:23 +08:00 |
|
cxt
|
54f45f18a5
|
匿评设置的调整
|
2016-11-02 15:19:17 +08:00 |
|
huang
|
60c064d27b
|
项目样式修改
|
2016-10-31 11:33:23 +08:00 |
 yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-28 15:57:53 +08:00 |
|
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
 Tim
|
c58fb36f44
|
在线测验单选、多选、填空题显示调整
|
2016-10-27 14:31:14 +08:00 |
|
Tim
|
e035316cc7
|
里程碑，版本库table宽度限制
|
2016-10-27 10:53:01 +08:00 |
|
cxt
|
15b6aaf2a2
|
新建班级、新建课程增加tip说明
|
2016-10-25 13:21:01 +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 |
|
Tim
|
f4690f0cab
|
回复，二级回复，删除时，回复框宽度控制
|
2016-10-21 11:09:54 +08:00 |
|
huang
|
733a91d160
|
新版pull 新建功能
|
2016-10-21 10:32:38 +08:00 |
|
cxt
|
f085b79999
|
个人主页的调整
|
2016-10-20 10:50:59 +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 |
|
cxt
|
a289a2cee0
|
班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果
|
2016-10-15 15:16:21 +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 |
|
cxt
|
142e301e53
|
必答换行
|
2016-10-14 18:03:49 +08:00 |