 ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:33:17 +08:00 |
 huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
|
ouyangxuhua
|
c64910d343
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
 cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
2016-03-18 14:53:43 +08:00 |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
2016-03-18 14:45:42 +08:00 |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
2016-03-18 14:44:39 +08:00 |
|
huang
|
2fe1100da6
|
去掉课程使者帖子中时间
|
2016-03-18 12:34:41 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
|
cxt
|
2466184d8a
|
编辑作业的时候，还要选择作业发布的课程不合理，影响体验
编辑作业时layout根据来源而不同
|
2016-03-17 17:34:29 +08:00 |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:37:24 +08:00 |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
2016-03-17 16:36:57 +08:00 |
|
cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:23:47 +08:00 |
|
cxt
|
368c70b14d
|
Merge branch 'cxt_course' into develop
|
2016-03-17 16:23:38 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
cxt
|
10da3e1e53
|
题库样式调整
|
2016-03-17 16:11:04 +08:00 |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
2016-03-17 16:04:06 +08:00 |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
2016-03-17 15:27:52 +08:00 |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
2016-03-17 15:12:28 +08:00 |
 alan
|
8e41b19563
|
消息列表取消tip
|
2016-03-17 15:09:08 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
2016-03-17 14:13:29 +08:00 |
|
huang
|
ee40255d7e
|
资源库bytes改成b
|
2016-03-17 14:09:13 +08:00 |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
2016-03-16 17:06:11 +08:00 |
|
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
2016-03-16 16:03:53 +08:00 |
|
alan
|
3b63071dee
|
修复《issue的展开和收起在属性表格的上面》
|
2016-03-16 15:12:50 +08:00 |
|
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
2016-03-15 17:21:12 +08:00 |
|
cxt
|
e97690e2f2
|
“导入作业”改为“从题库选用”
|
2016-03-15 16:47:57 +08:00 |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
2016-03-15 16:28:35 +08:00 |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
2016-03-15 15:42:20 +08:00 |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
2016-03-15 14:17:06 +08:00 |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
2016-03-15 11:19:03 +08:00 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-15 11:12:24 +08:00 |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
2016-03-15 09:47:58 +08:00 |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
2016-03-15 09:26:26 +08:00 |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
2016-03-14 16:33:16 +08:00 |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
2016-03-14 15:02:37 +08:00 |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
2016-03-14 14:39:58 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
2016-03-11 11:23:16 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
|
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
|
ouyangxuhua
|
eb3c0d9334
|
组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示
|
2016-03-10 17:33:22 +08:00 |
|
huang
|
627580a9ac
|
标签问题（未完）
|
2016-03-10 16:25:39 +08:00 |
 yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
2016-03-10 14:52:49 +08:00 |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
2016-03-10 12:47:10 +08:00 |
|
huang
|
3d2ba83c36
|
@消息问题修复
|
2016-03-09 17:22:16 +08:00 |
|
huang
|
5a4f422b1c
|
消息分页问题
|
2016-03-09 16:44:11 +08:00 |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-09 15:29:06 +08:00 |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
|
huang
|
b4800585e7
|
解决消息 信息500问题
|
2016-03-09 15:24:02 +08:00 |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
2016-03-08 16:44:03 +08:00 |
 Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
2016-03-08 15:50:01 +08:00 |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
2016-03-08 15:20:38 +08:00 |
|
cxt
|
ca094a13b5
|
优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接
|
2016-03-08 10:16:55 +08:00 |
|
cxt
|
64b6af6177
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-07 17:02:03 +08:00 |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-07 16:15:13 +08:00 |
|
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
2016-03-07 14:31:58 +08:00 |
|
cxt
|
e30c26aa09
|
课程报500
|
2016-03-07 13:56:28 +08:00 |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
2016-03-07 12:57:24 +08:00 |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
2016-03-07 12:19:48 +08:00 |
|
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +08:00 |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
2016-03-04 21:04:21 +08:00 |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 18:37:46 +08:00 |
|
huang
|
38fca02193
|
注释搜索
|
2016-03-04 18:36:42 +08:00 |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
2016-03-04 18:22:22 +08:00 |
|
cxt
|
3deaa492b2
|
编辑作业时作业描述被解析了
|
2016-03-04 18:11:23 +08:00 |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
|
cxt
|
fd8b40a36e
|
对于编程作业，系统评分的前几名能否也显示出来
|
2016-03-04 16:53:36 +08:00 |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
2016-03-04 16:05:58 +08:00 |
|
cxt
|
947e6ea469
|
作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。
|
2016-03-04 16:00:20 +08:00 |
|
cxt
|
d2920c64ea
|
题库作业发送到课程后增加提示
|
2016-03-04 15:12:03 +08:00 |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
2016-03-04 13:18:43 +08:00 |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
2016-03-04 11:37:14 +08:00 |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
2016-03-04 10:34:04 +08:00 |
|
huang
|
596d4e17e9
|
解决样式冲突
|
2016-03-04 09:57:54 +08:00 |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
|
huang
|
ba9b22fbe1
|
公共资源，删除、重命名
|
2016-03-03 23:56:06 +08:00 |
|
huang
|
3dacf900d5
|
修改导入公共、我的资源
|
2016-03-03 23:24:25 +08:00 |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
2016-03-03 17:59:36 +08:00 |
|
cxt
|
8e5abe997a
|
已禁用匿评的作业还显示匿评截止时间不合适
|
2016-03-03 17:39:08 +08:00 |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
2016-03-03 17:25:52 +08:00 |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
2016-03-03 17:24:07 +08:00 |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
2016-03-03 17:15:47 +08:00 |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
2016-03-03 17:07:35 +08:00 |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
2016-03-03 17:04:38 +08:00 |