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

3641 Commits

Author SHA1 Message Date
huang b2b978d540 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-06 15:27:32 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
 2015-03-06 15:23:42 +08:00
sw e58f5d4af5 #1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储 2015-03-06 14:56:27 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw e326934027 调整组织首页缺少项目时的显示样式 2015-03-06 10:58:12 +08:00
sw 3c1f1d8bad 修改部分浏览器下发布问卷、取消发布问卷样式显示不正确 2015-03-06 09:45:38 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
sw e2307366f6 实现组织的增、删、改、查功能及相关界面 2015-03-05 17:42:31 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
sw 3c4b502e97 1、修改进入组织主页项目列表显示不正确的问题 
2、admin页面增加组织列表显示
 2015-03-05 17:03:44 +08:00
sw 5f8595d874 admin页面增加组织列表 2015-03-05 15:27:22 +08:00
sw 45fe622f26 1、修改进入系统首页报错 
2、增加组织的默认图片
 2015-03-05 14:42:46 +08:00
sw 3b4bf8b99d 增加组织的index界面，以及index界面到组织首页的跳转 2015-03-05 14:15:07 +08:00
sw dead08a0d6 添加、修改项目增加所属组织的选择 2015-03-05 11:53:28 +08:00
sw d1edd86e11 1、修改组织首页项目获取 
2、修改此组织没有项目时的样式
 2015-03-05 10:40:10 +08:00
sw 7f249d29f4 修整页面代码 2015-03-05 08:45:32 +08:00
sw a2d986f70c 修改页面代码 2015-03-04 16:55:25 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw 032e28067d #1959 项目评分是0的，就不显示了！ 2015-03-04 11:34:01 +08:00
sw 33e9a3e326 #1958 关注有用户0个后边取消冒号 2015-03-04 10:02:40 +08:00
sw 5bba54432d #1930 项目缺陷显示个数修改 2015-03-04 09:52:01 +08:00
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG 2015-03-03 17:35:46 +08:00
sw bbeaa6e80c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-02 17:43:16 +08:00
sw 90d9e77b32 修复课程主页没有2015年课程 2015-03-02 17:31:04 +08:00
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-02 14:50:10 +08:00
alan c00deabf75 修改《邮件样式》 
Signed-off-by: alan <547533434@qq.com>
 2015-02-12 00:15:10 +08:00
alan aa8f58530c 给黄总提供接口 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 23:34:10 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
sw 5ef1bc1d02 修改本地登录后报错 
修改zh.yml文件异常
 2015-02-10 10:21:46 +08:00
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/_search_project.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-02-09 22:14:16 +08:00
whimlex 59a2c8283a 国际化结构调整 2015-02-09 22:07:21 +08:00
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify 2015-02-06 18:19:35 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
sw 0b41afa571 修改作业匿评界面，左侧附件名显示混乱 2015-02-06 10:51:29 +08:00
lizanle d902d76ae2 将google统计换为了百度统计 2015-02-06 10:15:18 +08:00
sw 95b757ba09 修改问卷发布成功和取消发布成功后弹框提示样式 2015-02-06 09:32:32 +08:00
sw a752ade770 #1922 测试版--平台上传附件功能，附件显示问题 2015-02-03 15:02:45 +08:00
sw 6226974f0b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 11:25:31 +08:00
huang 56fa330fed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 11:25:08 +08:00
huang 26b1f9f433 修改企业版中存在的一些bug 
最多只显示十个项目
提示的样式
代码优化
 2015-02-03 11:24:46 +08:00
