 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
|
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
|
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 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
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 |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
11 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
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 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
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
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
11 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
11 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
11 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
11 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
11 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
11 years ago |
|
huang
|
738acad211
|
展开、收缩
|
11 years ago |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
11 years ago |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
11 years ago |
 lizanle
|
06734d86ca
|
attachment_acts页面变量错误
|
11 years ago |
guange
|
eb97f7dfb2
|
merge
|
11 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。
|
11 years ago |
|
guange
|
8d797c5c0b
|
项目动态添加at
|
11 years ago |
|
guange
|
d1315e35b5
|
merge
|
11 years ago |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
11 years ago |
|
huang
|
01b21ceda1
|
项目留言重复提交问题
|
11 years ago |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
11 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
11 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
11 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
11 years ago |
 houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
11 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
11 years ago |
|
huang
|
85a219f7e9
|
项目动态\清除
|
11 years ago |
 Gan Yi.ang
|
ea47a8085a
|
修复新建版本库无响应
|
11 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
11 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
11 years ago |
|
houxiang
|
fe3fbacdbc
|
modify commit count show
|
11 years ago |
