 huang
|
9088d11fed
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
09c462ebad
|
资源代码还原
|
9 years ago |
 yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
e24470db4c
|
代码测试截取ERROR_MSG时只在编译错误下截取
|
9 years ago |
guange
|
5dff3556fb
|
配置出错
|
9 years ago |
|
guange
|
c96ae60d24
|
Merge branch 'guange_dev' into develop
|
9 years ago |
|
guange
|
b681e3a597
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
f217b3f510
|
去除用户名域名
|
9 years ago |
|
guange
|
8411a08ddb
|
修改错别字
|
9 years ago |
 cxt
|
baaff3f988
|
数据迁移
|
9 years ago |
|
cxt
|
c25b63a254
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
90a9472e30
|
删除空数据
|
9 years ago |
|
huang
|
0fdff7a183
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
|
huang
|
aef178183c
|
我的资源附件不能删的问题
|
9 years ago |
|
yuanke
|
6056505f96
|
复制粘贴时将图片所带链接删掉
|
9 years ago |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
9 years ago |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
9 years ago |
|
huang
|
b9e5c77b91
|
资源500问题
|
9 years ago |
|
cxt
|
695e870a26
|
作品的统计不见了
|
9 years ago |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
9 years ago |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
9 years ago |
|
huang
|
fbcae050ad
|
项目500问题
|
9 years ago |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
9 years ago |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
9 years ago |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
9 years ago |
|
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
|
huang
|
39c753fd25
|
名师列表排序
|
9 years ago |
|
cxt
|
bc39b68bb2
|
新建测验题目、问卷题目防止多次提交表单
|
9 years ago |
|
huang
|
6ccb79a210
|
教师列表颜色
|
9 years ago |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
9 years ago |
 Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
Tim
|
afbe5317cb
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
a88ab59489
|
名师榜添加右侧banner
|
9 years ago |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
9 years ago |
|
txz
|
1f95495f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
9 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
1cd74121ae
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
a67ee38ac9
|
将复制粘贴的图片 链接及class都去掉
|
9 years ago |
|
huang
|
f1c0347ee2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
