 huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
2016-01-21 16:10:29 +08:00 |
 ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
2016-01-21 15:31:36 +08:00 |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +08:00 |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
2016-01-20 17:05:28 +08:00 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
 Tim
|
a3c30ee965
|
issue上传附件样式修改
|
2016-01-19 17:31:59 +08:00 |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
2016-01-18 17:16:33 +08:00 |
 cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-18 17:12:56 +08:00 |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
2016-01-18 15:48:26 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
2016-01-18 08:55:35 +08:00 |
|
huang
|
ed26242f94
|
版本库提交次数迁移
|
2016-01-15 21:19:52 +08:00 |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
2016-01-15 10:41:34 +08:00 |
|
huang
|
157502d450
|
精品课程
|
2016-01-15 10:35:56 +08:00 |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
2016-01-14 21:25:36 +08:00 |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
2016-01-14 17:35:25 +08:00 |
|
Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
2016-01-14 16:07:06 +08:00 |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
|
Tim
|
4493261797
|
自动生成文件
|
2016-01-14 15:59:24 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
2016-01-14 15:00:21 +08:00 |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
|
huang
|
49d456bf21
|
修改数据统计信息
|
2016-01-14 14:32:19 +08:00 |
|
huang
|
a68392fd24
|
issue统计数据更新
提交次数加入新表
|
2016-01-14 13:05:33 +08:00 |
|
huang
|
e808f0bc61
|
提交新迁移
|
2016-01-14 11:37:10 +08:00 |
|
cxt
|
90acb7816f
|
数据迁移
|
2016-01-14 09:38:00 +08:00 |
|
cxt
|
f7a88a63e0
|
更新项目缺陷动态的更新时间
|
2016-01-13 18:46:28 +08:00 |
|
Tim
|
3d73a3c243
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-13 18:21:16 +08:00 |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
2016-01-13 17:26:36 +08:00 |
|
Tim
|
d495f58408
|
切换分支文件
|
2016-01-13 17:13:39 +08:00 |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
2016-01-13 16:36:34 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
2016-01-13 13:01:26 +08:00 |
|
huang
|
cf7130a398
|
0
|
2016-01-13 12:57:09 +08:00 |
|
huang
|
a0ceb9b11c
|
添加缺陷回复统计
项目版本库提交次数统计
|
2016-01-13 12:53:09 +08:00 |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
2016-01-13 09:34:33 +08:00 |
|
huang
|
a74e5f9d30
|
添加项目动态数迁移
|
2016-01-12 15:18:40 +08:00 |
|
huang
|
8758235364
|
issue创建和删除的时候，issues_count+1
|
2016-01-12 15:10:02 +08:00 |
|
huang
|
1239a8b5af
|
统计数据迁移
|
2016-01-12 10:38:50 +08:00 |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +08:00 |
|
huang
|
f3b732460c
|
添加项目统计字段
|
2016-01-11 14:57:52 +08:00 |
|
cxt
|
7c376ed60b
|
数据迁移
|
2016-01-08 19:15:47 +08:00 |
|
huang
|
580e4d7327
|
迁移问题
|
2016-01-08 18:55:17 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
2016-01-08 18:03:12 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
2016-01-08 11:01:29 +08:00 |