 z9hang
|
5a7463e28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 09:34:27 +08:00 |
|
z9hang
|
f74f2e3be7
|
exec按钮样式调整
|
2015-01-23 09:34:15 +08:00 |
whimlex
|
e950208e38
|
sina邮箱IE样式
|
2015-01-22 22:05:56 +08:00 |
|
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
2015-01-22 21:02:53 +08:00 |
|
whimlex
|
1e36ca504a
|
多种邮箱邮件样式调整，回复内容样式更改
|
2015-01-22 20:41:42 +08:00 |
 sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-22 17:51:11 +08:00 |
 huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-22 17:46:31 +08:00 |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
2015-01-22 17:46:12 +08:00 |
 alan
|
8f1249390a
|
修改《发送多封相同邮件》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-22 17:31:34 +08:00 |
|
sw
|
db4e31f002
|
Merge branch 'develop' into szzh
|
2015-01-22 17:06:58 +08:00 |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
2015-01-22 17:03:01 +08:00 |
|
alan
|
24dfeb1614
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-22 16:32:53 +08:00 |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-22 16:30:21 +08:00 |
|
sw
|
683625066e
|
修改进入未批列表修改排序后，老师进行评分之后排序会回到默认排序额问题
|
2015-01-22 15:16:15 +08:00 |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
2015-01-22 09:39:04 +08:00 |
|
whimlex
|
0c0160ac2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-21 18:13:47 +08:00 |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
2015-01-21 18:12:04 +08:00 |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
2015-01-21 17:51:12 +08:00 |
|
sw
|
6193c6c558
|
Merge branch 'szzh' into develop
|
2015-01-21 16:13:48 +08:00 |
|
sw
|
d68486669e
|
#1830课程--标签字体压线
|
2015-01-21 16:07:44 +08:00 |
|
sw
|
7ee17b6d7c
|
调整问卷界面左边边距
|
2015-01-21 15:43:15 +08:00 |
|
sw
|
520e9c73aa
|
#1836 未登录或者没有权限访问私有项目时，跳转到403页面
|
2015-01-21 14:30:19 +08:00 |
|
alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-21 12:01:02 +08:00 |
|
sw
|
0b2fa35a42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-21 11:58:55 +08:00 |
|
sw
|
77b8bf18c8
|
#1842 修改部分页面描述问题
|
2015-01-21 11:50:33 +08:00 |
|
sw
|
a53831a6b5
|
修改当问卷标题过长时，学生查看问卷列表省略号过早出现
|
2015-01-21 11:44:49 +08:00 |
|
sw
|
2f8a183168
|
1、替换图标图片
2、已答问卷后问卷增加已答标志显示
|
2015-01-21 11:34:53 +08:00 |
|
alan
|
64c0fc7413
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-21 11:33:43 +08:00 |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
2015-01-21 11:33:29 +08:00 |
|
sw
|
95dcdd7125
|
修改进入问卷编辑界面报错
|
2015-01-21 11:18:47 +08:00 |
|
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
2015-01-21 11:14:01 +08:00 |
|
sw
|
402dfc788f
|
修改新建问卷时问卷名称默认为空
|
2015-01-21 09:55:40 +08:00 |
|
sw
|
4caf6ab5f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-21 09:19:05 +08:00 |
|
sw
|
f3062da237
|
修改空数据时，课程首页无法加载(居然是死循环。。。)
|
2015-01-21 09:18:29 +08:00 |
|
sw
|
77cb2b0893
|
1.修改学生已完成的问卷标题过长时显示异常
2.增加取消发布时的提示
|
2015-01-20 16:50:16 +08:00 |
|
alan
|
9f36469d39
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-20 16:34:30 +08:00 |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
2015-01-20 16:33:59 +08:00 |
|
sw
|
7b9d88ecfe
|
问卷调查增加重新发布功能
|
2015-01-20 11:42:28 +08:00 |
|
sw
|
d446f0936b
|
Merge branch 'szzh' into develop
|
2015-01-19 17:09:50 +08:00 |
|
sw
|
e493ae22cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-19 17:08:47 +08:00 |
|
sw
|
6b798fc27d
|
Merge branch 'develop' into szzh
|
2015-01-19 17:08:26 +08:00 |
|
sw
|
14a1f31a12
|
1、项目动态 -> 近期动态
2、修复新建修改课程时，描述会有一行空白行
|
2015-01-19 16:43:21 +08:00 |
|
z9hang
|
493b7ca695
|
#1821 课程--作业：导出excel相关问题 调整样式
|
2015-01-19 16:05:18 +08:00 |
|
z9hang
|
abcf06ccc7
|
课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了
|
2015-01-19 15:00:46 +08:00 |
|
alan
|
3315116832
|
修改《课程--留言：给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-19 14:35:30 +08:00 |
|
alan
|
d5100e4808
|
修改《若用户没有填写姓名或者学号，在列表处姓名学号显示不合理》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-19 11:42:40 +08:00 |
|
alan
|
0b0b6c9b6e
|
修改《托管平台中点击某项目进入该项目主页，右上角的搜索处不输入内容点击搜索按钮，给出的提示信息显示不合理》
增加《课程平台进入某一课程搜索风格保持与项目及竞赛的一致》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-19 11:01:05 +08:00 |
|
alan
|
0ed39fbcc7
|
修改《缺陷 Trustie-Forge#1793 (已解决): 登录平台后点击修修改资料，当身份为老师或者学生时：点击选择学校弹出框靠左压线显示，建议剧中现》
《 360项目，课程首页搜索框乱了》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-19 10:14:44 +08:00 |
|
sw
|
00633c8331
|
1
|
2015-01-17 19:00:32 +08:00 |
|
sw
|
c9c9f578b9
|
Merge branch 'szzh' into develop
|
2015-01-17 15:21:46 +08:00 |