 huang
|
0a881f14e8
|
导入添加自动搜索
|
9 years ago |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
9 years ago |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
9 years ago |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
 ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
9 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
9 years ago |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
9 years ago |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
 cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
9 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
9 years ago |
|
huang
|
97a7694778
|
访问统计数--views
|
9 years ago |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
9 years ago |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
9 years ago |
|
luoquan
|
1900a824e8
|
0
|
9 years ago |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
9 years ago |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
9 years ago |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
9 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
9 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
9 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
9 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
9 years ago |
|
huang
|
08cb7b642c
|
附件上传样式
|
9 years ago |
|
huang
|
1644442d2e
|
修改附件描述样式
|
9 years ago |
|
huang
|
627580a9ac
|
标签问题（未完）
|
9 years ago |
|
cxt
|
c255325300
|
添加分班
|
9 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
9 years ago |
|
huang
|
281d31980d
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
9 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
cd1409f950
|
还原学生分班
|
9 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
9 years ago |
|
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
9 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
9 years ago |