sw 7ab5eeab65 #1839上传附件名延后省略号显示 2015-02-03 10:42:36 +08:00
sw 93410e0d57 #1919 取消作业留言的动态显示 2015-02-02 17:23:32 +08:00
alan 646678c9db 修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:01:07 +08:00
sw a29887cfed 关闭问卷后，发布问卷和其他的发布问卷框框未对齐 2015-02-02 09:43:35 +08:00
sw 78d8a0a1c6 修改意见反馈折叠后背景为透明 2015-02-02 09:09:45 +08:00
sw 6261d95eba 首页显示异常 2015-01-31 17:27:52 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
sw 79d1a069c2 修改公司名字过长首页显示有问题 2015-01-31 16:19:13 +08:00
huang 2a65ba3af8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 16:10:33 +08:00
huang 1dd8724656 修改样式 2015-01-31 16:10:20 +08:00
alan 1010003737 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:55:17 +08:00
alan 134f0d5557 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:49:00 +08:00
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:46:30 +08:00
alan 9e36f9264c 修改《竞赛作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-31 15:46:10 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
sw 2cc31e5c72 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 14:48:08 +08:00
whimlex c413ce1405 项目企业模块国际化修改 2015-01-31 14:44:16 +08:00
sw f3b99ec045 修改项目首页搜索按钮移位 2015-01-31 14:37:24 +08:00
sw 9b854f4264 修改编辑作业列表显示异常 2015-01-31 14:29:11 +08:00
sw d76c0a5365 修改新建作业界面显示异常 2015-01-31 14:28:02 +08:00
whimlex 6a22e47b0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 10:55:31 +08:00
whimlex 57237c76d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 10:55:08 +08:00
whimlex 3e1d90630e 找回密码，邮件激活国际化 2015-01-31 10:48:09 +08:00
alan 3484fd34bb merge dev_zanle branch 
Signed-off-by: alan <547533434@qq.com>
 2015-01-31 10:47:09 +08:00
alan 7710af316d Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh 2015-01-31 10:46:29 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +08:00
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 17:58:58 +08:00
huang be9ff9b4bb 修改控制器名 
解决列表中企业重名的bug
 2015-01-30 17:58:41 +08:00
alan e34e87bb82 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 17:48:18 +08:00
alan 2f168dd4d7 修改《课程动态》样式 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 17:47:57 +08:00
lizanle 999b395763 添加Kaminari分页样式文件， 
_paginator.html.erb 这是总的入口文件，可以通过修改它来调整显示的整体结构
比如我不需要“首页”，”末页“这两个链接，那么我就在这个文件里面将对应的代码删除
_page.html.erb 对应页码链接
_first_page.html.erb / _last_page.html.erb 对应“首页”和“末页”的链接
_prev_page.html.erb / _next_page.html.erb 对应“上一页”和“下一页”的链接
_gap.html.erb 空隙的显示，默认是中间的省略号(...)
 2015-01-30 17:26:23 +08:00
lizanle a47cb8eb65 去掉原有的样式分页样式 2015-01-30 17:24:56 +08:00
sw 269f1835b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:19:35 +08:00
sw 34c68a59fc 关闭问卷之后老师容许查看统计结果 2015-01-30 16:19:05 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 16:05:36 +08:00
huang 666ebf9b5b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:45:47 +08:00
huang 9e470fa25c meigia 2015-01-30 14:45:33 +08:00
sw 0d6261dfa7 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/helpers/projects_helper.rb
 2015-01-30 14:38:54 +08:00
sw 31c78279ea 删除多余的一个end 2015-01-30 14:31:15 +08:00
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
 2015-01-30 14:27:56 +08:00
sw 36c07f9664 修改拒绝项目成员加入后，页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
lizanle 22dd4981c0 修改分页函数 2015-01-30 13:35:10 +08:00
lizanle abc5dd1c74 添加表格样式 2015-01-30 12:07:07 +08:00
sw 87fdd840ec 首页加入项目增加已是当前项目的判断 2015-01-30 11:39:19 +08:00
sw a265556cfe 搜索项目时增加js验证增加 2015-01-30 11:00:18 +08:00
whimlex deadea81fa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 10:35:23 +08:00
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
 2015-01-30 10:34:47 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
