 huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
 cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
 Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
9 years ago |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
9 years ago |
|
cxt
|
d4c1f27533
|
私有作业请求分享时，强制要求写请求分享的说明文字
|
9 years ago |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
9 years ago |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
9 years ago |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
9 years ago |
|
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
9 years ago |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
9 years ago |
 yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
9 years ago |
|
Tim
|
e8424d9b97
|
项目时间字体大小控制
|
9 years ago |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
9 years ago |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
9 years ago |
|
cxt
|
90809ea350
|
首页报500
|
9 years ago |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
54cdd57f89
|
二级回复的内容与上边框的距离调整
|
9 years ago |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
9 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
f4cb6f120c
|
名片中的取消关注和添加关注
|
9 years ago |
|
yuanke
|
9dc92fe817
|
列表优化
|
9 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
9 years ago |
|
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
9 years ago |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
9 years ago |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
407af62654
|
作业动态的分数显示
|
9 years ago |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
9 years ago |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
9 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
9 years ago |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
9 years ago |
|
cxt
|
55297a9daf
|
统一作业动态中项目的更新时间与tip中的更新时间
|
9 years ago |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
9 years ago |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
9 years ago |
|
cxt
|
2ca77d26b6
|
作业列表报500
|
9 years ago |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
9 years ago |
|
cxt
|
8f3b9ae9fe
|
动态的？
|
9 years ago |
