 ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
805d785140
|
解决点击转发项目/课程帖子没有反应的问题
|
10 years ago |
 cxt
|
b991dc1edd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
guange
|
4cd4d7b6dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
e3b395960c
|
base64的+号要处理一下
|
10 years ago |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
10 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
10 years ago |
 huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
10 years ago |
|
cxt
|
82fa0f0aaf
|
公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表
|
10 years ago |
|
ouyangxuhua
|
c81f2f738a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
app/controllers/org_document_comments_controller.rb
app/views/org_document_comments/_attachment.html.erb
|
10 years ago |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
10 years ago |
 Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
10 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
10 years ago |
|
cxt
|
1a042fd822
|
组织首页的加载更多动态重复加载
|
10 years ago |
|
huang
|
4111cb53dc
|
解决fork部分项目404问题
|
10 years ago |
 houxiang
|
240a859f2d
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
21461fb583
|
修正了以前的方法调用 by 侯翔
|
10 years ago |
|
huang
|
471e5f5370
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
10 years ago |
 lizanle
|
4630576146
|
issue的创建成功不需要提示sucess
|
10 years ago |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
10 years ago |
|
cxt
|
902570173d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
714dfdc2d5
|
解决组织资源栏目点击上传资源没反应的问题
|
10 years ago |
|
cxt
|
108448cf4d
|
课程讨论区的加载更多
|
10 years ago |
|
lizanle
|
0ed7d84914
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
084844941f
|
个人单位修改。
聚焦就搜索所有的学校
|
10 years ago |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
10 years ago |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
10 years ago |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
huang
|
5259831224
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
houxiang
|
fc2eae4c62
|
add something by hx
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
10 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
guange
|
716604903b
|
修复讨论区at错误
|
10 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
cxt
|
a2ebaa0729
|
分组作业提交作品时如果关联了项目则从项目成员中添加分组成员
|
10 years ago |
|
guange
|
fc63dfcb7b
|
消息通知
|
10 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
10 years ago |
|
cxt
|
89d3d3821c
|
分组作业的导入
|
10 years ago |
|
lizanle
|
c183574a5e
|
博客回复
|
10 years ago |
|
cxt
|
fa0f9c6751
|
分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置
|
10 years ago |
|
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。
|
10 years ago |
|
lizanle
|
0a3c5f6acc
|
issues如果标题为空需要弹框报错
|
10 years ago |
|
lizanle
|
71f6a637e0
|
帖子按时间倒排
|
10 years ago |
|
lizanle
|
ffd8d55aa6
|
memo更新时间
|
10 years ago |
|
huang
|
bb23049f55
|
版本库提交次数封装
提交页面样式修改
|
10 years ago |
|
lizanle
|
a0035a4c1e
|
issue 查询
|
10 years ago |
|
lizanle
|
b13ae8f599
|
issue
|
10 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
10 years ago |
|
lizanle
|
02a9f08fe6
|
表单长度对齐
|
10 years ago |
|
ouyangxuhua
|
8d7a84285b
|
资源栏目在搜索结果中，更新相应的tag数量
|
10 years ago |
|
ouyangxuhua
|
704954583b
|
资源栏目新增Tag后，更新相应的tag数量
|
10 years ago |
|
cxt
|
097d0653ba
|
注释掉给未答题的学生0分的代码
|
10 years ago |
|
cxt
|
481b7b96eb
|
正式版报500
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
10 years ago |
|
cxt
|
fa4a2eb0dd
|
未答题的学生测验分数为0
|
10 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
10 years ago |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
d6c2b95858
|
学生测验列表的提示信息
|
10 years ago |
|
cxt
|
0215e5e38c
|
若测验已截止且学生已提交则在测验列表后面显示“已答”
|
10 years ago |
|
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
10 years ago |
|
ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗，点击取消后，关闭弹窗。
|
10 years ago |
|
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中，添加资源后跳转至资源栏目页面。
|
10 years ago |
|
guange
|
8d797c5c0b
|
项目动态添加at
|
10 years ago |
|
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
|
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
10 years ago |
|
lizanle
|
85e2eab8c3
|
发送资源
|
10 years ago |
|
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
10 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
10 years ago |
|
cxt
|
7a0828a826
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
502310425b
|
匿评成绩为空
|
10 years ago |
|
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
6b9a612594
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
0ac4821f14
|
修改密码导航栏错误
|
10 years ago |
|
cxt
|
e5192c7b1a
|
记录学生作品的提交和编辑记录
|
10 years ago |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
6c9a139450
|
编辑分组作业的作品报500
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
huang
|
b981f3dcea
|
修复项目删除403问题
课程回复的时候不显示删除按钮
|
10 years ago |
|
cxt
|
c6470bc69b
|
提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择
|
10 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
10 years ago |
|
huang
|
35c918cb40
|
Merge branch 'hjq_new_course' into develop
|
10 years ago |
|
cxt
|
ba5d72b315
|
管理员查看在线测验的权限
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
huang
|
a9510f4869
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
houxiang
|
87be2dd7fe
|
modify the repositories_controller.rb conflict
|
10 years ago |
|
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
houxiang
|
e9cfe007bb
|
modify by hx
|
10 years ago |
|
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表，增加类型一列；
2.暂时隐藏类型为“资源”的栏目的链接
|
10 years ago |
|
huang
|
74fe2607f3
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
1e652faec7
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
10 years ago |
|
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段；
2.在组织配置-》栏目，增加栏目类型。
|
10 years ago |
|
huang
|
db582fd639
|
修改不同分支之间的显示最新提交状态
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
ouyangxuhua
|
333c0e41a0
|
1.栏目增加新建帖子功能；
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
lizanle
|
6c02115f3f
|
不允许修改登录名
|
10 years ago |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
10 years ago |
|
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
|
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 |
|
huang
|
25344ef0de
|
show方法
|
10 years ago |
|
huang
|
deb0f151c4
|
单选数字转换
|
10 years ago |
|
cxt
|
c5c16e25b6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
lizanle
|
60fda5e391
|
火狐MathJax显示公式错误，还是不能不用图形字体
|
10 years ago |
|
cxt
|
265fe08b2c
|
在线测验
|
10 years ago |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
10 years ago |
|
huang
|
02db1b7e14
|
问卷添加标准答案
|
10 years ago |
|
huang
|
9cf5a92a44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
221a73309f
|
index页面删掉无效的测试
|
10 years ago |
|
cxt
|
452cf1c854
|
测验
|
10 years ago |
|
cxt
|
2c9c87c3c6
|
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
|
bb99a11c37
|
页面修改
|
10 years ago |
|
huang
|
f316f43d6d
|
修改edit界面无法找到的问题
|
10 years ago |
|
huang
|
3cdda2a60a
|
修改创建方式
|
10 years ago |
|
huang
|
9935cfea44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
99f4483a16
|
删除问卷（未完）
|
10 years ago |
|
cxt
|
b3e6bf40ff
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
10 years ago |
|
huang
|
4a0865ab76
|
添加和编辑题目
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
huang
|
651f6565be
|
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 |
|
huang
|
23ca20692f
|
问卷部分方法
|
10 years ago |
|
cxt
|
034a92bb7b
|
新建测验页面
|
10 years ago |
|
huang
|
0316bf698f
|
exercise新增、update
|
10 years ago |
|
ouyangxuhua
|
8aeae831b8
|
项目配置中添加组织后，更新组织列表，而不是隐藏
|
10 years ago |
|
ouyangxuhua
|
6f5cb8f142
|
增加组织动态的过滤功能，组织动态包括项目动态和组织的动态
|
10 years ago |
|
ouyangxuhua
|
fba461f94a
|
增加组织模块中项目讨论区的回复功能
|
10 years ago |
|
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
5400b907e6
|
学生测验列表
|
10 years ago |
|
ouyangxuhua
|
bd6a1a9d49
|
增加组织动态中的项目问题的回复框
|
10 years ago |
|
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
houxiang
|
9350841d50
|
change by hx
|
10 years ago |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
50dfe5ce8b
|
修正接口 项目owner为当前用户，同步gitlab端用户
|
10 years ago |
|
ouyangxuhua
|
f5460d1126
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
c9a7a94767
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
1e1c210939
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
38acb4230e
|
组织动态添加项目动态
|
10 years ago |
|
huang
|
f32cae9012
|
fork fileter修正
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
huang
|
ddbc9003c2
|
每个用户不能创建同名版本库
不同的用户可以创建不同版本库
更新fork接口方法
|
10 years ago |
|
ouyangxuhua
|
a5a413eda0
|
动态查询sql错误
|
10 years ago |
|
huang
|
a40e5c5b54
|
frok功能开发--权限还未完成
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
 sw
