 cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 16:32:33 +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 |
|
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 |
|
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 |
|
cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
2016-01-12 16:13:49 +08:00 |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
2016-01-12 15:53:15 +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
|
83881766b2
|
提交总数接口获取修改
|
2016-01-12 11:01:58 +08:00 |
|
huang
|
500527a12d
|
gitlab同步问题
|
2016-01-12 10:42:25 +08:00 |
|
huang
|
1239a8b5af
|
统计数据迁移
|
2016-01-12 10:38:50 +08:00 |
|
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
2016-01-11 17:00:29 +08:00 |
|
huang
|
f3b732460c
|
添加项目统计字段
|
2016-01-11 14:57:52 +08:00 |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
2016-01-11 11:07:03 +08:00 |
|
huang
|
525d1544c2
|
代码样式
|
2016-01-11 10:43:48 +08:00 |
|
cxt
|
a3a16b5591
|
问题跟踪、作业列表页面“展开更多”改为“点击展开更多”
|
2016-01-11 10:21:42 +08:00 |
|
cxt
|
28aa2e5c97
|
Merge branch 'develop' into cxt_course
|
2016-01-11 09:28:34 +08:00 |
 guange
|
e80149c6c8
|
@7008找不到的问题
|
2016-01-10 15:38:45 +08:00 |
|
huang
|
4e25b9730f
|
Merge branch 'szzh' into develop
|
2016-01-08 23:03:39 +08:00 |
|
guange
|
d4d1fe65b3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 23:01:33 +08:00 |
|
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
2016-01-08 23:01:16 +08:00 |
|
huang
|
100ecfb184
|
Merge branch 'szzh' into develop
|
2016-01-08 22:31:29 +08:00 |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 22:30:48 +08:00 |
|
huang
|
df16b9b22d
|
Merge branch 'develop' into szzh
|
2016-01-08 22:30:39 +08:00 |
|
cxt
|
66c3cee3f8
|
课程关联组织列表
|
2016-01-08 22:30:04 +08:00 |
|
huang
|
c719fd96a3
|
0
|
2016-01-08 22:29:57 +08:00 |
|
cxt
|
bb0a03b309
|
若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框
|
2016-01-08 22:02:35 +08:00 |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
2016-01-08 21:47:42 +08:00 |
|
cxt
|
a3370b693c
|
课程关联组织列表为空
|
2016-01-08 21:46:10 +08:00 |
|
huang
|
5d68d185d5
|
资源样式冲突
|
2016-01-08 21:24:25 +08:00 |
|
cxt
|
eab8cc7231
|
复制学期的默认图片
|
2016-01-08 21:22:36 +08:00 |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
2016-01-08 21:18:08 +08:00 |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
2016-01-08 20:46:06 +08:00 |
|
cxt
|
ff42d584ef
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:45:06 +08:00 |
|
cxt
|
a206a1d7f1
|
样式
|
2016-01-08 20:43:33 +08:00 |
|
cxt
|
6c4dbb9ba0
|
Merge branch 'szzh' into cxt_course
|
2016-01-08 20:38:02 +08:00 |
|
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:36:08 +08:00 |
|
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 20:35:19 +08:00 |
|
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
2016-01-08 20:35:05 +08:00 |