ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
10 years ago |
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目,增加搜索功能
|
10 years ago |
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型,可以添加文件、删除文件、显示文件等
|
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 |
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
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 |
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 |
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
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 |
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 |