|
e6cd104ead
|
index界面以及试卷统计相关路由添加
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
022c656db6
|
修复项目加入组织的bug
|
10 years ago |
|
sw
|
70c5b27a43
|
相关路由
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
10 years ago |
|
lizanle
|
e7d53f5e16
|
课程资源上传允许多选tag
|
10 years ago |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
10 years ago |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
10 years ago |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
huang
|
2596f0a788
|
优化权限代码
|
10 years ago |
|
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
10 years ago |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
|
cxt
|
6232bbb5e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
10 years ago |
|
lizanle
|
f229d18776
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
10 years ago |
|
lizanle
|
1e33e38fe2
|
token不对的话，那就跳转到登陆页面
|
10 years ago |
|
lizanle
|
7aff7bc20b
|
回退
|
10 years ago |
|
lizanle
|
bf1333ece9
|
登陆退出偶尔报500
|
10 years ago |
|
cxt
|
5d03a27170
|
启动匿评和关闭匿评时自动刷新该动态
|
10 years ago |
|
cxt
|
c08c327f73
|
火狐浏览器下课程作业的回复无法自动刷新
|
10 years ago |
|
cxt
|
cab8c02113
|
学生提交作品后弹出作品信息的确认框
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
cxt
|
8e3b04f9e3
|
禁用匿评&&作业截止&&作品已提交 学生可查看所有作品列表
|
10 years ago |
|
cxt
|
1b988a0a7f
|
作品提交完成后弹出作品信息对话框
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
10 years ago |
|
cxt
|
c8eb0a076f
|
编辑作业时点击取消和发送按钮后的页面跳转
|
10 years ago |
|
ouyangxuhua
|
3f289dcd74
|
org开发部分（未完）
|
10 years ago |
|
huang
|
6e7950983b
|
1、数据任务迁移
2、添加commits总数统计
|
10 years ago |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
10 years ago |
|
huang
|
a4209bc9f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
7f3d44ce63
|
代码优化：gitlab和trustie分离
|
10 years ago |
|
lizanle
|
594a1b01ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
10 years ago |
|
huang
|
e5574b2f00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
36d61cd82f
|
添加历史记录迁移
|
10 years ago |
|
huang
|
4d5d012ecf
|
版本库相关界面调整
|
10 years ago |
|
ouyangxuhua
|
7980d92ff7
|
搜索课程，使结果按照开课时间、创建时间倒排
|
10 years ago |
|
huang
|
83486c745e
|
1、如果没有新增版本库，点击链接跳至配置--新增
2、已创建过gitlab项目则跳至gitlab 版本库
|
10 years ago |
|
guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
10 years ago |
|
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2b89244f52
|
修改用户url问题
解决urlhttp重复问题
|
10 years ago |
|
cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
10 years ago |
|
lizanle
|
b7a6bc3614
|
outline url
|
10 years ago |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
10 years ago |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
10 years ago |
|
lizanle
|
8531ab51ab
|
取消大纲不删除博客
|
10 years ago |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
10 years ago |
|
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
10 years ago |
|
lizanle
|
00157b4302
|
大纲设置的图标改动 ，添加删除动作
|
10 years ago |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
57f37acecc
|
提交情况统计
提交接口修改
|
10 years ago |
|
lizanle
|
0815cde772
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
10 years ago |
|
huang
|
0158fe023d
|
修改 最近一次提交记录 接口
数据同步 validate类型控制
|
10 years ago |
|
ouyangxuhua
|
f26707e381
|
增加课程成员，给该老师也发送消息；
修改增加成员或删除成员消息的内容
|
10 years ago |
|
huang
|
331461465f
|
Merge branch 'szzh' into gitlab_guange
|
10 years ago |
|
huang
|
df8d2f8dd4
|
gitlab调用commits接口
|
10 years ago |
|
lizanle
|
a747983a51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
ac82910aa5
|
大纲
|
10 years ago |
|
ouyangxuhua
|
b11aaa545a
|
老师将课程成员拉入或者移出项目时，给出相应的消息通知
|
10 years ago |
|
ouyangxuhua
|
4f64859b14
|
没有关注的人，sql报错
|
10 years ago |
|
lizanle
|
0de97fb9ef
|
如果没有关注的人，sql会报错
|
10 years ago |
|
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
cxt
|
4f8bea35f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
d851364e70
|
匿评开启前学生能看到提交的作品数
|
10 years ago |
|
lizanle
|
55e5826fef
|
回复的时候要更新activity的的更新时间
|
10 years ago |
|
lizanle
|
76ac5a49f2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
10 years ago |
|
cxt
|
86354028ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
b1284cbf55
|
个人动态和课程动态中的作业添加配置菜单
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
e13d157f7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
guange
|
9303dfd5ae
|
IE下载xls乱码问题
|
10 years ago |
|
huang
|
7970a46469
|
1、添加功能：依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
10 years ago |
|
ouyangxuhua
|
268575ceec
|
加入课程申请样式调整
|
10 years ago |
|
lizanle
|
0cad264620
|
elsif写错了
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
lizanle
|
6c5c7988dc
|
博客删除报错的问题
|
10 years ago |
|
huang
|
34a8d0890c
|
相政新界面
|
10 years ago |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
10 years ago |
|
ouyangxuhua
|
d509ef01e8
|
更新用户申请加入项目以及反馈的消息的状态
|
10 years ago |
|
lizanle
|
69bc26033e
|
防止url删减报错
url博客内容长度限制改为20000
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
586cde6f87
|
更新用户申请成为课程的老师或教辅消息的状态
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
|
lizanle
|
cf83209c58
|
原来的提交被覆盖了。
|
10 years ago |
|
huang
|
0a4fd92d8c
|
查看代码，显示在project右侧
翻滚
代码展示编辑状态（颜色区分样式）
|
10 years ago |
|
lizanle
|
b27a0f2e51
|
学校分页
|
10 years ago |
|
lizanle
|
0be91202d7
|
学校分页
|
10 years ago |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
10 years ago |
|
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
10 years ago |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
10 years ago |
|
huang
|
bd793a00fe
|
贡献者页面
|
10 years ago |
|
ouyangxuhua
|
4b8c65d12e
|
消息处理
|
10 years ago |
|
huang
|
c7204576cc
|
版本库创建人为projectowner
修改新的版本库地址
|
10 years ago |
|
huang
|
57e48d4921
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
10 years ago |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
10 years ago |
|
guange
|
d802992e96
|
merge
|
10 years ago |
|
guange
|
11d1cac40d
|
可以通过gitlab创建项目
|
10 years ago |
|
lizanle
|
75ee45b2d1
|
消息已阅！
|
10 years ago |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
10 years ago |
|
lizanle
|
0fffed55a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a817c3b81e
|
添加身份
|
10 years ago |
|
huang
|
9e7adaf5bc
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
87b4c83247
|
修改不能参与匿评消息的关联删除；
看完消息后，更新相应的字段。
|
10 years ago |
|
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
9330418668
|
学校列表div 下拉分页
|
10 years ago |
|
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1f1a8e0770
|
管理员修改学校的功能
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
10 years ago |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
10 years ago |
|
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
|
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
f189e3cde8
|
0
|
10 years ago |
|
guange
|
74fd461fac
|
.
|
10 years ago |
|
guange
|
acbd690bc6
|
添加转换页面
|
10 years ago |
