 cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
cxt
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
9 years ago |
 huang
|
38cc3c2010
|
发送过来的资源在项目中添加动态
|
9 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
cxt
|
ded8f48d34
|
博客的二级回复
|
9 years ago |
|
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
9 years ago |
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
9 years ago |
|
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消息不显示
|
10 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
10 years ago |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
07941233d8
|
题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的
|
10 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
10 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
10 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 |
