 alan
|
735cb44877
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 10:49:10 +08:00 |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 10:48:53 +08:00 |
 z9hang
|
897b06cd0e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 10:06:57 +08:00 |
|
z9hang
|
79e37fbf2c
|
关联了项目的作业附件提交不了
|
2014-11-24 10:06:34 +08:00 |
|
alan
|
4221f5edb3
|
<还原>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 11:48:59 +08:00 |
|
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 10:44:51 +08:00 |
|
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 09:36:47 +08:00 |
|
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 22:50:48 +08:00 |
|
z9hang
|
3784149112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 15:35:46 +08:00 |
|
z9hang
|
8414e92bbe
|
用户主页修改为跳转到项目托管平台主页
|
2014-11-22 15:25:51 +08:00 |
 sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2014-11-22 13:52:46 +08:00 |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
2014-11-22 13:45:17 +08:00 |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
2014-11-22 10:07:28 +08:00 |
|
z9hang
|
e2892453de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 10:07:19 +08:00 |
|
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
2014-11-22 10:06:56 +08:00 |
|
sw
|
56150e44ce
|
修复邮件课程作业在新窗口打开网页报500的BUG
|
2014-11-22 09:49:51 +08:00 |
|
alan
|
4e0f4d0a55
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-21 19:12:30 +08:00 |
|
alan
|
70e8c4ebe7
|
修改bug<注册后，用户第一次登陆都得转到《修改资料》页面>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-21 19:11:40 +08:00 |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 17:00:14 +08:00 |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
2014-11-21 16:59:58 +08:00 |
|
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源，且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
2014-11-21 14:57:10 +08:00 |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
2014-11-21 11:41:38 +08:00 |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
2014-11-21 11:38:53 +08:00 |
|
sw
|
6b48e90e77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 11:33:48 +08:00 |
 gonglexin
|
81420df6b9
|
Fix #1523 新建缺陷时高亮显示 TAB 页
|
2014-11-20 22:04:16 +08:00 |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
2014-11-20 17:44:30 +08:00 |
|
sw
|
9277b3007a
|
修复引用贴吧描述时显示不正确
|
2014-11-20 17:10:05 +08:00 |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 15:56:45 +08:00 |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
2014-11-20 11:16:58 +08:00 |
|
sw
|
0e409445cc
|
隐藏我的工作台更多按钮
|
2014-11-20 10:54:03 +08:00 |
|
z9hang
|
63b91e2cfb
|
资源上传
|
2014-11-19 17:40:24 +08:00 |
|
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:30:53 +08:00 |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:25:10 +08:00 |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
2014-11-19 11:03:23 +08:00 |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
2014-11-19 10:34:36 +08:00 |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
2014-11-19 10:07:49 +08:00 |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
|
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
2014-11-17 16:13:40 +08:00 |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-14 15:04:53 +08:00 |
|
alan
|
e0cf3bd6de
|
修改bug<贴吧换行显示不正确>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-14 10:54:05 +08:00 |
|
sw
|
fae3de8e04
|
老师打包后姓和名反了
|
2014-11-13 09:24:40 +08:00 |
|
sw
|
23f4d760e6
|
修改老师打包下载第二次文件名为学生真实姓名_学生学号_时间
|
2014-11-13 09:16:01 +08:00 |
|
alan
|
e9d75bde6f
|
《修改资料》页面：工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:14:40 +08:00 |
|
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:13:44 +08:00 |
|
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
2014-11-12 17:07:27 +08:00 |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
2014-11-12 16:51:07 +08:00 |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-11 17:01:29 +08:00 |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2014-11-11 17:01:07 +08:00 |
|
sw
|
dbf08bc486
|
Merge branch 'Homework' into szzh
|
2014-11-11 15:19:28 +08:00 |
|
sw
|
31ad012bee
|
修改第一次打包下载成功，后面打包下载失败的BUG
|
2014-11-11 14:41:07 +08:00 |