 huang
|
21244a5657
|
资源库导入功能
|
2016-03-02 17:46:10 +08:00 |
|
huang
|
8edaa9d2bd
|
资源库
|
2016-03-01 17:33:44 +08:00 |
 cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 16:26:51 +08:00 |
 ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-26 16:18:17 +08:00 |
|
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
2016-02-26 16:13:14 +08:00 |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-26 14:57:41 +08:00 |
 Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
2016-02-25 15:48:49 +08:00 |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
2016-02-25 11:06:10 +08:00 |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
2016-02-25 10:23:38 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
2016-02-24 16:05:48 +08:00 |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
2016-02-24 15:47:30 +08:00 |
|
huang
|
ea2033eb30
|
Git文件识别，换行
|
2016-02-24 11:24:05 +08:00 |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
2016-02-24 09:50:53 +08:00 |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 16:20:07 +08:00 |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
2016-02-23 15:26:34 +08:00 |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
2016-02-22 15:52:16 +08:00 |
|
ouyangxuhua
|
808f9a6b7a
|
组织页面右上角样式还原
|
2016-02-20 17:40:00 +08:00 |
|
Tim
|
228857f20c
|
资源历史版本样式
|
2016-02-20 17:23:24 +08:00 |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-20 17:18:49 +08:00 |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
2016-02-20 17:00:21 +08:00 |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:49:19 +08:00 |
|
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度；2.组织页面右上角链接修改
|
2016-02-20 15:18:24 +08:00 |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
2016-02-20 11:06:21 +08:00 |
 guange
|
ac121ce585
|
组织文章无法编辑问题
|
2016-02-18 15:26:07 +08:00 |
|
ouyangxuhua
|
02f8007557
|
修改组织配置的样式；修改一个bug
|
2016-02-03 12:42:42 +08:00 |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
2016-02-02 17:16:50 +08:00 |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
2016-02-02 15:50:28 +08:00 |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-01 10:41:30 +08:00 |
|
Tim
|
83a3c879d4
|
私信配置按钮显示
|
2016-02-01 10:40:42 +08:00 |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
|
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
2016-01-28 16:49:25 +08:00 |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
|
ouyangxuhua
|
c857fb734b
|
快捷回复中，设置回复框的高度和宽度
|
2016-01-28 10:16:45 +08:00 |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
|
ouyangxuhua
|
89a919163c
|
一旦组织私有，就disabled掉允许游客下载选项
|
2016-01-26 15:25:25 +08:00 |
|
cxt
|
a04f136e9f
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-25 15:33:59 +08:00 |
|
Tim
|
900b861f31
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-25 10:38:04 +08:00 |
|
Tim
|
035e47510f
|
图片更改
|
2016-01-25 10:37:32 +08:00 |
|
cxt
|
f632a3d4fb
|
编程弹框固定位置
|
2016-01-22 22:17:52 +08:00 |
|
cxt
|
8f1bffd28b
|
留言不能为空
|
2016-01-22 21:53:32 +08:00 |
|
cxt
|
4b25383531
|
学生列表的tip被遮盖
|
2016-01-22 21:42:05 +08:00 |
|
cxt
|
f3a956a336
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:34:43 +08:00 |
|
cxt
|
bb67a8f77d
|
若测试集够长，点击增加测试集，此时应该自动定位到测试集输入框
|
2016-01-22 17:34:35 +08:00 |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |