 huang
|
6f9d4eccbe
|
解决合并引起的问题
|
2016-02-20 17:17:12 +08:00 |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
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:58:20 +08:00 |
|
huang
|
75214f0211
|
新课导语修改：导语的时候显示trustie信息
|
2016-02-20 16:45:45 +08:00 |
|
huang
|
534d93de77
|
弹框位置调整
|
2016-02-20 10:59:49 +08:00 |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
2016-02-20 09:45:37 +08:00 |
|
huang
|
1c4e3545c7
|
资源弹框剧中
|
2016-02-19 14:16:26 +08:00 |
|
huang
|
db1bffd7db
|
资源弹空白框问题
|
2016-02-19 13:23:32 +08:00 |
 guange
|
10eeeaa95c
|
弹出框居中
|
2016-02-03 23:30:07 +08:00 |
 cxt
|
8b5896ae1c
|
弹框的拖动
|
2016-02-03 13:32:05 +08:00 |
|
cxt
|
0a0d67642a
|
导入作业
|
2016-02-03 12:17:45 +08:00 |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-02 15:57:23 +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 |
 ouyangxuhua
|
0b5aa4b81e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-02 15:53:14 +08:00 |
|
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
2016-02-02 15:51:18 +08:00 |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
2016-02-02 15:50:28 +08:00 |
|
cxt
|
ea8e73ad54
|
弹框的拖拽
|
2016-02-02 15:47:12 +08:00 |
 Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
2016-02-02 15:23:23 +08:00 |
|
Tim
|
619144224e
|
文本框格式问题
|
2016-02-02 10:08:04 +08:00 |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
2016-02-01 14:50:45 +08:00 |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-01 10:41:30 +08:00 |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-01 10:14:04 +08:00 |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
|
Tim
|
55fddbcabe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 16:52:14 +08:00 |
|
Tim
|
674a8e0035
|
单词折行问题
|
2016-01-29 16:16:02 +08:00 |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
2016-01-29 15:44:26 +08:00 |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +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 |
|
cxt
|
a613b58b46
|
编程作业弹框的高度设置
|
2016-01-28 11:08:16 +08:00 |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
|
guange
|
d2c6d9272c
|
输出结果匹配\r问题
|
2016-01-27 11:35:27 +08:00 |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
ouyangxuhua
|
f3dcd4ed09
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-26 10:59:44 +08:00 |
|
ouyangxuhua
|
63d1d3a8e7
|
项目动态中，只要是项目成员就显示编辑issue多属性界面
|
2016-01-26 10:59:28 +08:00 |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
2016-01-26 10:35:54 +08:00 |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
2016-01-25 15:33:50 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
Tim
|
f099611d7a
|
问题跟踪样式更改
|
2016-01-25 11:25:43 +08:00 |
|
cxt
|
d386b2ff84
|
留言页面的“展开更多”
|
2016-01-22 22:37:47 +08:00 |
|
cxt
|
435f81a422
|
关联项目的更新时间
|
2016-01-22 21:47:59 +08:00 |
|
cxt
|
bbdced9bc1
|
留言页面的样式修改
|
2016-01-22 21:41:17 +08:00 |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 20:55:31 +08:00 |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
2016-01-22 20:55:18 +08:00 |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 20:54:14 +08:00 |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
2016-01-22 20:11:49 +08:00 |
|
huang
|
f2d93c0b72
|
修改issue编辑权限
|
2016-01-22 20:02:18 +08:00 |