 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 |
|
Tim
|
f0347c9166
|
精品课程图标
|
2016-01-13 18:16:19 +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 |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
2016-01-13 16:36:34 +08:00 |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 16:32:33 +08:00 |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
2016-01-13 16:32:05 +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 |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +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 |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
2016-01-11 17:02:01 +08:00 |
|
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
2016-01-11 17:00:29 +08:00 |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
2016-01-11 16:56:57 +08:00 |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +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 |
|
ouyangxuhua
|
09c7728201
|
样式更新
|
2016-01-11 10:35:25 +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 |