 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 |
guange
|
45c51ef8db
|
merge
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
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 |
|
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
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
|
luoquan
|
1900a824e8
|
0
|
10 years ago |
 alan
|
1f5c90185a
|
修复《顶部搜索“分析”报404错误》
|
10 years ago |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
10 years ago |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
10 years ago |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
10 years ago |
|
huang
|
47ca79c317
|
news消息已读修改
|
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
|
7d70e63f8d
|
代码重置
|
10 years ago |
|
alan
|
89438364cf
|
Merge branch 'develop' into FX-alan-message-access-slow
|
10 years ago |
|
alan
|
55983093fd
|
优化课程反馈页面
|
10 years ago |
 ouyangxuhua
|
bc5ce1fd22
|
组织下的课程帖子链接参数正确传输
|
10 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
10 years ago |
|
ouyangxuhua
|
eb3c0d9334
|
组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示
|
10 years ago |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
huang
|
5818860a4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
huang
|
08cb7b642c
|
附件上传样式
|
10 years ago |
|
huang
|
1644442d2e
|
修改附件描述样式
|
10 years ago |
|
huang
|
627580a9ac
|
标签问题（未完）
|
10 years ago |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
10 years ago |
|
cxt
|
c255325300
|
添加分班
|
10 years ago |
 yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
10 years ago |
|
huang
|
281d31980d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
10 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
cd1409f950
|
还原学生分班
|
10 years ago |
|
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写
|
10 years ago |
|
ouyangxuhua
|
680bdc3d34
|
组织下的链接改成https://www.
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
10 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
10 years ago |
|
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
10 years ago |
|
Tim
|
5d3d73a783
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
10 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
10 years ago |
|
ouyangxuhua
|
16b0bf9c80
|
更新组织栏目优先级，如果输入不合法，则不作改变
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
huang
|
3d2ba83c36
|
@消息问题修复
|
10 years ago |
|
huang
|
5a4f422b1c
|
消息分页问题
|
10 years ago |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
huang
|
b4800585e7
|
解决消息 信息500问题
|
10 years ago |
|
huang
|
84d7049add
|
fork弹出新页面，解决间接性500问题
|
10 years ago |
|
huang
|
99be187d54
|
版本库 无法预览的文件提供直接下载功能
|
10 years ago |
|
cxt
|
db1f31724a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
10 years ago |
|
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确
|
10 years ago |
|
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
10 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
10 years ago |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
10 years ago |
|
huang
|
f022950408
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
10 years ago |
|
ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
10 years ago |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
10 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2fdddc6488
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
ec4a3b321c
|
更新历史版本，下载次数，引用次数不清零
|
10 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
10 years ago |
|
cxt
|
ca094a13b5
|
优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接
|
10 years ago |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
2ee93f9f86
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
10 years ago |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
10 years ago |
|
ouyangxuhua
|
d70df6a89d
|
公开组织的资源，非成员不能看到私有资源
|
10 years ago |
|
ouyangxuhua
|
699e1f41a7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
10 years ago |
|
cxt
|
64b6af6177
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
10 years ago |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
10 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
10 years ago |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
0df34dd3ee
|
组织资源栏目，过滤条件“其他”内容
|
10 years ago |
|
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
10 years ago |
|
cxt
|
e30c26aa09
|
课程报500
|
10 years ago |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
10 years ago |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
10 years ago |
|
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
10 years ago |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
10 years ago |
|
ouyangxuhua
|
984cd76b7f
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
ouyangxuhua
|
b77b63bbf1
|
解决私有组织栏目通过url能访问的问题
|
10 years ago |
|
huang
|
d6dedf03cb
|
去掉puts注释
|
10 years ago |
|
huang
|
d30e73795d
|
积分规则
|
10 years ago |
|
huang
|
4f2937e1a2
|
英雄榜
|
10 years ago |
|
huang
|
a079a61c82
|
回复数
|
10 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
10 years ago |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
10 years ago |
|
huang
|
bafa151c0d
|
0
|
10 years ago |
|
huang
|
3f56fa3405
|
0
|
10 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
10 years ago |
|
huang
|
814e766577
|
课程过滤
|
10 years ago |
|
huang
|
e4d669251f
|
英雄榜得分
|
10 years ago |
|
huang
|
4cf80fe441
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
6ce947667d
|
课程英雄榜提示
|
10 years ago |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
10 years ago |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
38fca02193
|
注释搜索
|
10 years ago |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
10 years ago |
|
cxt
|
3deaa492b2
|
编辑作业时作业描述被解析了
|
10 years ago |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
10 years ago |
|
cxt
|
fd8b40a36e
|
对于编程作业，系统评分的前几名能否也显示出来
|
10 years ago |
|
huang
|
91b8a81b9d
|
去掉全站搜索
|
10 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
10 years ago |
|
cxt
|
947e6ea469
|
作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。
|
10 years ago |
|
cxt
|
ffac8164f1
|
管理员的课程和项目列表，按照时间倒排
|
10 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
10 years ago |
|
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
10 years ago |
|
cxt
|
d2920c64ea
|
题库作业发送到课程后增加提示
|
10 years ago |
|
huang
|
dfddb30ca3
|
附件引用
|
10 years ago |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
10 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
10 years ago |
|
huang
|
9beaa62d6d
|
课程活跃度
|
10 years ago |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
10 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
10 years ago |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
10 years ago |
|
huang
|
596d4e17e9
|
解决样式冲突
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
10 years ago |
|
huang
|
e9c9112b38
|
公共资源封装
|
10 years ago |
|
huang
|
ba9b22fbe1
|
公共资源，删除、重命名
|
10 years ago |
|
huang
|
3dacf900d5
|
修改导入公共、我的资源
|
10 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
10 years ago |
|
huang
|
fee7cc4b2c
|
课程推荐中不显示私有课程
|
10 years ago |
|
huang
|
ef57dc80d4
|
去掉项目名称
|
10 years ago |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
10 years ago |
|
cxt
|
8e5abe997a
|
已禁用匿评的作业还显示匿评截止时间不合适
|
10 years ago |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
10 years ago |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
10 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
10 years ago |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
10 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
10 years ago |
|
cxt
|
d2cf95a32d
|
最近登录老师列表的超链接指向了其他用户
|
10 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
10 years ago |
|
huang
|
22cbbc2476
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
a0ef85f4da
|
导出样式
|
10 years ago |
|
Tim
|
f51d16c538
|
资源库样式调整
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
|
Tim
|
486d791c72
|
资源名称颜色调整
|
10 years ago |
|
huang
|
c0077b7c9d
|
公共资源/我的资源JS实现
|
10 years ago |
|
huang
|
6893b3dcab
|
修复分页问题
|
10 years ago |
|
huang
|
b3fea3e229
|
资源库代码封装
|
10 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
10 years ago |
|
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
10 years ago |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
10 years ago |
|
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
10 years ago |
|
cxt
|
6ba91cb3fe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
81f54e44b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
10 years ago |
|
cxt
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
10 years ago |
|
ouyangxuhua
|
6e85b38b09
|
1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章
|
10 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
10 years ago |
|
cxt
|
0b6521c921
|
禁用匿评的作业动态仍然显示缺评扣分
|
10 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
10 years ago |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
 newuser
