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 |
 lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
2015-01-23 13:49:13 +08:00 |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-01-23 13:47:38 +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 |
|
lizanle
|
df88cb6eba
|
管理员才能查看
|
2015-01-23 11:14:48 +08:00 |
|
lizanle
|
69ced4b14b
|
添加国际化内容
|
2015-01-23 11:08:58 +08:00 |
|
lizanle
|
240678673d
|
最新GemFile
|
2015-01-23 10:53:51 +08:00 |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-01-23 10:25:28 +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 |
|
lizanle
|
9b96d99d6f
|
无改动
|
2015-01-23 10:05:36 +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 |
|
lizanle
|
7bf89c1fc1
|
开发环境不缓存
|
2015-01-23 10:00:04 +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 |
|
lizanle
|
bb9ab0755c
|
忽略tmp文件
|
2015-01-23 09:54:18 +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 |
|
lizanle
|
f394c3878e
|
生产环境日志名字规定为production.log
|
2015-01-23 09:50:50 +08:00 |
|
lizanle
|
d2d1a9659b
|
开发环境下去掉缓存
|
2015-01-23 09:49:07 +08:00 |
|
lizanle
|
27fde6c641
|
添加注释
|
2015-01-23 09:47:54 +08:00 |
 huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 09:47:33 +08:00 |
|
lizanle
|
03ae5fdeac
|
添加注释
|
2015-01-23 09:47:22 +08:00 |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
2015-01-23 09:47:13 +08:00 |
|
lizanle
|
ae74dff89b
|
添加注释
|
2015-01-23 09:46:55 +08:00 |
|
lizanle
|
79fd7ebd7a
|
生产环境下日志分天
|
2015-01-23 09:46:02 +08:00 |
|
sw
|
ae31d0b861
|
#1851课程作业增加状态显示
|
2015-01-23 09:42:08 +08:00 |
|
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 |
|
sw
|
249b08392d
|
#1856 修改问卷列表页面，发布问卷、取消发布后弹出界面显示不正确
|
2015-01-23 09:31:30 +08:00 |
|
sw
|
81f5a5e624
|
#1854学生点击查看已提交过的问卷时，多行主观题中显示有html元素
|
2015-01-23 09:28:01 +08:00 |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
2015-01-23 09:17:27 +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 |
|
lizanle
|
4fe8b23069
|
去掉不必要的代码，修改注释，格式
|
2015-01-22 17:50:24 +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 |