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

5203 Commits

Author SHA1 Message Date
z9hang 274295c948 #2033 项目--更多--新闻：编辑新闻相关问题 2015-03-17 14:55:21 +08:00
z9hang 36554aa90a #2041 项目--问题跟踪：成功新建缺陷给出的提示信息错误 2015-03-17 10:11:38 +08:00
lizanle 86020804c9 ok 2015-03-17 09:42:04 +08:00
lizanle c77c1a81a4 html 2015-03-17 09:41:10 +08:00
lizanle f94222cac7 html 2015-03-17 09:40:45 +08:00
lizanle 33669017bf controller 2015-03-17 09:40:31 +08:00
lizanle 39cbeced87 model类 2015-03-17 09:39:12 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle 4817b3106e kindeditor资源类 2015-03-17 09:36:20 +08:00
lizanle 5c4a62dcc4 DiscussDemo代码 2015-03-16 15:29:13 +08:00
sw 747a109638 1、添加CSS文件 
2、调整首页HTML
3、去掉base_header中没用的erb语句
 2015-03-16 11:51:12 +08:00
sw 88d6b25ace 1、修改意见反馈图片 
2、去掉个人首页权限判断
 2015-03-16 09:28:18 +08:00
guange e798b7242b Merge remote branch 'remotes/origin/szzh' into guange_dev 2015-03-15 23:10:48 +08:00
guange f3d6d7c384 #2037 issue列表默认显示顺序改为最后更新的倒序 2015-03-15 16:02:49 +08:00
guange 366fbcd4d4 #2105 fixed ie8下新建帖子时上传附件导致不能发表问题 2015-03-14 12:29:09 +08:00
guange bcb162c600 #1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好 2015-03-14 12:01:08 +08:00
sw 3b0a229c43 1.修改意见反馈框默认关闭 
2、FIle--->资源库
 2015-03-13 18:01:16 +08:00
sw e4895731ae Merge branch 'develop' into szzh 2015-03-13 17:48:12 +08:00
whimlex aee987d634 邀请Trustie用户 2015-03-13 17:47:58 +08:00
sw e4e56e01b1 修改项目邀请用户失败时的提示 2015-03-13 17:46:09 +08:00
sw ca7c970094 修改意见反馈框位置 2015-03-13 17:27:24 +08:00
z9hang da23b4fd21 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-13 17:10:43 +08:00
z9hang ff65bf4ba5 app自动更新功能功能，无法下载问题修正 2015-03-13 17:10:22 +08:00
huang cc5a22f2c6 修改新建按钮样式 2015-03-13 16:16:38 +08:00
sw aa8d1741f9 修改项目发送邮箱时的正则验证 2015-03-13 15:46:00 +08:00
huang da02f3fbb4 去掉项目标签为空提示 2015-03-13 15:45:10 +08:00
sw 368a3ce1fa 修改项目创建时间显示不正确 2015-03-13 15:40:19 +08:00
huang 1ed542af09 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-13 15:40:06 +08:00
huang a010c800d6 修改权限库为空情况下403问题 
修改项目标题样式
确认发送国际化
添加小图标
 2015-03-13 15:37:54 +08:00