sw 6bca666f08 #1896 课程--问卷调查--新建题目时点击确定按钮无反应 2015-01-30 10:24:06 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
sw 2978d9020f Merge branch 'develop' into szzh 2015-01-29 17:44:37 +08:00
sw c366cc90e7 修改删除问卷后相关BUG 2015-01-29 17:33:10 +08:00
sw a772ef329d 修改问卷时增加问卷标题不能为空的提示 2015-01-29 17:01:19 +08:00
sw 108435f933 新增题目时，增加标题不能为空的js验证 2015-01-29 16:53:11 +08:00
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
sw bf75f32903 修改个人留言界面，左侧个人信息样式显示不正确 2015-01-29 16:22:26 +08:00
sw af7e605f76 添加新闻时，“提交”按钮和“取消”按钮之间有一竖 2015-01-29 16:13:36 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-28 12:32:16 +08:00
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致 2015-01-28 12:13:17 +08:00
z9hang 91a8078cae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 16:03:53 +08:00
z9hang cf1cd9201c 修改上传资源弹框样式 2015-01-27 16:03:38 +08:00
alan 20f4b5c44b 修改《contest新建的样式》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:43:06 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
sw 5950f0404b #1832 不显示无数据的字段，字段名 2015-01-27 11:35:19 +08:00
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 11:06:42 +08:00
sw 649c65fbe2 国际化部分代码 2015-01-27 10:14:05 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00
alan 36ec204f40 修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-26 16:54:46 +08:00
alan f1495686e9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-26 15:54:38 +08:00
alan 0944cc4ca8 < 邮件格式调整> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-26 15:54:23 +08:00
sw d135274281 修改重复加入项目提示语 2015-01-26 15:41:10 +08:00
sw 87f19f7a8b #1873 加入”==》“申请加入” 2015-01-26 14:25:39 +08:00
sw 2f8d57797c 增加弹出框的宽度 2015-01-26 14:09:56 +08:00
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 23:12:51 +08:00
sw 02f01c1aba 修改首页加入项目 2015-01-23 17:10:21 +08:00
alan 7ef6f8adfb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 15:55:44 +08:00
alan a3cf79db96 修改编码问题 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 15:55:29 +08:00
sw 5e4279e158 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 15:23:31 +08:00
sw 2450bb777d 修改问卷统计界面样式 2015-01-23 15:10:54 +08:00
whimlex 14685f2656 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 15:09:03 +08:00
whimlex 38157e560e 课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛 2015-01-23 15:08:34 +08:00
alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/application.rb
 2015-01-23 14:57:09 +08:00
alan 61634585f5 修改《news，forum模块发送邮件的模板》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 14:51:11 +08:00
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断 
2、去掉错误的插件引用
 2015-01-23 14:43:40 +08:00
sw dbdae2ac7e 问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示 2015-01-23 14:25:29 +08:00
sw 016f4f9a0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 14:11:02 +08:00
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
 2015-01-23 13:49:13 +08:00
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 13:47:38 +08:00
alan b20204fedd 修改《邮件重发一样引发的bug》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 13:42:25 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +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
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
sw bb64dc9452 修改问卷调查按钮的样式 2015-01-23 10:19:23 +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
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 09:47:33 +08:00
huang c6deffe245 修改首页样式显示异常 2015-01-23 09:47:13 +08:00
sw ae31d0b861 #1851课程作业增加状态显示 2015-01-23 09:42:08 +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
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
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
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 c0b12ac60c 去掉冗余代码 2015-01-21 17:42:48 +08:00
lizanle 7fc2ea0484 修改国际化文件名字 2015-01-22 17:22:29 +08:00
lizanle 0502eb16a6 添加了访问统计页面和耗时分析页面 2015-01-22 16:47:29 +08:00
lizanle c668b72dac 重构 2015-01-22 16:45:18 +08:00
sw d68486669e #1830课程--标签字体压线 2015-01-21 16:07:44 +08:00
sw 77b8bf18c8 #1842 修改部分页面描述问题 2015-01-21 11:50:33 +08:00
sw a53831a6b5 修改当问卷标题过长时，学生查看问卷列表省略号过早出现 2015-01-21 11:44:49 +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 f3062da237 修改空数据时，课程首页无法加载(居然是死循环。。。) 2015-01-21 09:18:29 +08:00
sw 77cb2b0893 1.修改学生已完成的问卷标题过长时显示异常 
2.增加取消发布时的提示
 2015-01-20 16:50:16 +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
alan 3315116832 修改《课程--留言：给课程留言却返回404》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-19 14:35:30 +08:00
lizanle 49ff5659d9 系统日志查看相关代码，资源 2015-01-19 14:09:53 +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 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
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
sw 629c4aaaa1 1、#1814 未发布的问卷显示在学生的问卷总数中 
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
 2015-01-17 13:30:50 +08:00