 huang
|
6bf76fdba1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:15:47 +08:00 |
|
huang
|
1e8ef39369
|
Merge branch 'guange_dev' into szzh
|
2015-05-27 11:15:30 +08:00 |
|
huang
|
f770702d0b
|
issue编辑时候去掉铅笔图标
|
2015-05-27 11:08:05 +08:00 |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
2015-05-27 10:43:03 +08:00 |
 sw
|
eab44ddaeb
|
Merge branch 'guange_dev' into develop
|
2015-05-27 09:30:05 +08:00 |
|
sw
|
1fe7c70955
|
1、评价作品增加批阅结果的删除与显示
2、修改课程的昵称下拉框无法正常显示
|
2015-05-27 09:29:27 +08:00 |
 guange
|
1919292c58
|
还是issues count计算问题
|
2015-05-27 09:23:48 +08:00 |
 yutao
|
dc557f7826
|
...
|
2015-05-27 09:04:39 +08:00 |
 lizanle
|
144b68df19
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-27 08:56:56 +08:00 |
|
sw
|
44d452cdb5
|
Merge branch 'guange_dev' into develop
|
2015-05-27 08:56:56 +08:00 |
|
lizanle
|
10e24bebd5
|
动态首页改变
|
2015-05-27 08:56:34 +08:00 |
|
sw
|
fa3b9e2af0
|
进入作品评分界面，评分等数据的初始化
|
2015-05-27 08:55:33 +08:00 |
|
huang
|
6bb649e831
|
issue引用在项目动态的显示格式调整
|
2015-05-27 08:36:32 +08:00 |
|
guange
|
1975df63d4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-26 23:11:34 +08:00 |
|
guange
|
3fa5179026
|
issue数统计拖慢性能
|
2015-05-26 23:11:10 +08:00 |
|
guange
|
9ce1916fbb
|
autologin token cookies domain修改
|
2015-05-26 23:10:08 +08:00 |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
2015-05-26 23:09:10 +08:00 |
|
sw
|
a006e2e462
|
1、实现打分功能
2、打分之后页面刷新
3、获取指定用户对某一作业的评分结果
|
2015-05-26 18:14:53 +08:00 |
|
sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
2015-05-26 17:51:56 +08:00 |
 alan
|
0b6f35055d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-26 17:44:39 +08:00 |
|
yutao
|
080b7972a6
|
...
|
2015-05-26 17:43:23 +08:00 |
|
yutao
|
49c5f3879b
|
...
|
2015-05-26 17:01:25 +08:00 |
|
huang
|
a7aa83be8c
|
module配置未选时候，禁止其它方式的访问
去掉无用文件代码
|
2015-05-26 16:50:10 +08:00 |
|
huang
|
b89ff45fc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-26 16:30:28 +08:00 |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
2015-05-26 16:30:06 +08:00 |
|
yutao
|
8d82ecc89c
|
...
|
2015-05-26 15:01:11 +08:00 |
|
yutao
|
4244c69b46
|
...
|
2015-05-26 14:18:42 +08:00 |
|
lizanle
|
aa86be1d8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-26 11:31:21 +08:00 |
|
sw
|
f3246b99c9
|
关闭匿评功能
|
2015-05-26 11:24:48 +08:00 |
|
sw
|
96354a1c00
|
教师开启匿评功能完成
|
2015-05-26 10:22:16 +08:00 |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
2015-05-26 10:00:37 +08:00 |
|
lizanle
|
3318d11c6d
|
个人留言
|
2015-05-26 09:48:22 +08:00 |
|
huang
|
f52058aaf3
|
课程首页新界面（未完成）
|
2015-05-26 09:37:29 +08:00 |
|
sw
|
e3379cf205
|
每页显示20份作业
|
2015-05-26 09:07:32 +08:00 |
|
alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-26 00:01:15 +08:00 |
|
alanlong9278
|
a27b3e9dc6
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-25 23:22:11 +08:00 |
|
huang
|
d7ed4a985b
|
Merge branch 'szzh' into dev_hjq
|
2015-05-25 15:35:48 +08:00 |
|
huang
|
fc8b5c60c6
|
切换分支处理
|
2015-05-25 15:33:52 +08:00 |
|
yutao
|
69affa8a2e
|
...
|
2015-05-25 15:19:42 +08:00 |
|
sw
|
010036ffa5
|
Merge branch 'szzh' into develop
Conflicts:
app/controllers/avatar_controller.rb
|
2015-05-25 14:48:01 +08:00 |
|
sw
|
6d85535a4d
|
Merge branch 'guange_dev' into szzh
|
2015-05-25 14:45:58 +08:00 |
|
lizanle
|
122de16180
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-25 11:05:43 +08:00 |
|
lizanle
|
42fab7c784
|
schema
|
2015-05-25 11:05:28 +08:00 |
|
guange
|
437d4e1009
|
zip下载必须得登录
|
2015-05-24 13:52:58 +08:00 |
|
guange
|
c9b46e4e3a
|
头像上传bug修复
|
2015-05-24 13:52:27 +08:00 |
|
sw
|
9e4f303742
|
还原部分代码
|
2015-05-23 17:18:13 +08:00 |
|
sw
|
26cb6225c5
|
Merge branch 'szzh' into develop
|
2015-05-23 17:13:56 +08:00 |
|
lizanle
|
3fc02585c5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-23 17:13:52 +08:00 |
|
lizanle
|
6353a2e2c8
|
留言分页
|
2015-05-23 17:13:38 +08:00 |
|
sw
|
0769da1426
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-23 17:13:09 +08:00 |