 cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
2015-12-07 11:25:41 +08:00 |
|
cxt
|
0472a5ed0c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 10:54:28 +08:00 |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
2015-12-07 10:54:18 +08:00 |
 huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
2015-12-07 10:34:10 +08:00 |
|
huang
|
9ef7cdf91f
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 10:07:24 +08:00 |
|
huang
|
f67386e8a0
|
组织模块丢失代码还原
|
2015-12-07 10:06:51 +08:00 |
|
huang
|
de5990f484
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 09:59:36 +08:00 |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
|
huang
|
79a893d5c1
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-05 14:35:34 +08:00 |
|
huang
|
c218b09945
|
Merge branch 'dev_hjq' into develop
|
2015-12-05 14:34:41 +08:00 |
|
huang
|
bd3d0547f5
|
组织样式修改
|
2015-12-05 14:34:16 +08:00 |
|
huang
|
7fe112c337
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 13:30:19 +08:00 |
 ouyangxuhua
|
4c9d9dee35
|
组织首页样式
|
2015-12-05 13:27:58 +08:00 |
|
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 12:01:49 +08:00 |
|
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
2015-12-05 12:01:04 +08:00 |
|
huang
|
01ca1850f8
|
Merge branch 'dev_hjq' into develop
|
2015-12-05 11:40:38 +08:00 |
|
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-05 11:39:50 +08:00 |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
|
ouyangxuhua
|
37a7abea53
|
组织首页
|
2015-12-05 11:31:20 +08:00 |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
2015-12-05 11:30:05 +08:00 |
|
ouyangxuhua
|
5b0bdb5069
|
修改组织栏目的内容及样式
|
2015-12-04 18:19:35 +08:00 |
|
huang
|
c7058e6bbf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 17:45:18 +08:00 |
|
huang
|
4cb58211ad
|
邮件消息提示语修改
|
2015-12-04 17:44:46 +08:00 |
|
huang
|
33df6ec608
|
Merge branch 'gitlab_guange' into develop
|
2015-12-04 17:42:57 +08:00 |
|
huang
|
1cf774d6a5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-04 17:39:39 +08:00 |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
|
huang
|
6fad26cabf
|
去死奥placebold
|
2015-12-04 17:32:56 +08:00 |
|
cxt
|
8b160b1c38
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 17:29:55 +08:00 |
|
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
2015-12-04 17:29:39 +08:00 |
|
huang
|
120a7274d3
|
fork样式显示
|
2015-12-04 17:22:22 +08:00 |
|
huang
|
bde27ba195
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 16:52:06 +08:00 |
 Tim
|
7e86d8fdf1
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:49:37 +08:00 |
|
Tim
|
d115a97f78
|
追加附件效果调整
|
2015-12-04 16:49:14 +08:00 |
|
huang
|
465b0e4ce3
|
Merge branch 'szzh' into develop
|
2015-12-04 16:44:25 +08:00 |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
|
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:42:55 +08:00 |
 lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
|
huang
|
a5c7cecc2e
|
Merge branch 'gitlab_guange' into szzh
|
2015-12-04 16:36:13 +08:00 |
|
lizanle
|
0a5a33c2de
|
schema
|
2015-12-04 16:36:03 +08:00 |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
2015-12-04 16:33:56 +08:00 |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-12-04 16:22:02 +08:00 |
|
huang
|
b6edabed9c
|
修改角色
|
2015-12-04 16:21:48 +08:00 |
|
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
|
Tim
|
dfa9b4cf74
|
学生列表调整
|
2015-12-04 16:13:55 +08:00 |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
2015-12-04 15:58:56 +08:00 |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 15:54:56 +08:00 |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
2015-12-04 15:54:18 +08:00 |
|
huang
|
c1747ab217
|
fork重名，提交
|
2015-12-04 15:49:05 +08:00 |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
2015-12-04 15:36:19 +08:00 |
|
lizanle
|
e2f5dcc3f9
|
当天截止的测验需要发布截止消息
|
2015-12-04 13:39:17 +08:00 |