jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,941 Commits 98 Branches 0 Tags 0 B
Commit Graph

4352 Commits

Author SHA1 Message Date
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 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
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
sw d68486669e #1830课程--标签字体压线 2015-01-21 16:07:44 +08:00
z9hang b6207c0a47 关闭匿评 2015-01-21 15:37:59 +08:00
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
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
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 e493ae22cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-19 17:08:47 +08:00
sw 14a1f31a12 1、项目动态 -> 近期动态 
2、修复新建修改课程时，描述会有一行空白行
 2015-01-19 16:43:21 +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
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 750c8d77aa 11111 2015-01-17 15:21:18 +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 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 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
z9hang d9772ff2d0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 13:35:34 +08:00
z9hang 05b1b9741b 问卷调查页面修改为每页显示5题 2015-01-17 13:35:15 +08:00
sw 629c4aaaa1 1、#1814 未发布的问卷显示在学生的问卷总数中 
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
 2015-01-17 13:30:50 +08:00
huang 7c100342f4 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 12:35:18 +08:00
huang 6e698d45bb 修改了html边界超出问题 2015-01-17 12:34:57 +08:00
sw abd5996719 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 12:13:19 +08:00
sw b3f37f5154 111 2015-01-17 12:13:03 +08:00
sw bba213dec9 1.#1802 修复页面下方有很大一片空白 
2.修复系统文本框的padding、margin都为0
 2015-01-17 12:12:06 +08:00
z9hang 33fd43e7b6 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 12:04:29 +08:00
sw 4e19690887 1.修改取消编辑多行主观后多行主观从页面消失 
2.修改编辑后取消，第二次进入编辑却显示前一次编辑的结果 #1810 #1806
 2015-01-17 11:58:19 +08:00
z9hang 092dd61c86 修改修改资料处样式问题 2015-01-17 11:51:59 +08:00
huang e75193e35a Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 11:47:02 +08:00
alan 1602d2e439 Signed-off-by: alan <547533434@qq.com> 2015-01-17 11:46:45 +08:00
huang 0f5c3c5f4c 添加主观题统计页面及样式 2015-01-17 11:46:34 +08:00
alan b9ea3e589e 修改《邮件系统》页面 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 11:18:24 +08:00
sw e8f3bd4dbb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 11:09:39 +08:00
sw e14deeb4dd 增加限制：问卷标题最多100字，问卷描述最多300字，问卷问题最多250字，问卷选项最多200字 2015-01-17 11:05:38 +08:00
z9hang 9487ce1245 #1807课程--问卷调查：答题多行主观后，再点击打开答题页面，如图，显示html元素<br> 2015-01-17 11:02:09 +08:00
huang 3acec4b7c1 修改了总统计数 2015-01-17 10:14:07 +08:00
sw f99d159ca1 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 17:34:52 +08:00
sw d16d5fd362 单行文字/多行文字 --> 单行主观/多行主观 2015-01-16 17:31:04 +08:00
sw ae9856c01a 发布时弹出框js、css调整 2015-01-16 17:21:33 +08:00
huang b43e6558e1 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 16:48:46 +08:00
huang 59c21d81e9 修改了分母不能为0的bug 
统计结果精确到两位
 2015-01-16 16:48:20 +08:00
z9hang bbf4c4629b 问卷show页面国际化 2015-01-16 16:13:03 +08:00
sw 17b96bdb14 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:57:58 +08:00
sw 79ad33a90f 增加发布问卷的路由 2015-01-16 15:57:49 +08:00
z9hang e49dfefefb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:51:41 +08:00
z9hang dd42c89ee6 百分比除数为0问题 2015-01-16 15:51:26 +08:00
huang 2cbe801528 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:49:41 +08:00
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
sw d448599664 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:34:43 +08:00
sw fe3a84c8db 实现添加多行文字 2015-01-16 15:34:25 +08:00
z9hang b8047bec28 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:32:33 +08:00
z9hang 0a367249ae 问卷完成度显示 2015-01-16 15:32:09 +08:00
sw 65a3ddce41 1、增加新增单行文字功能 
2、修改题目后总是显示为单选题
 2015-01-16 15:05:30 +08:00
sw f46c8e8adc 新建单选、多选取消之后无法继续新建的BUG 2015-01-16 14:47:09 +08:00
sw 164c89d7b8 1.实现添加多选题 
2.单选题、多选题后面增加括号提示
 2015-01-16 14:39:40 +08:00
sw dedb70c56b 显示问题增加多选、单行文字、多行文字的显示 2015-01-16 14:03:12 +08:00
sw 2954bba411 j进入新建、修改页面时，问卷头显示为可编辑 2015-01-16 13:54:06 +08:00
sw a5cf1576f1 将新增问题栏放到问题列表下面 2015-01-16 13:44:20 +08:00