 sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
 yutao
|
dd492f37d6
|
个人主页
|
2015-07-17 16:20:58 +08:00 |
|
yutao
|
8d858cccfc
|
个人主页
|
2015-07-17 13:40:53 +08:00 |
|
sw
|
b6e123e476
|
右上角导航栏问题
|
2015-07-16 10:49:39 +08:00 |
|
yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |
|
yutao
|
b7c4449f4b
|
个人主页
|
2015-07-13 16:44:53 +08:00 |
 huang
|
fd70538584
|
修复老板bese中我的项目、课程倒序
|
2015-07-10 15:21:02 +08:00 |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
2015-07-10 14:17:19 +08:00 |
|
huang
|
7b6e40f4c3
|
修改导航中“我的项目”和“我的课程”倒排
|
2015-07-10 09:31:57 +08:00 |
|
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
 zhangshenjerry
|
04f125c7a6
|
张申修改的bug
|
2015-07-06 11:42:26 +08:00 |
|
sw
|
a6e80ed938
|
部分用户右上角下拉框不显示我的课程
|
2015-07-02 15:30:30 +08:00 |
 guange
|
23a1f84ae7
|
kindeditor js顺序错误
|
2015-06-17 20:59:43 +08:00 |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
2015-06-17 17:01:03 +08:00 |
|
sw
|
0053930769
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-13 14:37:57 +08:00 |
|
yutao
|
fd5f2d9322
|
...
|
2015-06-13 14:14:34 +08:00 |
|
sw
|
cc2bd5f7b1
|
作品列表收索时，收索条件内容在课程收索栏
|
2015-06-13 10:55:51 +08:00 |
|
sw
|
a600d93630
|
111
|
2015-06-13 09:23:04 +08:00 |
|
sw
|
ff159075aa
|
新header课程在项目上面
|
2015-06-10 16:16:23 +08:00 |
|
sw
|
427553d4e5
|
老师编辑作业、学生编辑作品时删除附件界面没刷新
|
2015-06-05 13:56:13 +08:00 |
|
sw
|
f466084a17
|
地区没有就不显示了
|
2015-06-05 11:22:38 +08:00 |
|
sw
|
1c4ca0c913
|
导航栏进入课程、项目、个人主页新打开一页
|
2015-06-03 14:33:53 +08:00 |
|
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
 alan
|
70330f0f4b
|
Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
app/views/layouts/_user_project_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-06-01 10:42:18 +08:00 |
|
alan
|
3967b632b5
|
去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
|
2015-06-01 10:41:23 +08:00 |
|
guange
|
0eace6e598
|
cached导致的个人项目列表问题
|
2015-05-29 18:42:22 +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 |
|
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 |
|
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
2015-05-28 15:45:36 +08:00 |
|
alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +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 |
|
huang
|
8e74712b86
|
Merge branch 'szzh' into dev_hjq
|
2015-05-27 16:10:44 +08:00 |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
2015-05-27 10:43:03 +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 |
|
huang
|
a7aa83be8c
|
module配置未选时候，禁止其它方式的访问
去掉无用文件代码
|
2015-05-26 16:50:10 +08:00 |
|
huang
|
f52058aaf3
|
课程首页新界面（未完成）
|
2015-05-26 09:37:29 +08:00 |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
2015-05-21 15:52:27 +08:00 |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-21 11:20:12 +08:00 |
|
huang
|
e2f0aeb693
|
公共贴吧--帖子里面搜索错误
|
2015-05-20 17:32:16 +08:00 |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
2015-05-20 15:05:35 +08:00 |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
2015-05-19 17:12:43 +08:00 |
|
yutao
|
895058f38e
|
修复bug#2154:成功上传课件，课程资源数统计未自动刷新
|
2015-05-19 11:30:31 +08:00 |
|
huang
|
d42fd98dff
|
优化项目类型
|
2015-05-19 10:10:52 +08:00 |
|
guange
|
1355dc805f
|
用户界面返回500错误 #2610
|
2015-05-18 17:31:53 +08:00 |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
2015-05-18 17:02:02 +08:00 |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
2015-05-18 11:16:41 +08:00 |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
2015-05-15 16:13:47 +08:00 |