z9hang e165dd6572 修改编码 2015-03-13 13:41:26 +08:00
z9hang 2ccb7ff387 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-13 11:56:13 +08:00
z9hang ed674d960c 课程动态国际化问题 2015-03-13 11:55:57 +08:00
guange 08eae0e5eb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-03-13 11:30:25 +08:00
whimlex cef923b8a8 邮件邀请用户国际化 2015-03-13 09:46:05 +08:00
guange ab6c21314d #1503 老师发布的作业可以在课程动态中显示了 2015-03-12 21:57:35 +08:00
huang fb907094f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 19:32:51 +08:00
huang 47e1427ead 左侧工具栏添加功能：左侧统计数目为零的手不显示 2015-03-12 19:29:44 +08:00
whimlex 28321deeb5 邮件邀请用户 2015-03-12 18:04:12 +08:00
whimlex 18422ecf6a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-12 17:50:15 +08:00
whimlex 1e5fac32b4 添加邮箱验证 2015-03-12 17:48:31 +08:00
sw fd8edc9a02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:34:25 +08:00
sw 2b28448397 Merge branch 'guange_dev' into szzh 2015-03-12 17:33:18 +08:00
huang ab57e7e432 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:23:28 +08:00
huang 96b2627fda 修改邮件居中样式及提示 2015-03-12 17:22:52 +08:00
sw 362bad594f 修改项目发送邮件邀请页面样式，以及提示 2015-03-12 17:18:18 +08:00
whimlex 3a1f0aec55 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:14:12 +08:00
whimlex 5f88ffc5d0 项目邀请用户国际化，js判断邮件格式 2015-03-12 17:13:46 +08:00
sw 7dc6f76060 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-03-12 17:09:32 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
sw ceb6ccf908 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:06:04 +08:00
sw 971c278de5 #2026 作业创建时间->截至时间 2015-03-12 17:02:47 +08:00
huang 77bf3be20d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_users.html.erb
 2015-03-12 16:49:42 +08:00
huang b809e8844c 修改项目中添加标签按钮显示异常 2015-03-12 16:42:18 +08:00
z9hang 2d05c3273f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:33:43 +08:00
z9hang 8190403380 app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文） 2015-03-12 16:33:31 +08:00
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
sw 312d7660b2 增加邀请成功后的提示 
邀请成功后跳转页面修改
调整翻页控件的样式
 2015-03-12 16:32:20 +08:00
huang 4bfc72dc28 用新表统计动态 
修改关注样式
 2015-03-12 15:56:03 +08:00
sw 2ee04d55f2 修改项目邀请用户的界面 2015-03-12 15:46:24 +08:00
huang 6fa5863665 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:14:16 +08:00
huang 0ba7ef0560 修改邮箱邀请时，邮件为空时提示错误 2015-03-12 15:13:41 +08:00
z9hang 7e7da7e445 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 11:18:00 +08:00
z9hang a05061af73 #1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程 2015-03-12 11:17:36 +08:00
sw 717be2b045 修改部分用户的用户首页报错 2015-03-12 10:29:19 +08:00
sw 5340ad7fc1 修改组织首页不显示私有项目 2015-03-12 10:20:28 +08:00
sw 69eecf49d1 还原冲突 2015-03-12 09:52:57 +08:00
sw 2ac2c1848c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-12 09:52:50 +08:00
whimlex 6f4ef81eb9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 09:48:09 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47:42 +08:00
sw 5258b7585b 处理冲突还原代码 2015-03-12 09:36:03 +08:00
huang 64bbbff879 添加里程碑 2015-03-12 09:03:25 +08:00
sw b27bb34662 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-12 09:00:12 +08:00
huang c773e0fd39 JS冲突，去掉多余标点 2015-03-12 08:42:39 +08:00
huang 29655838f0 项目超过的部分用“展示更多信息”拉开 2015-03-11 23:50:37 +08:00
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理 2015-03-11 22:42:42 +08:00
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-11 17:27:02 +08:00
whimlex 57c8575470 新版项目模块国际化，目前完成各项目主页，项目动态，项目评分 2015-03-11 17:23:38 +08:00
sw 4b831c9e65 #2001 项目--工具集中wiki-“查看差别”中有html标签 2015-03-11 17:22:23 +08:00
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-11 16:44:54 +08:00
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的 2015-03-11 16:42:02 +08:00
sw 04e5aee3c2 版本库和新建版本库两个不同的权限 2015-03-11 16:07:42 +08:00
lizanle d7c550b15b 给projects项目新建的时候添加创建人 2015-03-11 15:51:25 +08:00
sw 4d58116da5 #1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样 2015-03-11 15:44:22 +08:00
sw 1e262ec731 修改项目上传资源链接 2015-03-11 15:32:50 +08:00
lizanle 88ee202a4c issue2012,分页显示方式修改 2015-03-11 15:30:36 +08:00
lizanle 8f3f9ea2ed Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-11 15:30:17 +08:00
lizanle a8a62ab750 issue2012,分页显示方式修改 2015-03-11 15:30:00 +08:00
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:16:43 +08:00
sw 27e72c1f39 #2000 增加项目每个模块的访问控制 2015-03-11 15:14:23 +08:00
huang 078d2fa488 解决项目中文档为空情况显示异常 
新建文件文件术语改变
 2015-03-11 15:14:13 +08:00
