 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
处理冲突
|
10 years ago |
|
huang
|
8f989a962d
|
修改项目总分统计
|
10 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
10 years ago |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
10 years ago |
 cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
10 years ago |
 ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
huang
|
738acad211
|
展开、收缩
|
10 years ago |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
10 years ago |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
10 years ago |
 lizanle
|
06734d86ca
|
attachment_acts页面变量错误
|
10 years ago |
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。
|
10 years ago |
|
guange
|
8d797c5c0b
|
项目动态添加at
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
10 years ago |
|
huang
|
01b21ceda1
|
项目留言重复提交问题
|
10 years ago |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
 houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
85a219f7e9
|
项目动态\清除
|
10 years ago |
 Gan Yi.ang
|
ea47a8085a
|
修复新建版本库无响应
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
10 years ago |
|
houxiang
|
fe3fbacdbc
|
modify commit count show
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
022c656db6
|
修复项目加入组织的bug
|
10 years ago |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
10 years ago |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
10 years ago |
|
huang
|
334de6444a
|
去掉点击复制title
|
10 years ago |
|
huang
|
4608190529
|
增加点击选择历史版本记录
|
10 years ago |
|
huang
|
496aeb4456
|
添加“新版本库”
|
10 years ago |
|
huang
|
a4209bc9f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
594a1b01ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
huang
|
edf9b4a6b5
|
修改样式
|
10 years ago |
|
huang
|
e0d5c948fa
|
修改版本库提示
|
10 years ago |
|
huang
|
afd9d435c2
|
新建版本库样式
|
10 years ago |
