huang
|
c62d468ed3
|
修改项目新闻和课程通知冲突
|
2015-06-05 15:54:56 +08:00 |
sw
|
59c4e04e37
|
删除bid相关路由
|
2015-06-05 09:57:33 +08:00 |
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-04 22:39:40 +08:00 |
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
2015-06-04 17:45:51 +08:00 |
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
2015-06-04 17:25:44 +08:00 |
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-04 16:56:30 +08:00 |
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +08:00 |
guange
|
36afb4d1f8
|
视频在公共贴吧的帖子回复里发不
|
2015-06-04 13:55:38 +08:00 |
sw
|
0d292d8ee6
|
课程留言为空时的提示
|
2015-06-04 11:18:06 +08:00 |
guange
|
3cc6fc1a64
|
删掉additional_enviroment.rb
|
2015-06-03 18:15:08 +08:00 |
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭,相关页面、方法删除
|
2015-06-02 15:20:44 +08:00 |
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
guange
|
b6d22cfb31
|
添加文件预览接口
|
2015-06-01 23:02:55 +08:00 |
guange
|
21a143651a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-29 18:27:32 +08:00 |
guange
|
2981d354ad
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-29 16:34:33 +08:00 |
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
2015-05-29 16:12:50 +08:00 |
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
2015-05-29 14:52:24 +08:00 |
huang
|
d9ae9c8061
|
修改邮件通知提醒(邀请:未激活
点击链接:激活并加入项目)
|
2015-05-29 14:36:44 +08:00 |
alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-28 16:34:56 +08:00 |
sw
|
4d43cd2765
|
点赞功能
|
2015-05-28 16:10:40 +08:00 |
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
2015-05-28 15:45:36 +08:00 |
alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-28 15:14:57 +08:00 |
sw
|
3f9855f25c
|
老师删除作业功能
|
2015-05-28 14:13:47 +08:00 |
guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
2015-05-28 12:23:56 +08:00 |
sw
|
e1a3ed4b82
|
到处Excel
|
2015-05-28 11:07:28 +08:00 |
guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
2015-05-27 19:37:46 +08:00 |
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:42:25 +08:00 |
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:01:52 +08:00 |
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
2015-05-27 15:11:11 +08:00 |
sw
|
a0324f5e39
|
增加评分回复,以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
2015-05-27 11:25:32 +08:00 |
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
2015-05-26 23:09:10 +08:00 |
alanlong9278
|
b1a60d3118
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-26 00:01:15 +08:00 |
sw
|
c289af2e7c
|
评分
|
2015-05-23 11:24:24 +08:00 |
guange
|
b5d9cf55ff
|
将域名配置加入到管理员后台
|
2015-05-22 15:59:37 +08:00 |
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-21 11:20:12 +08:00 |
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-20 17:42:26 +08:00 |
sw
|
25672aa229
|
编辑作业功能完成
|
2015-05-20 17:01:08 +08:00 |
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面,部分界面显示的初始化
4、提交新建作业按钮
|
2015-05-20 16:49:19 +08:00 |
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
2015-05-20 16:24:32 +08:00 |
sw
|
a7fd5b950d
|
1、老师新建作业界面,数据i初始化
2、部分help方法添加
|
2015-05-20 15:05:35 +08:00 |
yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库:成功引入资源后,“选人我的课程”未自动刷新为“选入我的其他课程”
|
2015-05-20 11:56:34 +08:00 |
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
2015-05-19 17:12:43 +08:00 |
guange
|
9b0602fd9c
|
新增学生作业下载spec
|
2015-05-18 17:26:50 +08:00 |
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
2015-05-15 23:47:22 +08:00 |
guange
|
d2a7d41963
|
头像加入大小限制
|
2015-05-15 17:35:24 +08:00 |
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
2015-05-14 21:40:34 +08:00 |
huang
|
6c500109c9
|
修改项目上传资源
|
2015-05-13 10:06:04 +08:00 |
guange
|
5c4ad1ce7d
|
merge
|
2015-05-08 14:31:23 +08:00 |
sw
|
cfe3021391
|
用户收索国际化丢失
|
2015-05-08 09:16:11 +08:00 |