z9hang ec455de3d4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:14:04 +08:00
z9hang 11c8c0510a app版本管理报错问题 2015-03-11 15:13:41 +08:00
z9hang c552a22fb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 14:52:36 +08:00
z9hang 14fe487835 将app个人课程动态接口中作业留言归类到更新了作业中 2015-03-11 14:52:07 +08:00
huang cbfb72bd5b 修改新建资源库显示 2015-03-11 14:32:29 +08:00
huang aa2a41d368 修改文档 从项目动态点入后导航栏显示错误 2015-03-11 11:55:55 +08:00
whimlex 93df92e660 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:55:42 +08:00
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-11 11:55:13 +08:00
whimlex 0eafbb92d5 意见反馈模块国际化 2015-03-11 11:53:42 +08:00
huang 49cf6e1319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:38:42 +08:00
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态 2015-03-11 11:38:09 +08:00
z9hang 743a642cf1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:23:23 +08:00
z9hang eec155f077 课程资源页面app自动登陆处理 2015-03-11 11:22:58 +08:00
sw b0eba062a8 修复项目、课程留言不正确的BUG 2015-03-11 11:20:43 +08:00
guange 38c3b40ca1 #1701 修复在编辑作业时，删附件会导致名称编辑内容丢失 2015-03-11 10:52:09 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
sw aa3ab86fb0 #2013 个人主页--留言--留言输入框不见了 2015-03-11 09:48:35 +08:00
guange e5e46819b4 #867 新建缺陷：校验失败也要保存上传文件信息 2015-03-10 22:35:36 +08:00
guange fd676f13b5 #994 作品下载：资源排序修正 2015-03-10 21:50:47 +08:00
z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-10 17:21:59 +08:00
z9hang 43e9a9a495 1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成 2015-03-10 17:20:30 +08:00
sw 138fac9509 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/homework_attach/_jour.html.erb
	app/views/homework_attach/_journal_reply_items.html.erb
	app/views/homework_attach/_showjour.html.erb
	app/views/words/_feedback.html.erb
	app/views/words/_journal_reply_items.html.erb
	app/views/words/_message.html.erb
 2015-03-10 17:11:52 +08:00
lizanle 87394fe4ce issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:27:32 +08:00
lizanle 58cbfa6af7 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-10 16:26:50 +08:00
lizanle 383d90bb12 issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:26:22 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
z9hang 87f0d73ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-10 14:41:59 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
sw 4034e3565a 修改新建项目html代码不争取 
修改新建项目提示信息有两个
 2015-03-10 14:36:49 +08:00
sw 8a7fc85e8b 系统中部分回复的本地化文件缺失 2015-03-10 14:25:17 +08:00
guange 5d1a5a0b11 #1738 修复图片下载次数不正确问题 2015-03-10 11:50:27 +08:00
sw bdd1980876 修复个人动态首页报错 2015-03-10 11:39:01 +08:00
whimlex 57c97f3dc8 层级回复留言标签修改 2015-03-10 11:12:38 +08:00
z9hang 08f625446e app版本管理功能新建版本界面 2015-03-10 10:18:56 +08:00
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml
 2015-03-10 10:08:18 +08:00
