linchun
|
6094c05737
|
Merge branch 'linchun' into develop
|
10 years ago |
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
linchun
|
66a7827eb2
|
组织列表增加分页功能,学校列表调整分页
|
10 years ago |
linchun
|
f8a88767c0
|
管理员用户列表增加单位信息
|
10 years ago |
linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
10 years ago |
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
10 years ago |
linchun
|
69ec475752
|
组织列表时间倒序排列
|
10 years ago |
linchun
|
7d5a5f1de2
|
完成项目资源列表中的排序(资源大小,上传时间,下载次数)
|
10 years ago |
linchun
|
3fcf192430
|
完成了课程资源列表的排序(上传时间,资源大小,下载次数)
|
10 years ago |
linchun
|
d3ed89d87e
|
sort
|
10 years ago |
linchun
|
4da8a3828f
|
用户最新列表单位完成,修改了点击最后两页报错的问题
|
10 years ago |
linchun
|
df4ad9f597
|
完成管理员界面最近登录列表单位信息
|
10 years ago |
huang
|
a1cae3f592
|
admin教师单位获取
|
10 years ago |
linchun
|
a1bef60bb5
|
Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun
|
10 years ago |
linchun
|
96f65f338c
|
用户列表添加单位
|
10 years ago |
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
10 years ago |
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
luoquan
|
006731ea61
|
修改以下问题:
KE问题:编辑时行间距挺好,发布后,在项目讨论区中的显示行间距稍微有点挤。
KE问题:缺省的文字颜色:在编辑时是黑色,但发布后就是灰色。应该发布后也是黑色。
|
10 years ago |
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
10 years ago |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
10 years ago |
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
10 years ago |
cxt
|
a845da5c17
|
点赞有延迟
|
10 years ago |
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
10 years ago |
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
10 years ago |
huang
|
97a7694778
|
访问统计数--views
|
10 years ago |
Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
Tim
|
051c9dfd0c
|
Merge branch 'cxt_course' into develop
|
10 years ago |
huang
|
8079254089
|
首页增加访问统计
|
10 years ago |
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
Tim
|
de3a4718ab
|
个人,课程,项目,组织访问量添加
|
10 years ago |
huang
|
c18634be86
|
课程通知。新闻代码优化
|
10 years ago |
luoquan
|
4fa25f68b6
|
Merge branch 'luoquan' into yuanke
|
10 years ago |
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
luoquan
|
1900a824e8
|
0
|
10 years ago |
luoquan
|
1e256add7f
|
媒体播放默认样式
|
10 years ago |
luoquan
|
033c7991e1
|
修改媒体播放
|
10 years ago |
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
10 years ago |
luoquan
|
ec4b7e3744
|
视频默认图标
|
10 years ago |
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
10 years ago |
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
10 years ago |
cxt
|
2812fcd2fb
|
删除无用代码
|
10 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
|
10 years ago |
luoquan
|
62f91865e0
|
kindeditor视频添加默认图片
|
10 years ago |
luoquan
|
7d70e63f8d
|
代码重置
|
10 years ago |