|
555a9131c4
|
Gitlab端获取默认分支
|
10 years ago |
|
newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
10 years ago |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
10 years ago |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
10 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
10 years ago |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
10 years ago |
|
huang
|
a6abdbacb9
|
Merge branch 'hjq_course' into hjq_new_course
|
10 years ago |
|
huang
|
635e6300a1
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/helpers/users_helper.rb
app/views/users/_project_issue_detail.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
db/schema.rb
|
10 years ago |
|
huang
|
8b839caa48
|
添加样式
|
10 years ago |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
10 years ago |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
10 years ago |
|
cxt
|
95170b0b2b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
231df07c29
|
移除pry
|
10 years ago |
|
ouyangxuhua
|
a451680cf8
|
发送文件时，记录放在表forwards中
|
10 years ago |
|
cxt
|
e6ed988c10
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
10 years ago |
|
cxt
|
5e330de31a
|
学生看到的作业个数不包含未发布的作业
|
10 years ago |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
264c6679e0
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
10 years ago |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
10 years ago |
|
cxt
|
adf9465443
|
课程英雄榜的积分只显示一位小数
|
10 years ago |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
ouyangxuhua
|
035b22d6dd
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
2a26fd4e75
|
修改组织子域名的问题
|
10 years ago |
|
ouyangxuhua
|
c83562bfd7
|
组织资源过滤：如图资源数统计应该是不同过滤条件下各资源数的统计
|
10 years ago |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
10 years ago |
|
cxt
|
3540aa1952
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
c6d203d186
|
低版本的谷歌浏览器无法修改课程密码
|
10 years ago |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
10 years ago |
|
cxt
|
070af9ad73
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e4bf35a1b8
|
个人留言的回复不能自动刷新
|
10 years ago |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
10 years ago |
|
ouyangxuhua
|
39c913f941
|
解决某些页面二级回复工具栏乱码问题
|
10 years ago |
|
ouyangxuhua
|
62193ef7ff
|
组织页面右上角的退出、登陆、注册链接，使用类似https://www.trustie.net/域名
|
10 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
9c2d8f7ab6
|
组织二级回复中，工具栏图标乱码问题修复
|
10 years ago |
|
huang
|
90208e166f
|
项目统计数小于0情况判断
|
10 years ago |
|
huang
|
44f192e5a6
|
解决资源总数为负数的问题
|
10 years ago |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
10 years ago |
|
cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
10 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
10 years ago |
|
huang
|
20b2430da9
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d7500d1cc5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
10 years ago |
|
ouyangxuhua
|
3e699ebd99
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
huang
|
2156b6db76
|
issue回复 Forge自动更新排序靠前
|
10 years ago |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
10 years ago |
|
huang
|
1234bc0aef
|
课程导语从帖子中获取
|
10 years ago |
|
cxt
|
278139104b
|
允许老师修改开始学期
|
10 years ago |
|
ouyangxuhua
|
c1a84e2ce5
|
组织页面右上角的用户链接改成https://www.trustie.net的形式
|
10 years ago |
|
cxt
|
ba66425bef
|
学生打开分组作业列表报500
|
10 years ago |
|
huang
|
efff99c05b
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
935ddc053a
|
解决项目500问题
|
10 years ago |
|
cxt
|
7305b20ab0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d84da7908d
|
学生查看问卷调查结果的提示
|
10 years ago |
|
ouyangxuhua
|
9a72f5d0d7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
5893d7fc15
|
解决问题：组织资源栏目页面，点击展开更多报500
|
10 years ago |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
6f9d4eccbe
|
解决合并引起的问题
|
10 years ago |
|
Tim
|
954e61433b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
10 years ago |
|
ouyangxuhua
|
1216f49ac2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
|
10 years ago |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
10 years ago |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
10 years ago |
|
huang
|
75214f0211
|
新课导语修改：导语的时候显示trustie信息
|
10 years ago |
|
huang
|
212b37ef84
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
10 years ago |
|
cxt
|
8138da71aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e04e80d64d
|
跨越多个学期的课程学期的显示
|
10 years ago |
|
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度；2.组织页面右上角链接修改
|
10 years ago |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
10 years ago |
|
ouyangxuhua
|
72c0173256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
10 years ago |
|
huang
|
534d93de77
|
弹框位置调整
|
10 years ago |
|
cxt
|
7f32b9fb40
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
1e13279440
|
学生查看问卷调查结果
|
10 years ago |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
10 years ago |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
10 years ago |
|
huang
|
1c4e3545c7
|
资源弹框剧中
|
10 years ago |
|
huang
|
db1bffd7db
|
资源弹空白框问题
|
10 years ago |
|
guange
|
a421e8c6fa
|
组织文章无法编辑问题
|
10 years ago |
|
guange
|
c7bfe8f20f
|
组织首页异常
|
10 years ago |
|
guange
|
2cf253a26b
|
复制课程图片出错
|
10 years ago |
|
guange
|
b2551f904b
|
组织没有显示的问题
|
10 years ago |
|
guange
|
10eeeaa95c
|
弹出框居中
|
10 years ago |
|
cxt
|
8b5896ae1c
|
弹框的拖动
|
10 years ago |
|
cxt
|
89599d8679
|
编辑组织帖子
|
10 years ago |
|
cxt
|
2cc24e2d4b
|
组织帖子的新建
|
10 years ago |
|
ouyangxuhua
|
02f8007557
|
修改组织配置的样式；修改一个bug
|
10 years ago |
|
cxt
|
0a0d67642a
|
导入作业
|
10 years ago |
|
cxt
|
cc7d75a046
|
Merge branch 'szzh' into develop
|
10 years ago |
|
guange
|
7f8f3fa152
|
被rubymine坑了，这两个文件没加进去
|
10 years ago |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
10 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
0b5aa4b81e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
10 years ago |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
10 years ago |
|
cxt
|
ea8e73ad54
|
弹框的拖拽
|
10 years ago |
|
Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
10 years ago |
|
ouyangxuhua
|
dab99eb044
|
回复框样式修改
|
10 years ago |
|
guange
|
f3a0e71cee
|
issue中回复at列表不正常
|
10 years ago |
|
guange
|
d6e248805f
|
changeset_num nil问题
|
10 years ago |
|
Tim
|
105393548b
|
点击详情页面文本格式调整
|
10 years ago |
|
Tim
|
619144224e
|
文本框格式问题
|
10 years ago |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
10 years ago |
|
cxt
|
4d048ec596
|
课程推荐的课程列表中，为0的不显示
|
10 years ago |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
Tim
|
83a3c879d4
|
私信配置按钮显示
|
10 years ago |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
10 years ago |
|
guange
|
71778ba948
|
拷贝课程图标
|
10 years ago |
|
guange
|
724ff31751
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
guange
|
eb9232a087
|
at controller 的json应该登录
|
10 years ago |
|
guange
|
63596c2ca5
|
留言应该为JournalsForMessage
|
10 years ago |
|
ouyangxuhua
|
7bdec9c182
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
