 Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
9 years ago |
 huang
|
4e3a7e8df1
|
新建版本“日期”--》“截止日止”
|
9 years ago |
|
huang
|
77e4a66e7e
|
模式切换刷新后引起的样式问题
|
9 years ago |
|
huang
|
8c6fca87c9
|
项目动态中，新闻添加快捷操作，所有操作默认显示
|
9 years ago |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
9 years ago |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
9 years ago |
 yuanke
|
5ecb99196e
|
修改新建项目时公开后面的提示语
|
9 years ago |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
9 years ago |
 cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
8b87c141cc
|
bug修复
|
9 years ago |
|
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
Your Name
|
c658296e2b
|
config
|
9 years ago |
|
huang
|
09b78fc546
|
中文
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
9 years ago |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
9 years ago |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
fb1a13a522
|
隐藏版本库功能
|
9 years ago |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
9 years ago |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
9 years ago |
|
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
9 years ago |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
9 years ago |
|
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
9 years ago |
|
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 |