whimlex 115eb38a02 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
sw 61167e55c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 17:37:49 +08:00
z9hang 052afefa5e 用户课程动态按更新时间倒序排列 2015-03-09 17:32:38 +08:00
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能 2015-03-09 17:28:17 +08:00
z9hang 26adc13ca2 修改用户课程动态接口 2015-03-09 15:45:09 +08:00
sw 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
z9hang 83cc1b41f3 修正api配置 2015-03-09 15:27:01 +08:00
z9hang d634532789 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-09 15:26:02 +08:00
z9hang d96b87cf42 修改用户课程动态接口返回数据 2015-03-09 15:23:24 +08:00
sw d1912865d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 14:01:46 +08:00
huang 0402fee6de 修改邮件邀请 2015-03-09 11:31:42 +08:00
huang 402f3701da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 10:31:51 +08:00
huang d947ebff0c 添加国际化 2015-03-09 10:31:05 +08:00
sw 8c44d25750 处理资源标签搜索中标签丢失的问题 2015-03-09 10:27:32 +08:00
sw 659a87ef60 修复部分本地化标签丢失 2015-03-09 09:11:57 +08:00
lizanle bd9a645c2c project动态分页页码数显示个数减少 2015-03-08 17:36:45 +08:00
lizanle 53d144e8d2 project动态当前页在最后。 2015-03-08 17:33:55 +08:00
sw 7c03b03fa9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 17:20:50 +08:00
sw b0897638d9 修改进入问卷结果页面描述样式显示不正确的BUG 2015-03-07 17:20:33 +08:00
sw 6a7c7a732c 修改首页报500 2015-03-07 17:08:36 +08:00
z9hang 610746301f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:20:28 +08:00
z9hang 5a3d324ce4 添加课程留言列表接口 2015-03-07 16:19:55 +08:00
sw 3af9c63ae0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:16:06 +08:00
alan 838c39da69 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/projects/_invite_members_by_mail.html.erb
 2015-03-07 16:08:54 +08:00
alan 48ac3dbea8 修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 16:07:48 +08:00
z9hang 0f2ded4d25 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 15:36:16 +08:00
z9hang 782071ab64 显示接口不能用问题，app版本管理部分代码 2015-03-07 15:36:00 +08:00
huang ba09213023 添加新闻模块、部分样式 2015-03-07 15:32:50 +08:00
sw b292df42d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 15:32:16 +08:00
sw c6788e2f40 修复首页报错 2015-03-07 15:30:37 +08:00
huang eb6deed682 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 14:47:39 +08:00
huang 749e10592d 修改邮件页面样式 2015-03-07 14:47:12 +08:00
sw fea7bd6ad1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 14:44:10 +08:00
sw 3f3bb62678 非项目成员添加新闻、添加讨论区按钮不可见 2015-03-07 14:43:54 +08:00
lizanle a701eb91a2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-07 12:26:59 +08:00
lizanle e8bdc13f24 缺陷1975，打开project 330的时候报错 2015-03-07 12:25:42 +08:00
sw 945b9ff9cf 修复进入我的动态，关注人没有进行权限过滤的BUG 2015-03-07 11:38:15 +08:00
alan 6cf7e156d1 Signed-off-by: alan <547533434@qq.com> 2015-03-07 11:35:57 +08:00
alan 5c1a6f7754 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-03-07 11:35:49 +08:00
sw 3e3cde0805 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:32:28 +08:00
alan 151fc561ac 修改邮件样式，增加相应的提示 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 11:30:25 +08:00
sw ff2b4c610c 1、修改用户动态每页显示条目不正确 
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
 2015-03-07 11:30:21 +08:00
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:15:30 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +08:00
huang ce792f6ce8 修改邮件发送界面 2015-03-07 09:32:27 +08:00
huang b3cbfd39ca 修改一些缺陷，删掉多余的文件 2015-03-07 01:07:50 +08:00
huang f898e2aa91 16:22 2015-03-06 16:22:07 +08:00
z9hang 6e7b294452 注释掉不用的ＡＰＩ 2015-03-06 15:37:24 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
 2015-03-06 15:36:47 +08:00
