 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
|
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 |
 huang
|
cceadb02ce
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:19:47 +08:00 |
|
daiao
|
e57e439210
|
新建，编辑issue时，上传附件尽课程展示全
|
2016-11-07 17:08:24 +08:00 |
|
daiao
|
3d2d526149
|
新建和编辑ISSUE，上传附件名称显示问题
|
2016-11-07 15:21:00 +08:00 |
 yuanke
|
44724c6905
|
弹框BUG修改
|
2016-11-04 21:07:57 +08:00 |
|
yuanke
|
d71ebb08b0
|
弹框BUG修复
|
2016-11-04 20:29:18 +08:00 |
|
yuanke
|
9ef8f0f612
|
弹框BUG修改
|
2016-11-04 18:59:48 +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
|
5b2694359f
|
项目配置添加KE
|
2016-10-31 15:29:20 +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 |
|
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 |
|
huang
|
ec5645fc66
|
完成项目动态中样式别别的地方冲突问题
|
2016-10-27 14:57:12 +08:00 |
 Tim
|
e3fc304d35
|
项目动态回复栏展开更多时，回复框宽度扩展问题
|
2016-10-27 10:06:58 +08:00 |
|
cxt
|
51e422c1a6
|
个人留言、课程留言的主留言增加自动保存
|
2016-10-26 16:12:51 +08:00 |
|
daiao
|
9042304794
|
项目ISSUE编辑和新建页面
|
2016-10-25 15:37:49 +08:00 |
|
daiao
|
a0ba21b397
|
新版Issue编辑和新建页面
|
2016-10-25 11:23:02 +08:00 |
|
yuanke
|
bb5d957ec5
|
Merge branch 'cxt_course' into develop
|
2016-10-21 17:46:29 +08:00 |
|
yuanke
|
8e35158fe9
|
增加统计功能
|
2016-10-21 14:06:45 +08:00 |
|
cxt
|
86946f9d2c
|
鼠标放在自动保存“恢复”、“不恢复”上要变成手型
|
2016-10-21 09:20:58 +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
|
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 |
|
yuanke
|
b907b626a9
|
代码测试结果不全分数100分的BUG修复
|
2016-10-19 10:27:40 +08:00 |
|
yuanke
|
c0e6085e74
|
注册时登录名改为只能字母和数字、字母开头4-15长度
|
2016-10-18 14:47:06 +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
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
2016-10-15 15:34: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 |
|
cxt
|
d247109819
|
编程作业提示信息
|
2016-10-14 16:44:37 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +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
|
2126364a19
|
新版项目配置及JS
|
2016-10-12 14:13:52 +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 |
|
cxt
|
b28579a3a3
|
Merge branch 'cxt_course' into develop
|
2016-09-30 14:49:57 +08:00 |
|
cxt
|
03fac1900e
|
分班
|
2016-09-28 10:00:01 +08:00 |
|
yuanke
|
89d91f69c2
|
Merge branch 'weixin_guange' into develop
|
2016-09-27 16:20:07 +08:00 |
|
yuanke
|
1620a13565
|
修改图片放大js的一个BUG
|
2016-09-27 09:13:46 +08:00 |
|
cxt
|
398a6f1da7
|
Merge branch 'cxt_course' into develop
|
2016-09-23 16:50:45 +08:00 |