 yuanke
|
5ecb99196e
|
修改新建项目时公开后面的提示语
|
2016-07-05 14:48:54 +08:00 |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
2016-07-01 17:52:23 +08:00 |
 cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
|
cxt
|
8b87c141cc
|
bug修复
|
2016-07-01 17:47:35 +08:00 |
|
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决
|
2016-07-01 15:49:25 +08:00 |
 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
|
2016-06-29 14:18:17 +08:00 |
Your Name
|
a08edcca8a
|
quanxian
|
2016-06-28 17:18:50 +08:00 |
|
Your Name
|
c658296e2b
|
config
|
2016-06-24 19:12:07 +08:00 |
|
huang
|
09b78fc546
|
中文
|
2016-06-24 15:13:09 +08:00 |
|
Your Name
|
06fe02890f
|
index for sonar result
|
2016-06-24 14:59:17 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 08:30:31 +08:00 |
|
huang
|
fb1a13a522
|
隐藏版本库功能
|
2016-06-02 17:05:51 +08:00 |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
2016-06-01 15:35:26 +08:00 |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
|
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
2016-05-25 16:20:01 +08:00 |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
|
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
2016-05-24 09:11:50 +08:00 |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
2016-05-18 10:57:56 +08:00 |
|
huang
|
c28c947abc
|
项目动态中添加作者
|
2016-05-10 17:07:47 +08:00 |
 txz
|
9b55d8b527
|
微信版标题显示不完整
|
2016-05-10 14:06:34 +08:00 |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
2016-05-03 17:11:30 +08:00 |
|
huang
|
42076a137d
|
项目统计添加判断
|
2016-04-21 11:19:21 +08:00 |
|
huang
|
a21200ab14
|
动态中添加分支
|
2016-04-15 15:53:29 +08:00 |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
2016-04-15 15:38:08 +08:00 |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
2016-04-15 12:24:54 +08:00 |
|
huang
|
2a00c4ddd7
|
版本库统计show权限统计
|
2016-04-14 13:39:19 +08:00 |
|
huang
|
c87611dfec
|
动态中添加版本库统计
|
2016-04-14 11:18:17 +08:00 |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
2016-04-13 20:39:20 +08:00 |
|
huang
|
57716e7efc
|
解决项目添加成员没选中而导致点击确定发消息的问题
|
2016-04-08 12:31:40 +08:00 |
|
huang
|
64f13a04cc
|
动态500问题
|
2016-03-28 17:09:42 +08:00 |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
2016-03-25 15:58:17 +08:00 |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
2016-03-24 13:57:52 +08:00 |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
2016-03-24 12:59:03 +08:00 |
 ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:37:24 +08:00 |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
2016-03-17 16:36:57 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
2016-03-17 16:02:36 +08:00 |
 alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
2016-03-17 14:13:29 +08:00 |
|
huang
|
0d1fc409d1
|
版本库提示同一高度
|
2016-03-17 13:58:55 +08:00 |
|
huang
|
ab3fc0fb2c
|
成员提供真实姓名
|
2016-03-17 13:02:32 +08:00 |
|
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
|
2016-03-15 13:40:33 +08:00 |