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

699 Commits

Author SHA1 Message Date
lizanle 3e2deaf0e3 添加Kaminari分页样式 2015-01-30 17:22:36 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
sw 9f6ff04e65 #1866 新建帖子时当鼠标移至“提交”按钮时，光标应变成手型的图标 2015-01-26 15:31:36 +08:00
zhuhao 167abcd6b4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-24 10:20:01 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
sw a093537ba4 去掉编辑问卷时框框 2015-01-23 15:23:13 +08:00
sw 6dad5bb416 修改问卷统计界面margin 2015-01-23 15:15:24 +08:00
sw 2450bb777d 修改问卷统计界面样式 2015-01-23 15:10:54 +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
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 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
z9hang 3911450787 问卷调查简答题输入字符过多显示超边框问题 2015-01-23 09:51:36 +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 2b5928602e 1.修改由于意见悬浮框引起的界面的padding不正确的问题 
2.修改问卷调查左侧会出现滚动条的问题
 2015-01-23 09:17:27 +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
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
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
sw e72ed1054e 修改问卷调查按钮的样式 2015-01-22 09:39:04 +08:00
lizanle 4461a66c7a 添加刷新函数 2015-01-21 17:43:06 +08:00
lizanle c82722c220 日期选择js 2015-01-22 16:41:56 +08:00
lizanle f69ed3d511 添加Kaminari分页样式和搜索结果样式 2015-01-22 16:41:13 +08:00
sw d68486669e #1830课程--标签字体压线 2015-01-21 16:07:44 +08:00
sw 7ee17b6d7c 调整问卷界面左边边距 2015-01-21 15:43:15 +08:00
sw 2f8a183168 1、替换图标图片 
2、已答问卷后问卷增加已答标志显示
 2015-01-21 11:34:53 +08:00
sw 3bdaeb20c2 1、修改问卷列表页面样式 
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
 2015-01-21 11:14:01 +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
z9hang 493b7ca695 #1821 课程--作业：导出excel相关问题 调整样式 2015-01-19 16:05:18 +08:00
lizanle 9dec76de26 搜索结果样式 2015-01-19 14:06:42 +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 233070b277 修改火狐浏览器中显示异常 2015-01-17 14:16:26 +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
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 ad7014f8b6 #1809新建/编辑问题内容或选项长度足够长且为非汉字类型，显示超出边框 2015-01-17 12:20:47 +08:00
z9hang 33fd43e7b6 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 12:04:29 +08:00
z9hang 092dd61c86 修改修改资料处样式问题 2015-01-17 11:51:59 +08:00
huang 0f5c3c5f4c 添加主观题统计页面及样式 2015-01-17 11:46:34 +08:00