 zhuhao
|
a145f04c27
|
在gemfile中添加rspec
|
2015-01-20 16:56:23 +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 |
 z9hang
|
0a33a716de
|
添加课程作业列表API接口
修改作业详情列表API接口
添加课程通知列表API接口
|
2015-01-20 15:17:02 +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 |
 lizanle
|
565c1583d8
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 15:35:27 +08:00 |
|
lizanle
|
4796524a97
|
去掉项目动态查询中过大的时间跨度
|
2015-01-19 15:35:17 +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 |
|
lizanle
|
0abf523cd2
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:09:58 +08:00 |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
2015-01-19 14:09:53 +08:00 |
|
lizanle
|
8365287d13
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:07:31 +08:00 |
|
lizanle
|
027f6592ef
|
日志查看路由
|
2015-01-19 14:07:27 +08:00 |
|
lizanle
|
242330d023
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:06:52 +08:00 |
|
lizanle
|
9dec76de26
|
搜索结果样式
|
2015-01-19 14:06:42 +08:00 |
|
lizanle
|
a57a7f16b1
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:06:08 +08:00 |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
2015-01-19 14:05:43 +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 |
|
alan
|
092265d53c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-18 00:25:19 +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 |
|
sw
|
750c8d77aa
|
11111
|
2015-01-17 15:21:18 +08:00 |
|
sw
|
1803eab9f1
|
Merge branch 'Poll' into szzh
|
2015-01-17 15:09:17 +08:00 |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-17 15:03:59 +08:00 |
|
sw
|
2a8a8ab3f2
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 15:01:04 +08:00 |
|
sw
|
7edabe3d53
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-17 15:00:34 +08:00 |
|
sw
|
2f9e658697
|
增加问卷调查按钮的样式
|
2015-01-17 14:59:43 +08:00 |
 huang
|
98b44d4903
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:54:39 +08:00 |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
2015-01-17 14:54:19 +08:00 |
|
sw
|
989ff4fcbe
|
修改弹出框高度
|
2015-01-17 14:46:49 +08:00 |
|
sw
|
ebbe2f97d8
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:44:12 +08:00 |
|
sw
|
2c6e53b935
|
修改弹出框宽度
|
2015-01-17 14:43:55 +08:00 |
|
sw
|
155d48b7cb
|
问卷列表每页显示20个
|
2015-01-17 14:41:33 +08:00 |
|
alan
|
ebf63b9ba2
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:31:56 +08:00 |
|
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:19:54 +08:00 |
|
z9hang
|
26b3aab6a2
|
增加题型显示
|
2015-01-17 14:18:45 +08:00 |
|
sw
|
233070b277
|
修改火狐浏览器中显示异常
|
2015-01-17 14:16:26 +08:00 |
|
sw
|
8a05e032af
|
修改题型显示的样式
|
2015-01-17 14:10:44 +08:00 |
|
huang
|
e5da3c47ed
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:04:32 +08:00 |
|
huang
|
6bba6b2b76
|
weiwan
|
2015-01-17 14:04:20 +08:00 |
|
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:56:11 +08:00 |
|
sw
|
8e017425cf
|
增加弹出框的样式
|
2015-01-17 13:55:59 +08:00 |