 cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 18:08:19 +08:00 |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
2016-01-14 18:05:58 +08:00 |
 ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
2016-01-14 17:54:16 +08:00 |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 17:53:22 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +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 |
|
huang
|
5e5634bee8
|
Merge branch 'szzh' into develop
|
2016-01-14 17:34:10 +08:00 |
|
huang
|
82cfeaf409
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-14 17:33:42 +08:00 |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
2016-01-14 17:29:55 +08:00 |
|
cxt
|
7b4b575240
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 16:58:51 +08:00 |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
2016-01-14 16:58:40 +08:00 |
|
huang
|
9841dbeb05
|
Merge branch 'szzh' into hjq_new_course
|
2016-01-14 16:27:51 +08:00 |
|
huang
|
a3a05b1656
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 16:23:29 +08:00 |
|
huang
|
fb616eebf9
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-14 16:23:07 +08:00 |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
2016-01-14 16:15:40 +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
|
aa63221639
|
Merge branch 'cxt_course' into szzh
|
2016-01-14 16:05:23 +08:00 |
|
huang
|
e9b54ad012
|
删除附件的时候减掉得分
|
2016-01-14 16:04:59 +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
|
01e8730b25
|
issue回复添加到积分统计
|
2016-01-14 15:52:14 +08:00 |
|
huang
|
286418b63c
|
修改课程讨论区500问题
|
2016-01-14 15:42:27 +08:00 |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
2016-01-14 15:39:40 +08:00 |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
2016-01-14 15:22:37 +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 |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
2016-01-14 15:02:45 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
2016-01-14 15:01:51 +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 |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
2016-01-14 10:07:46 +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
|
fff7ab4993
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-13 19:17:02 +08:00 |
|
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
2016-01-13 19:16:51 +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 |