 ouyangxuhua
|
909e0e846b
|
路由配置问题
|
9 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
9 years ago |
 huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
9 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
9 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
huang
|
18bc8215e3
|
路由冲突
|
9 years ago |
guange
|
c8b52db6f9
|
merge
|
9 years ago |
|
guange
|
c298adda7c
|
子域名路由实现
|
9 years ago |
|
huang
|
71e155d83a
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
9 years ago |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
9 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
9 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
9 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
9 years ago |
 cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
9 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
9 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
9 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
9 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
9 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
10 years ago |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
10 years ago |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
dab3f0d225
|
为组织1添加子域名：team
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
|
ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
887d2f9f00
|
添加micros和nubot的链接
|
10 years ago |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
huang
|
900d7d62cb
|
邮件按天发送添加提示
|
10 years ago |
|
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 |
|
cxt
|
d2f56693b4
|
课程通知新建报404
|
10 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
10 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
|
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
b235e8de70
|
改为默认模板
|
10 years ago |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
10 years ago |
|
guange
|
57b1c0c7d8
|
at是否开启加入到配置
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
 houxiang
|
5f2e6284ce
|
增加了两个template文件，大家下拉代码后将template文件复制去掉后尾的template就行
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
10 years ago |
|
huang
|
074d8f62c2
|
delete the two config files on gitlab
|
10 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
10 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
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
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
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 |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
