 yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
 huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
10 years ago |
 cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
10 years ago |
|
huang
|
c28c947abc
|
项目动态中添加作者
|
10 years ago |
 txz
|
9b55d8b527
|
微信版标题显示不完整
|
10 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
10 years ago |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
10 years ago |
|
huang
|
42076a137d
|
项目统计添加判断
|
10 years ago |
|
huang
|
a21200ab14
|
动态中添加分支
|
10 years ago |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
10 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
10 years ago |
|
huang
|
2a00c4ddd7
|
版本库统计show权限统计
|
10 years ago |
|
huang
|
c87611dfec
|
动态中添加版本库统计
|
10 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
10 years ago |
|
huang
|
57716e7efc
|
解决项目添加成员没选中而导致点击确定发消息的问题
|
10 years ago |
|
huang
|
64f13a04cc
|
动态500问题
|
10 years ago |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
10 years ago |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
10 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
 ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
10 years ago |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
10 years ago |
 alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
huang
|
0d1fc409d1
|
版本库提示同一高度
|
10 years ago |
|
huang
|
ab3fc0fb2c
|
成员提供真实姓名
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
10 years ago |
|
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确
|
10 years ago |
|
huang
|
bafa151c0d
|
0
|
10 years ago |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
10 years ago |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
10 years ago |
|
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
10 years ago |
|
huang
|
935ddc053a
|
解决项目500问题
|
10 years ago |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
10 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
10 years ago |
|
ouyangxuhua
|
3aaa078a4b
|
组织动态添加项目动态
|
10 years ago |
|
ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
10 years ago |
|
huang
|
0ba724776e
|
项目版本库左侧添加提交次数统计
|
10 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
10 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 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
|
10 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 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 |
|
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 |
