 cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
83617f8475
|
我的资源--》课程资源下不应出现已删除课程的资源
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
guange
|
3c295ba5a1
|
merge
|
9 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
25b5d74a42
|
课程大纲的修改
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
 yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
|
cxt
|
7e25ec1a00
|
登录报500
|
9 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
|
cxt
|
eb3694dbe6
|
消息报500
|
9 years ago |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
 huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
07941233d8
|
题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的
|
9 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
10 years ago |
|
huang
|
72ae31b7f9
|
作业导出资源代码回复
|
10 years ago |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
10 years ago |
|
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
10 years ago |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
10 years ago |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
10 years ago |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
ed2f413949
|
代码还原
|
10 years ago |
|
huang
|
909d40b4eb
|
默认显示公共资源
|
10 years ago |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
10 years ago |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
10 years ago |
|
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
10 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
10 years ago |
|
huang
|
18054dd96d
|
私有资源不能下载
|
10 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
b1e0618742
|
导入资源不能用的问题
|
10 years ago |
|
huang
|
352b40dd96
|
默认为“公共资源”
|
10 years ago |
|
huang
|
92f55e0dc1
|
公共资源库，点击底部不能发送的问题
|
10 years ago |
|
huang
|
f806dbf587
|
资源发送至组织和课程
|
10 years ago |
|
huang
|
e0370e3e32
|
私有资源中发送文件
|
10 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
10 years ago |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
10 years ago |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
10 years ago |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
10 years ago |
|
cxt
|
31d94dc052
|
发布可引用的作业至课程，作业的原作者不应收到微信消息提醒
|
10 years ago |
|
huang
|
09c462ebad
|
资源代码还原
|
10 years ago |
|
huang
|
aef178183c
|
我的资源附件不能删的问题
|
10 years ago |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
huang
|
b9e5c77b91
|
资源500问题
|
10 years ago |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
10 years ago |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
10 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
10 years ago |
|
cxt
|
8af0459519
|
首页动态中不应出现已删除的课程动态
|
10 years ago |
|
cxt
|
582c305a47
|
申请引用过的作业在课程删除后不应该在申请题库中显示
|
10 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
10 years ago |
|
yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
10 years ago |
|
cxt
|
d303a06377
|
首页列表的排序
|
10 years ago |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
10 years ago |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
10 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
|
10 years ago |
|
cxt
|
620cc83d4b
|
"从题库选用作业"暂时只提供公共作业和我的作业
|
10 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
10 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
10 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
|
10 years ago |
|
yuanke
|
9dc92fe817
|
列表优化
|
10 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
10 years ago |
|
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
10 years ago |
|
yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
10 years ago |
|
cxt
|
70910c5238
|
“我的作业”中不应出现已删除课程的作业
|
10 years ago |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
10 years ago |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
10 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
10 years ago |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
10 years ago |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
10 years ago |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
10 years ago |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
10 years ago |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
10 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
10 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
10 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
10 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
10 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
