 ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
11 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
|
11 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
11 years ago |
|
ouyangxuhua
|
dab3f0d225
|
为组织1添加子域名：team
|
11 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
11 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
11 years ago |
 cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
cxt
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
11 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
11 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
11 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
|
11 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
11 years ago |
|
ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
11 years ago |
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
guange
|
887d2f9f00
|
添加micros和nubot的链接
|
11 years ago |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
11 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
11 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
11 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
11 years ago |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
11 years ago |
 huang
|
900d7d62cb
|
邮件按天发送添加提示
|
11 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
|
11 years ago |
|
cxt
|
d2f56693b4
|
课程通知新建报404
|
11 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
11 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
11 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
11 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
11 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
11 years ago |
|
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
guange
|
b235e8de70
|
改为默认模板
|
11 years ago |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
11 years ago |
|
guange
|
57b1c0c7d8
|
at是否开启加入到配置
|
11 years ago |
|
guange
|
d703f75c98
|
merge
|
11 years ago |
 houxiang
|
5f2e6284ce
|
增加了两个template文件，大家下拉代码后将template文件复制去掉后尾的template就行
|
11 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
11 years ago |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
11 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
11 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
11 years ago |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
11 years ago |
|
huang
|
074d8f62c2
|
delete the two config files on gitlab
|
11 years ago |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
11 years ago |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
11 years ago |
|
guange
|
4f57e48b92
|
merge
|
11 years ago |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
11 years ago |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
11 years ago |
