Commit Graph

5065 Commits

Author SHA1 Message Date
z9hang 89e0f98034 启动匿评接口 2015-01-21 15:29:05 +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
z9hang b13f2b2dc8 添加我的作品列表接口 2015-01-21 11:28:09 +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
z9hang b949f70c64 修改数据格式转换方法 2015-01-20 17:42:18 +08:00
zhuhao 70a9a5e552 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	Gemfile
2015-01-20 16:58:15 +08:00
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
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