 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 |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
2015-01-22 17:21:15 +08:00 |
|
sw
|
db4e31f002
|
Merge branch 'develop' into szzh
|
2015-01-22 17:06:58 +08:00 |
|
lizanle
|
8b6750c1ed
|
删除日志修改为只能修改当天的日志：这样子保护原来的日志，又能进行当天的调试
|
2015-01-22 17:04:12 +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 |
|
lizanle
|
43c5feb1f7
|
补丁：修改日志还没有关闭就被重命名的bug：
https://bugs.ruby-lang.org/issues/7303
|
2015-01-22 10:06:16 +08:00 |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
2015-01-22 09:39:04 +08:00 |
|
z9hang
|
a4d7e5f932
|
匿评作品详情显示接口
|
2015-01-22 09:30:29 +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 |
|
lizanle
|
4461a66c7a
|
添加刷新函数
|
2015-01-21 17:43:06 +08:00 |
|
lizanle
|
c0b12ac60c
|
去掉冗余代码
|
2015-01-21 17:42:48 +08:00 |
|
lizanle
|
4d20c8080f
|
修改国际化文件名字
|
2015-01-22 17:22:44 +08:00 |
|
lizanle
|
7fc2ea0484
|
修改国际化文件名字
|
2015-01-22 17:22:29 +08:00 |
|
lizanle
|
566f59c49e
|
修改只有管理员才能查看
|
2015-01-22 16:52:09 +08:00 |
|
lizanle
|
0502eb16a6
|
添加了访问统计页面和耗时分析页面
|
2015-01-22 16:47:29 +08:00 |
|
lizanle
|
458749b921
|
添加了国际化代码
|
2015-01-22 16:46:29 +08:00 |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
2015-01-22 16:46:06 +08:00 |
|
lizanle
|
061e4599c3
|
重构，修正了许多的空指针异常
|
2015-01-22 16:45:57 +08:00 |
|
lizanle
|
c668b72dac
|
重构
|
2015-01-22 16:45:18 +08:00 |