 cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
2016-01-29 19:22:10 +08:00 |
 ouyangxuhua
|
45bf2ef88a
|
Merge branch 'develop' into dev_hjq
|
2016-01-29 19:00:15 +08:00 |
|
ouyangxuhua
|
7b56dc7f8e
|
管理员界面，解决编辑组织报错的问题
|
2016-01-29 18:43:14 +08:00 |
|
cxt
|
e8bed9c4e1
|
Merge branch 'develop' into cxt_course
|
2016-01-29 18:20:58 +08:00 |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
2016-01-29 18:11:16 +08:00 |
|
ouyangxuhua
|
125f00689b
|
把组织未读消息加入铃铛消息提醒中
|
2016-01-29 17:49:20 +08:00 |
|
ouyangxuhua
|
68bd109831
|
对子域名申请，增加是否批准的提示
|
2016-01-29 17:26:28 +08:00 |
|
cxt
|
8358140c87
|
问题跟踪目标版本字体修改
|
2016-01-29 17:02:25 +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
|
fa70e8a714
|
代码错误
|
2016-01-29 16:51:46 +08:00 |
|
Tim
|
82e4fe1610
|
自动生成系统文件
|
2016-01-29 16:33:33 +08:00 |
|
ouyangxuhua
|
3aaa078a4b
|
组织动态添加项目动态
|
2016-01-29 16:26:00 +08:00 |
|
Tim
|
674a8e0035
|
单词折行问题
|
2016-01-29 16:16:02 +08:00 |
|
cxt
|
d58d8f6fb4
|
Merge branch 'szzh' into develop
|
2016-01-29 15:46:54 +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
|
6b40b90ba4
|
Merge branch 'cxt_course' into szzh
|
2016-01-29 15:43:22 +08:00 |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +08:00 |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
2016-01-29 11:02:57 +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 |
|
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
|
4b95ee95c0
|
组织帖子栏目讨论区中的帖子，在登陆情况下就能发送；在组织栏目中，对帖子栏目讨论区增加编辑、删除、发送选项。
|
2016-01-27 16:12:34 +08:00 |
|
ouyangxuhua
|
38a87a04ba
|
1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag，增加“双击可编辑”的tips
|
2016-01-27 15:50:31 +08:00 |
|
ouyangxuhua
|
85c2d69800
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
Conflicts:
app/views/issues/show.html.erb
|
2016-01-27 15:34:45 +08:00 |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
2016-01-27 15:29:15 +08:00 |
 guange
|
d2c6d9272c
|
输出结果匹配\r问题
|
2016-01-27 11:35:27 +08:00 |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
cxt
|
af7ca36c92
|
学生加入课程或退出课程
|
2016-01-26 15:59:39 +08:00 |
|
ouyangxuhua
|
89a919163c
|
一旦组织私有，就disabled掉允许游客下载选项
|
2016-01-26 15:25:25 +08:00 |
|
Tim
|
76063b0911
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_project_info.html.erb
|
2016-01-26 15:08:38 +08:00 |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
2016-01-26 15:05:45 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
Tim
|
821ade7985
|
作业列表优化，课程加入退出
|
2016-01-26 11:00:24 +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
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
2016-01-25 16:50:34 +08:00 |
|
Tim
|
6a83a9b55c
|
问题跟踪样式更改
|
2016-01-25 15:43:37 +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 |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
2016-01-25 15:33:50 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
Tim
|
a2afec77e3
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
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-01-25 11:32:55 +08:00 |