 huang
|
286418b63c
|
修改课程讨论区500问题
|
2016-01-14 15:42:27 +08:00 |
|
huang
|
bcee2924bb
|
Merge branch 'szzh' into develop
|
2016-01-14 15:11:01 +08:00 |
|
huang
|
6daa04b413
|
登录页面提示修改
|
2016-01-14 15:10:06 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
huang
|
e520a3dde2
|
Merge branch 'hjq_new_course' into develop
|
2016-01-14 15:00:43 +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 |
|
ouyangxuhua
|
307d382568
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 14:38:08 +08:00 |
|
huang
|
20a657508d
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/forge_activity.rb
db/schema.rb
|
2016-01-14 14:33:42 +08:00 |
|
huang
|
49d456bf21
|
修改数据统计信息
|
2016-01-14 14:32:19 +08:00 |
|
huang
|
a68392fd24
|
issue统计数据更新
提交次数加入新表
|
2016-01-14 13:05:33 +08:00 |
|
huang
|
5fe4e9e813
|
创建项目的时候创建项目得分记录
|
2016-01-14 12:52:44 +08:00 |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
2016-01-14 12:51:01 +08:00 |
 cxt
|
c63af51001
|
项目动态数更新
|
2016-01-14 11:38:46 +08:00 |
|
huang
|
e808f0bc61
|
提交新迁移
|
2016-01-14 11:37:10 +08:00 |
|
cxt
|
27617044a1
|
课程项目报500
|
2016-01-14 10:58:11 +08:00 |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
2016-01-14 10:33:15 +08:00 |
|
huang
|
70cd068ea8
|
Merge branch 'develop' into hjq_new_course
|
2016-01-14 09:56:21 +08:00 |
|
cxt
|
90acb7816f
|
数据迁移
|
2016-01-14 09:38:00 +08:00 |
|
cxt
|
f7a88a63e0
|
更新项目缺陷动态的更新时间
|
2016-01-13 18:46:28 +08:00 |
|
cxt
|
0d2101bc30
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 18:42:37 +08:00 |
|
cxt
|
5c1ff1f6f7
|
关联项目时不显示已删除的项目
|
2016-01-13 18:42:25 +08:00 |
 Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
2016-01-13 18:33:22 +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 |
 guange
|
d935532f8d
|
课程讨论区at功能
|
2016-01-13 17:50:08 +08:00 |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
2016-01-13 17:26:36 +08:00 |
|
Tim
|
d495f58408
|
切换分支文件
|
2016-01-13 17:13:39 +08:00 |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
2016-01-13 16:59:48 +08:00 |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
2016-01-13 16:54:41 +08:00 |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 16:32:33 +08:00 |
|
huang
|
dd1ce752ab
|
Merge branch 'develop' into hjq_new_course
|
2016-01-13 16:31:10 +08:00 |
|
huang
|
98f9da9b49
|
Merge branch 'szzh' into develop
|
2016-01-13 16:29:44 +08:00 |
|
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
处理冲突
|
2016-01-13 16:28:00 +08:00 |
|
huang
|
34fde24f09
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-13 16:25:56 +08:00 |
|
huang
|
8f989a962d
|
修改项目总分统计
|
2016-01-13 16:22:25 +08:00 |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
2016-01-13 16:21:37 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
huang
|
7697dadbea
|
版本库统计次数刷新版本库的时候自动更新
|
2016-01-13 15:50:55 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +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 |
|
huang
|
5519ef78e2
|
项目新闻、项目讨论区区分project和course
|
2016-01-13 10:18:19 +08:00 |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
2016-01-13 10:08:48 +08:00 |
|
cxt
|
f320af53dc
|
Merge branch 'cxt_course' into szzh
|
2016-01-13 10:05:48 +08:00 |
|
cxt
|
e04926f2e7
|
关联项目的提交次数
|
2016-01-13 10:04:42 +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
|
8ead573872
|
组织设置url
|
2016-01-13 09:56:24 +08:00 |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
2016-01-13 09:34:33 +08:00 |