 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 |
 zhuhao
|
4a2b5f5e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 09:22:04 +08:00 |
|
zhuhao
|
b222b7a8ed
|
资源库讨论区发帖按钮样式调整
|
2014-11-24 09:21:48 +08:00 |
|
alan
|
90e4387395
|
修复登录
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 09:08:49 +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 |
|
alan
|
6356596f08
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-22 17:49:34 +08:00 |
|
alan
|
88ab53730b
|
修改bug《登录密码错误报错》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 17:45:09 +08:00 |
 sw
|
7d4afa5766
|
Merge branch 'szzh' into develop
|
2014-11-22 16:12:05 +08:00 |
|
sw
|
ee53ec544f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 16:11:33 +08:00 |
|
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
2014-11-22 15:56:42 +08:00 |
|
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
2014-11-22 15:50:14 +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
|
0a6574b542
|
课程主页新建课程按钮，修改为所有人都可以看到
|
2014-11-22 15:35:28 +08:00 |
|
z9hang
|
8414e92bbe
|
用户主页修改为跳转到项目托管平台主页
|
2014-11-22 15:25:51 +08:00 |
|
sw
|
93eb68c252
|
Merge branch 'szzh' into develop
|
2014-11-22 13:54:10 +08:00 |
|
sw
|
62b6572d92
|
111
|
2014-11-22 13:53:40 +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
|
06a513b2ee
|
修改不选择项目时的<<NULL>>为 NO PROJECT
|
2014-11-22 12:47:40 +08:00 |
|
sw
|
287e9151a2
|
如果课程没有附件，取消显示附件列表
|
2014-11-22 12:43:42 +08:00 |
|
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
2014-11-22 12:40:53 +08:00 |
|
sw
|
dacad26010
|
作品名称改为作品描述
对齐作品名称和作品描述
增加作品描述不能为空的判断
|
2014-11-22 11:19:58 +08:00 |
|
sw
|
a95a68caec
|
增加课程右侧js悬浮框
|
2014-11-22 10:46:15 +08:00 |
|
sw
|
8d3a2ad7a2
|
是否开启匿评改为是否使用匿评
|
2014-11-22 10:36:14 +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 |
|
alan
|
0049f921b9
|
修改bug《测试版--课程/项目--配置--成员添加：如图，用户列表中各用户的邮箱全部为空了》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 09:51:41 +08:00 |
|
sw
|
56150e44ce
|
修复邮件课程作业在新窗口打开网页报500的BUG
|
2014-11-22 09:49:51 +08:00 |
|
sw
|
ea19c1aeef
|
取消教师评分所占比例选项
|
2014-11-22 09:33:37 +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 |
|
z9hang
|
d1ad7b71c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 17:08:19 +08:00 |
|
z9hang
|
c5a9defb3f
|
调整课程资源样式
|
2014-11-21 17:06:58 +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 |
|
sw
|
db87f8f5db
|
修复点击项目工具集栏时项目tab栏下的横线没了的BUG
|
2014-11-21 16:38:14 +08:00 |
|
sw
|
06f1ff026a
|
修改项目--项目工具集logo显示问题
|
2014-11-21 16:28:01 +08:00 |
|
alan
|
5ba33b6d6d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-21 16:27:40 +08:00 |
|
alan
|
3317ca4a97
|
修改bug:
<资料修改--登录名不能编辑>
<注册时登录名被标识为只能是英文，但是可以为数字的>
<后台配置密码最短10个字符，注册时输入密码少于10个字符也给出提示信息“密码设置成功”>
<邮箱激活”页面修改若干建议>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-21 16:27:20 +08:00 |
|
sw
|
ca97ecbdc4
|
Merge branch 'develop' into szzh
|
2014-11-21 16:10:00 +08:00 |
|
sw
|
2c28ed0fa1
|
调整作业详细信息留言的样式
|
2014-11-21 16:07:29 +08:00 |
|
z9hang
|
909c76b09c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 15:54:52 +08:00 |
|
z9hang
|
2348e063d1
|
调整选入课程弹框中列表的显示策略
|
2014-11-21 15:54:29 +08:00 |
|
zhuhao
|
64e6394b44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 15:49:57 +08:00 |