z9hang 754acc6945 移动端版本管理 2015-03-06 15:33:59 +08:00
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 a6b3ddcfcb Merge branch 'szzh' into dev_zanle 2015-03-06 14:58:49 +08:00
sw e58f5d4af5 #1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储 2015-03-06 14:56:27 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
lizanle 10faab0129 新建的项目发布新问题报500 2015-03-06 11:53:16 +08:00
lizanle 140cb81748 测试版发布课程通知和讨论区发布新帖报500 2015-03-06 11:38:32 +08:00
sw e326934027 调整组织首页缺少项目时的显示样式 2015-03-06 10:58:12 +08:00
sw 5692cbf202 #1965 公共贴吧取消软件创客入口 2015-03-06 09:50:17 +08:00
sw 3c1f1d8bad 修改部分浏览器下发布问卷、取消发布问卷样式显示不正确 2015-03-06 09:45:38 +08:00
sw 26081c6120 新建项目时增加不选择所属组织 2015-03-06 09:27:43 +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 d947a914cc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 17:43:00 +08:00
sw e2307366f6 实现组织的增、删、改、查功能及相关界面 2015-03-05 17:42:31 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
lizanle 8d322edb90 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/views/projects/show.html.erb
 2015-03-05 17:24:19 +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
z9hang 04dea372c5 添加意见反馈接口 2015-03-05 10:09:19 +08:00
sw a64671f9de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 09:27:26 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00
z9hang d1651f7252 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 09:26:33 +08:00
z9hang d01aa5f15c 关注接口限制不能关注自己 2015-03-05 09:26:13 +08:00
sw ef5b7c9fca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-05 08:45:53 +08:00
sw 7f249d29f4 修整页面代码 2015-03-05 08:45:32 +08:00
z9hang 199ef4ebe6 匿评作品详情列表补上cur_page字段 2015-03-04 17:14:09 +08:00
z9hang 509a37a575 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-04 17:04:37 +08:00
z9hang 411d201fc3 作业详情接口添加留言列表 2015-03-04 17:04:07 +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 2c4e864080 #1949 学生可以通过url访问老师并未发布的问卷并进行作答 2015-03-03 17:53:15 +08:00
sw da21e61afd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-03 17:37:27 +08:00
z9hang 451a022d5f 作业详情、作业列表返回数据修改 2015-03-03 17:36:05 +08:00
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG 2015-03-03 17:35:46 +08:00
z9hang 7b5eb9db8b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-03 09:12:12 +08:00
z9hang 32264fb4a6 课程动态接口修改为用户所有课程动态接口 2015-03-03 09:11:47 +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 f374bfd7e2 修复《窗口跳转问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-02 14:47:50 +08:00
sw d999a9f4a6 修复新建课程时报错的BUG 2015-03-02 14:33:35 +08:00
z9hang 18271946d7 作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息） 2015-03-01 17:31:38 +08:00
z9hang 2f762973b4 课程动态接口返回数据格式修改 2015-03-01 16:32:10 +08:00
z9hang 196ceff138 返回课程的接口补上当前用户是否为课程成员，课程老师信息 2015-02-12 15:51:52 +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
z9hang a6882d0f88 获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段 2015-02-10 17:03:59 +08:00
z9hang e4442bfe04 用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段 2015-02-10 16:36:29 +08:00
z9hang 85782cdb8d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-10 10:30:10 +08:00
z9hang 3018ee206c 修改时间格式解析 2015-02-10 10:29:47 +08:00
sw 5ef1bc1d02 修改本地登录后报错 
修改zh.yml文件异常
 2015-02-10 10:21:46 +08:00
sw 73d2e2e5e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-10 09:07:04 +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
z9hang 103a411b40 修改用户搜索接口 2015-02-09 16:24:45 +08:00
sw f380d781e7 增加根据已有课程复制成新课程的路由以及方法实现 2015-02-09 10:28:33 +08:00
sw 2ceb21b83b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-09 09:16:01 +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 6e72e07028 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile
	Gemfile.lock
 2015-02-06 18:16:20 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
