 huang
|
81f54e44b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-26 19:25:36 +08:00 |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
2016-02-26 19:25:12 +08:00 |
 cxt
|
3b1ecedf97
|
Merge branch 'cxt_course' into develop
|
2016-02-26 18:50:12 +08:00 |
|
cxt
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
2016-02-26 17:44:46 +08:00 |
|
cxt
|
6d1667b4ae
|
Merge branch 'develop' into cxt_course
|
2016-02-26 17:35:13 +08:00 |
 ouyangxuhua
|
6e85b38b09
|
1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章
|
2016-02-26 17:11:18 +08:00 |
|
cxt
|
1f25dd4174
|
Merge branch 'develop' into cxt_course
|
2016-02-26 17:03:19 +08:00 |
|
cxt
|
61d9dc959c
|
Merge branch 'szzh' into develop
|
2016-02-26 17:01:02 +08:00 |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
cxt
|
386990ebef
|
Merge branch 'szzh' into cxt_course
|
2016-02-26 16:58:48 +08:00 |
|
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
2016-02-26 16:37:13 +08:00 |
|
cxt
|
0b6521c921
|
禁用匿评的作业动态仍然显示缺评扣分
|
2016-02-26 16:37:02 +08:00 |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 16:26:51 +08:00 |
|
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
2016-02-26 16:26:20 +08:00 |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-26 16:18:17 +08:00 |
|
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
2016-02-26 16:13:14 +08:00 |
 newuser
|
555a9131c4
|
Gitlab端获取默认分支
|
2016-02-26 15:37:59 +08:00 |
|
newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-26 14:57:41 +08:00 |
|
newuser
|
43825fab31
|
Merge branch 'szzh' into develop
|
2016-02-26 14:57:14 +08:00 |
|
newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 14:55:28 +08:00 |
|
newuser
|
2fb26c3ac4
|
Merge branch 'hjq_new_course' into szzh
|
2016-02-26 14:54:56 +08:00 |
|
cxt
|
d409b14916
|
Merge branch 'cxt_course' into szzh
|
2016-02-26 14:51:59 +08:00 |
 Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
2016-02-26 10:41:14 +08:00 |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
2016-02-25 16:22:42 +08:00 |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
2016-02-25 15:48:49 +08:00 |
|
huang
|
a6abdbacb9
|
Merge branch 'hjq_course' into hjq_new_course
|
2016-02-25 11:19:20 +08:00 |
|
huang
|
635e6300a1
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/helpers/users_helper.rb
app/views/users/_project_issue_detail.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
db/schema.rb
|
2016-02-25 11:17:54 +08:00 |
|
huang
|
8b839caa48
|
添加样式
|
2016-02-25 11:12:24 +08:00 |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
2016-02-25 11:06:10 +08:00 |
|
cxt
|
5d5fcda475
|
Merge branch 'develop' into cxt_course
|
2016-02-25 10:24:33 +08:00 |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
2016-02-25 10:23:38 +08:00 |
|
cxt
|
758b044986
|
Merge branch 'szzh' into develop
|
2016-02-25 09:36:08 +08:00 |
|
cxt
|
95170b0b2b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-25 09:35:45 +08:00 |
|
cxt
|
e5f899987b
|
Merge branch 'develop' into szzh
|
2016-02-25 09:35:37 +08:00 |
 guange
|
231df07c29
|
移除pry
|
2016-02-25 09:26:43 +08:00 |
|
ouyangxuhua
|
a451680cf8
|
发送文件时，记录放在表forwards中
|
2016-02-24 17:09:43 +08:00 |
|
cxt
|
e6ed988c10
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2016-02-24 17:00:08 +08:00 |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
2016-02-24 16:52:36 +08:00 |
|
cxt
|
5e330de31a
|
学生看到的作业个数不包含未发布的作业
|
2016-02-24 16:20:59 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
9758e18ba8
|
Merge branch 'cxt_course' into develop
|
2016-02-24 16:08:27 +08:00 |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
2016-02-24 16:05:48 +08:00 |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
|
ouyangxuhua
|
264c6679e0
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-24 16:02:38 +08:00 |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
2016-02-24 16:01:32 +08:00 |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
2016-02-24 15:47:30 +08:00 |
|
huang
|
ea2033eb30
|
Git文件识别，换行
|
2016-02-24 11:24:05 +08:00 |
|
cxt
|
adf9465443
|
课程英雄榜的积分只显示一位小数
|
2016-02-24 10:49:48 +08:00 |