 ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
11 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
11 years ago |
|
ouyangxuhua
|
5097f19ec8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/layouts/_user_projects.html.erb
app/views/projects/set_public_or_private.js.erb
|
11 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
11 years ago |
 huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
11 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
11 years ago |
 cxt
|
894c97304c
|
冲突
|
11 years ago |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
11 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
11 years ago |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
11 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
11 years ago |
 Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
11 years ago |
|
huang
|
6daa04b413
|
登录页面提示修改
|
11 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
11 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
11 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
11 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
11 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
11 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
11 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
11 years ago |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
11 years ago |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
11 years ago |
guange
|
d935532f8d
|
课程讨论区at功能
|
11 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
11 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
11 years ago |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
11 years ago |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
11 years ago |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
11 years ago |
|
huang
|
8f989a962d
|
修改项目总分统计
|
11 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
11 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
11 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
11 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
11 years ago |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
11 years ago |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
11 years ago |
|
cxt
|
e04926f2e7
|
关联项目的提交次数
|
11 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
11 years ago |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
11 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
11 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
11 years ago |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
11 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
11 years ago |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
11 years ago |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
11 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
11 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
11 years ago |
|
huang
|
525d1544c2
|
代码样式
|
11 years ago |