z9hang d913f89a82 添加课程动态接口 2015-02-06 15:52:34 +08:00
z9hang cc83b30fc6 修正搜索用户接口，添加课程动态接口 2015-02-06 14:29:42 +08:00
sw 859889b750 简化查询匿评数量的代码 2015-02-06 11:27:37 +08:00
sw 3c8f851c37 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-06 11:22:48 +08:00
sw 4cdb3c83dd 增加获取用户在指定课程内作业数量的接口 2015-02-06 11:22:29 +08:00
sw 0b41afa571 修改作业匿评界面，左侧附件名显示混乱 2015-02-06 10:51:29 +08:00
z9hang cd25628208 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-06 10:36:06 +08:00
z9hang b1903dba11 添加课程留言接口 2015-02-06 10:35:38 +08:00
lizanle d902d76ae2 将google统计换为了百度统计 2015-02-06 10:15:18 +08:00
sw 50244e6860 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-06 09:32:50 +08:00
sw 95b757ba09 修改问卷发布成功和取消发布成功后弹框提示样式 2015-02-06 09:32:32 +08:00
z9hang 0dfa428377 手机ＡＰＩ添加回复留言接口 2015-02-05 17:32:19 +08:00
z9hang ef203ff40c 修正作业留言接口 2015-02-05 16:11:35 +08:00
z9hang d6813e5996 项目新闻报错问题，作业留言接口 2015-02-05 15:54:50 +08:00
z9hang d6b82c3549 修正课程通知评论接口 2015-02-04 14:39:46 +08:00
z9hang 4fdc1b97a5 配置API comment接口，修正显示课程通知接口未判断权限问题 2015-02-04 14:07:00 +08:00
z9hang 3cd97f8a70 API添加comment模块 2015-02-04 13:47:52 +08:00
z9hang d1e2bfd6c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-04 12:27:47 +08:00
z9hang 6d79c2cf83 手机端ＡＰＩ添加新闻评论实体Comment，新闻实体中引用Comment,课程新闻列表添加权限判断，并修正该接口不可用问题 2015-02-04 11:57:37 +08:00
sw da56477ed0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 16:34:24 +08:00
z9hang 7e6d4e6215 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 16:03:49 +08:00
z9hang 8216453a02 匿评作品详情返回结果中添加comment_status字段 0:所属作业尚未开启匿评，1：匿评中 2：匿评结束 2015-02-03 16:03:30 +08:00
z9hang 87e658a0f1 修改评论接口，匿评结束后依然可以评论（属于留言） 2015-02-03 15:46:17 +08:00
huang 59e7f2f28b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 15:23:05 +08:00
huang 8bef9420cf 修改企业版中自己能看到自己的私有项目 2015-02-03 15:22:45 +08:00
z9hang 9708c50899 添加作品评分接口 2015-02-03 15:10:21 +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 320ee9289a #1897 修改点击DTS测试之后，TAB页背景色变化 2015-02-03 09:52:35 +08:00
alan 44c783a61b 帖子的邮件通知改成只有版主收到 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:31:27 +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
alan 858b5ea97c 修改《讨论吧发帖发送邮件错误问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 11:00:23 +08:00
lizanle fa8475387a Merge branch 'szzh' into dev_zanle 2015-02-02 10:06:53 +08:00
lizanle 8f5e613477 添加一些对代码理解的注释 2015-02-02 09:53:14 +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 944dc33212 注释掉API文档 2015-01-31 17:14:47 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
alan 9681e08600 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile.lock
 2015-01-31 16:43:46 +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
