 houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
10 years ago |
 huang
|
42f5b86d95
|
添加字段删除课程
|
10 years ago |
|
huang
|
7c34122ff6
|
fork的时候如果用户没有同步，则自动同步
|
10 years ago |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
 ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
 cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
10 years ago |
guange
|
71a5504017
|
去除at功能,合并
|
10 years ago |
 lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
10 years ago |
|
guange
|
1a2aff99be
|
调整显示的格式
|
10 years ago |
|
cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
10 years ago |
|
cxt
|
0472a5ed0c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
10 years ago |
|
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
10 years ago |
|
huang
|
f67386e8a0
|
组织模块丢失代码还原
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
10 years ago |
|
huang
|
b6edabed9c
|
修改角色
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
c1747ab217
|
fork重名，提交
|
10 years ago |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
10 years ago |
|
huang
|
057d9a3337
|
0
|
10 years ago |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
ouyangxuhua
|
9baeb850a3
|
在管理员界面中，添加组织的编辑和删除功能。
|
10 years ago |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
10 years ago |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
10 years ago |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
10 years ago |
|
guange
|
52a0da83c4
|
匿名用户留言问题.
|
10 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
10 years ago |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
10 years ago |
|
ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
10 years ago |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
10 years ago |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
lizanle
|
dcd441a9db
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
10 years ago |
|
cxt
|
f1bb1bb8c2
|
测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态
|
10 years ago |
|
cxt
|
6b72b4bb17
|
非课程参与人员无法查看私有课程的测验列表
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
cxt
|
c7cf34500c
|
老师若未设置测验的发布时间则提交后立即发布
|
10 years ago |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
10 years ago |
|
ouyangxuhua
|
2dc31637d8
|
项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。
|
10 years ago |
|
cxt
|
0e7cf4b122
|
学生作品页面的批次列表只显示已发布的作业
|
10 years ago |
|
cxt
|
e89cb99743
|
添加学生测验结果页面的批次链接
|
10 years ago |
|
cxt
|
ec00b86c15
|
学生多次新建作品时提醒学生不能重复提交
|
10 years ago |
|
houxiang
|
ad891aea39
|
分支合并
|
10 years ago |
|
houxiang
|
6b481c8961
|
mute the fork function by hx
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
10 years ago |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
10 years ago |
|
huang
|
39455f9f8a
|
作业重复提交问题
|
10 years ago |
|
houxiang
|
56519389d2
|
add binarysearch for commit_count by hx
|
10 years ago |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8b29002a0f
|
修改得分规则
|
10 years ago |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
10 years ago |
|
huang
|
c0dfc17b19
|
修改状态更新
|
10 years ago |
|
huang
|
da55b00da7
|
删除插入问题
|
10 years ago |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
aa36c927d3
|
0
|
10 years ago |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
10 years ago |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
10 years ago |
|
huang
|
bb726e3475
|
提交答案验证
|
10 years ago |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
10 years ago |
|
cxt
|
332ace0f34
|
列表
|
10 years ago |
|
cxt
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
10 years ago |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
10 years ago |
|
ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
10 years ago |
|
huang
|
db46e5e4af
|
问卷得分统计
|
10 years ago |
|
ouyangxuhua
|
dcbdea9bb5
|
1.修复文章详细列表删除后，页面报错的问题；
2.文章详情页面中，文章回复显示中回复人丢失问题修复
|
10 years ago |
|
huang
|
cb3f0d1c97
|
按类型分类，序号递增
|
10 years ago |
|
huang
|
07ee819370
|
学生多选答题
|
10 years ago |
|
huang
|
302dfaf933
|
新建万卷初始showresult
|
10 years ago |
|
huang
|
469e71e77d
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
13af6e64b2
|
修改允许学生查看参数
|
10 years ago |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
10 years ago |
|
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b10ff36c51
|
1.组织文章和成员访问权限控制；
2.修改编辑文章不能提交的问题。
|
10 years ago |
|
huang
|
3deebf2006
|
show
|
10 years ago |
|
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
10 years ago |
|
huang
|
08c7eb8d40
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
81e2827277
|
解决参数为空的bug
|
10 years ago |
|
cxt
|
20f7560b07
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9aee23507c
|
学生答题页面、答题结果页面、老师的试卷页面
|
10 years ago |
|
huang
|
74343a4929
|
发布问卷、取消问卷
|
10 years ago |
|
huang
|
87e7a51278
|
删除
|
10 years ago |
|
huang
|
7ab0f4764a
|
主管题插入删除更新
|
10 years ago |
|
cxt
|
27c88fda4f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/exercise/_edit_single.html.erb
|
10 years ago |
|
cxt
|
2c1b03079b
|
学生测验界面
|
10 years ago |
|
huang
|
02f6b636cd
|
完成更新功能
|
10 years ago |
|
huang
|
f3614999da
|
gi
|
10 years ago |
|
huang
|
841ebb7846
|
简单题更新，未完
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
houxiang
|
fdedcbfa81
|
增加了注释
|
10 years ago |
 Gan Yi.ang
|
f6bfd7824d
|
优化查看commits那个页面
|
10 years ago |
|
huang
|
a900c70e76
|
试题更新
|
10 years ago |
|
huang
|
bc47382115
|
用户提交答卷后，给出得分
|
10 years ago |
|
ouyangxuhua
|
478a534c96
|
1.将课程动态加入组织动态的过滤条件中；
2.创建文章成功后，给出信息提醒
|
10 years ago |
|
huang
|
2296a2f50c
|
添加学生提交作业
老师发布作业功能
|
10 years ago |
|
huang
|
8cf22767f9
|
新建问答题
|
10 years ago |
|
huang
|
8e4b2bd7d4
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
1606e9ddab
|
0
|
10 years ago |
|
cxt
|
28f7390595
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
3d3d50f1ea
|
编辑
|
10 years ago |
|
huang
|
ac95e1584c
|
问卷删除功能
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
houxiang
|
fe3fbacdbc
|
modify commit count show
|
10 years ago |
|
huang
|
cd2d947cb2
|
多项选择标准答案
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
huang
|
de17ffa605
|
区分答案大小写
|
10 years ago |
|
cxt
|
0405d4eee6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
249b15751d
|
新建多选题
|
10 years ago |
|
huang
|
7f5fa7fb6f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/helpers/exercise_helper.rb
解决冲突
|
10 years ago |
