 sw
|
fe06ca503a
|
增加poll colsed_at的赋值
|
2015-01-27 09:55:02 +08:00 |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
2015-01-27 09:45:15 +08:00 |
|
sw
|
d135274281
|
修改重复加入项目提示语
|
2015-01-26 15:41:10 +08:00 |
|
sw
|
9f6ff04e65
|
#1866 新建帖子时当鼠标移至“提交”按钮时，光标应变成手型的图标
|
2015-01-26 15:31:36 +08:00 |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
2015-01-26 14:25:39 +08:00 |
|
sw
|
a04bd5d826
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-26 14:11:06 +08:00 |
|
sw
|
554cbf55bb
|
Merge branch 'develop' into szzh
|
2015-01-26 14:10:38 +08:00 |
|
sw
|
2f8d57797c
|
增加弹出框的宽度
|
2015-01-26 14:09:56 +08:00 |
 zhuhao
|
a38b3c89fe
|
添加预构件生产测试数据
|
2015-01-24 10:36:19 +08:00 |
|
zhuhao
|
ca17058750
|
添加预构件
|
2015-01-24 10:35:46 +08:00 |
|
zhuhao
|
167abcd6b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-24 10:20:01 +08:00 |
|
zhuhao
|
230b98d704
|
注册测试
|
2015-01-24 10:18:32 +08:00 |
|
sw
|
0f7c52e279
|
Merge branch 'szzh' into develop
|
2015-01-23 17:10:46 +08:00 |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
2015-01-23 17:10:21 +08:00 |
|
sw
|
079fce4335
|
Merge branch 'szzh' into develop
|
2015-01-23 15:55:51 +08:00 |
 alan
|
7ef6f8adfb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-23 15:55:44 +08:00 |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 15:55:29 +08:00 |
|
sw
|
9990845f31
|
Merge branch 'szzh' into develop
|
2015-01-23 15:28:25 +08:00 |
|
sw
|
5e4279e158
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:23:31 +08:00 |
|
sw
|
a093537ba4
|
去掉编辑问卷时框框
|
2015-01-23 15:23:13 +08:00 |
|
zhuhao
|
bbe7025e2d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:22:18 +08:00 |
|
sw
|
6dad5bb416
|
修改问卷统计界面margin
|
2015-01-23 15:15:24 +08:00 |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
2015-01-23 15:10:54 +08:00 |
whimlex
|
14685f2656
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:09:03 +08:00 |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
2015-01-23 15:08:34 +08:00 |
|
zhuhao
|
6ff0a41934
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 15:04:42 +08:00 |
|
alan
|
38da932f4c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/application.rb
|
2015-01-23 14:57:09 +08:00 |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 14:51:11 +08:00 |
|
sw
|
08e646c752
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:43:48 +08:00 |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
2015-01-23 14:43:40 +08:00 |
|
sw
|
dbdae2ac7e
|
问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
|
2015-01-23 14:25:29 +08:00 |
|
whimlex
|
2be757a3d5
|
翻译缺失完善
|
2015-01-23 14:19:43 +08:00 |
|
whimlex
|
9886a3212c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:15:39 +08:00 |
|
sw
|
016f4f9a0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:11:02 +08:00 |
|
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
2015-01-23 14:10:38 +08:00 |
|
whimlex
|
15a8bddfe6
|
缺失翻译
|
2015-01-23 14:02:00 +08:00 |
|
zhuhao
|
78eae69ee6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 13:52:29 +08:00 |
|
alan
|
b20204fedd
|
修改《邮件重发一样引发的bug》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 13:42:25 +08:00 |
|
zhuhao
|
155af34215
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 11:55:17 +08:00 |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
|
zhuhao
|
965703a80e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
.rspec
|
2015-01-23 10:21:26 +08:00 |
|
sw
|
bb64dc9452
|
修改问卷调查按钮的样式
|
2015-01-23 10:19:23 +08:00 |
|
zhuhao
|
f24d0e6b54
|
user模型数据验证测试
|
2015-01-23 10:16:46 +08:00 |
|
alan
|
942035f698
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-23 10:03:45 +08:00 |
|
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 10:03:00 +08:00 |
|
sw
|
35eab3eb27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 09:57:00 +08:00 |
|
sw
|
89ee38481b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-23 09:56:37 +08:00 |
 z9hang
|
b1a0c99446
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 09:52:07 +08:00 |
|
z9hang
|
3911450787
|
问卷调查简答题输入字符过多显示超边框问题
|
2015-01-23 09:51:36 +08:00 |
 huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 09:47:33 +08:00 |