alan 48cb0e0450 email verify 2015-01-31 15:04:48 +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
sw 8289ca6c89 11111 2015-01-31 11:14:55 +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
z9hang d8571ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:58:18 +08:00
z9hang 6bd202e80a 课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合 2015-01-30 16:58:05 +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
alan 661dbe5219 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 14:52:48 +08:00
alan a467736a5e 修改《多字段唯一性判断》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 14:52: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 b453d16228 将controller里的两个方法挪到helper 2015-01-30 13:30:06 +08:00
lizanle 90649209ca 封装，简化，重新编排代码格式，并删掉了一些无用的方法代码 2015-01-30 13:29:25 +08:00
lizanle abc5dd1c74 添加表格样式 2015-01-30 12:07:07 +08:00
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西 2015-01-30 12:04:33 +08:00
lizanle e761cd5f22 关键字查询会丢失样式 2015-01-30 11:52:37 +08:00
sw 87fdd840ec 首页加入项目增加已是当前项目的判断 2015-01-30 11:39:19 +08:00
lizanle 852bb940a2 过滤掉日志中日志分析的请求 2015-01-30 11:31:41 +08:00
sw a265556cfe 搜索项目时增加js验证增加 2015-01-30 11:00:18 +08:00
sw 0d5384c6d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 10:37:58 +08:00
sw 97ec208b1a Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 10:37:05 +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
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度 
#@teachers= searchTeacherAndAssistant(@course)
    #@canShowRealName = isCourseTeacher(User.current.id,@course)
 2015-01-30 10:27:21 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
sw 6bca666f08 #1896 课程--问卷调查--新建题目时点击确定按钮无反应 2015-01-30 10:24:06 +08:00
sw c56f641163 修改首页加入项目按钮没反应 2015-01-30 09:57:43 +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 a6488da7fa 修改ＡＰＩ上线问题 2015-01-28 10:45:20 +08:00
z9hang f7dbb24d35 修改测试版上线问题 2015-01-28 10:31:30 +08:00
z9hang 222e2cc135 修改ErrorHandler未能加载问题 2015-01-28 09:25:58 +08:00
z9hang f793cff398 改为开发模式下才调用api文档 2015-01-27 17:34:02 +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
alan 5434a5b087 修改《admin可以访问courses和users列表》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:29:09 +08:00
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-27 15:12:56 +08:00
alan 00c0ddc600 admin查看course和user列表 
Signed-off-by: alan <547533434@qq.com>
 2015-01-27 15:11:24 +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
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
lizanle d8b5252279 调整了注释 2015-01-27 14:21:51 +08:00
lizanle 5afbf6dbca 调整了注释 2015-01-27 14:19:46 +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 fe06ca503a 增加poll colsed_at的赋值 2015-01-27 09:55:02 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
z9hang 4b3621905e 修正课程成员搜索bug 2015-01-27 09:06:00 +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
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
z9hang b2396df68c 优化下代码 2015-01-23 16:31:41 +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
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库 2015-01-23 14:10:38 +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
z9hang 4a672416e3 匿评作品详情接口添加评论的回复输出 2015-01-23 11:42:35 +08:00
lizanle df88cb6eba 管理员才能查看 2015-01-23 11:14:48 +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
alan 942035f698 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 10:03:45 +08:00
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com> 2015-01-23 10:03: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
lizanle 27fde6c641 添加注释 2015-01-23 09:47:54 +08:00
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 09:47:33 +08:00
lizanle 03ae5fdeac 添加注释 2015-01-23 09:47:22 +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
lizanle 4fe8b23069 去掉不必要的代码，修改注释，格式 2015-01-22 17:50:24 +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
z9hang f1693e237b 修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言） 2015-01-22 17:21:15 +08:00
lizanle 8b6750c1ed 删除日志修改为只能修改当天的日志：这样子保护原来的日志，又能进行当天的调试 2015-01-22 17:04:12 +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
lizanle c0b12ac60c 去掉冗余代码 2015-01-21 17:42:48 +08:00
lizanle 7fc2ea0484 修改国际化文件名字 2015-01-22 17:22:29 +08:00
lizanle 566f59c49e 修改只有管理员才能查看 2015-01-22 16:52:09 +08:00
lizanle 0502eb16a6 添加了访问统计页面和耗时分析页面 2015-01-22 16:47:29 +08:00
lizanle 59a47002ae 重构，修正了许多的空指针异常 2015-01-22 16:46:06 +08:00
lizanle 061e4599c3 重构，修正了许多的空指针异常 2015-01-22 16:45:57 +08:00
lizanle c668b72dac 重构 2015-01-22 16:45:18 +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
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 49ff5659d9 系统日志查看相关代码，资源 2015-01-19 14:09:53 +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 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