 huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
9 years ago |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
9 years ago |
 ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
9 years ago |
|
huang
|
935ddc053a
|
解决项目500问题
|
9 years ago |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
9 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
9 years ago |
|
ouyangxuhua
|
3aaa078a4b
|
组织动态添加项目动态
|
9 years ago |
|
ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
9 years ago |
|
huang
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
9 years ago |
 cxt
|
247924af26
|
动态内容显示不全
|
9 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
 Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
9 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
9 years ago |
|
cxt
|
8e9c4bab6b
|
赞增加tip
|
10 years ago |
|
cxt
|
b4521d3582
|
课程/项目首页的更多默认收起
|
10 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
|
10 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
10 years ago |
|
cxt
|
c49a290d56
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 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
|
10 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
10 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
10 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
|
10 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 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
处理冲突
|
10 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
10 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
10 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
10 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
10 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
处理冲突
|
10 years ago |
|
huang
|
8f989a962d
|
修改项目总分统计
|
10 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
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 |
