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

1514 Commits

Author SHA1 Message Date
huang c376c0e38f 新建版本 --新页面设计 2015-08-01 11:25:33 +08:00
huang e70748fd81 去掉项目辅助工具（dts、yun） 2015-08-01 09:57:44 +08:00
guange 909521df54 Merge remote-tracking branch 'origin/szzh' into gitlab_guange 2015-08-01 09:41:01 +08:00
sw 3e5af49281 点击测试时增加事件的发送 2015-07-30 20:36:00 +08:00
sw a68fcf74aa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-29 18:26:21 +08:00
sw ce89c7d119 用户留言后界面的刷新，留言的分页显示 2015-07-29 18:26:04 +08:00
sw 9c704b7dc1 个人主页留言静态页面 
更新css
路由及相关代码整理
 2015-07-29 10:34:04 +08:00
lizanle db2a030981 导入其他问卷 2015-07-29 10:10:41 +08:00
sw 6091369e02 增加学校logo的上传功能，以及实时预览效果 2015-07-27 18:20:20 +08:00
sw 7c818ce59a admin界面增加学校列表显示，以及按名称过滤功能 2015-07-27 16:07:29 +08:00
lizanle ebfa2f6749 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-27 10:03:55 +08:00
lizanle e74ca78b0e 日志级别在debug环境下 调整为debug 2015-07-27 10:03:45 +08:00
huang f37cbd3e0d 修订改为提交次数 2015-07-26 14:35:41 +08:00
huang 839cbf2a55 添加一年提交次数 2015-07-26 13:43:56 +08:00
huang 69b9cbee80 版本库代码统计（未完成） 2015-07-24 16:56:37 +08:00
huang 518ce15df5 修改添加成员提示 2015-07-24 14:01:15 +08:00
huang b6812d8810 Merge branch 'szzh' into dev_hjq 2015-07-24 09:49:06 +08:00
huang 127a243bd2 版本库：用户最近一月提交次数统计 2015-07-24 09:18:34 +08:00
huang a2c2f41908 版本库：最近一月的提交次数统计 2015-07-23 17:32:48 +08:00
sw 95af2ab20b 作品列表界面导出列表功能： 
普通作业：不显示匿评评分
匿评作业：显示匿评评分
编程作业：显示系统评分
 2015-07-23 10:33:54 +08:00
huang ae4eed45c3 添加 新项目工具 2015-07-22 10:05:21 +08:00
guange 7d0a53ec86 merge 2015-07-21 20:56:33 +08:00
huang 069dad053b Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/_tools_expand.html.erb
	config/locales/projects/zh.yml
 2015-07-21 10:40:02 +08:00
huang ce6320747a 项目工具改进 2015-07-21 09:59:41 +08:00
huang ff8db8fecc 添加1、软件知识库 
2、软件资源库
3、在线开发平台
4、软工服务平台
 2015-07-20 17:35:47 +08:00
huang 654a8078de 添加软件知识库 2015-07-20 16:28:35 +08:00
huang 8f1a7f47d1 dts测试添加测试进度效果 2015-07-20 16:03:33 +08:00
huang e0687c0ab3 云化部署 2015-07-20 09:31:14 +08:00
huang c198a03a90 DTS测试工具 2015-07-19 20:08:57 +08:00
huang 415f457dd4 dts接口（未完） 2015-07-18 19:13:33 +08:00
yutao 73bd8fbef5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-18 13:24:07 +08:00
yutao 3e3bcc32a6 个人主页 2015-07-18 13:23:48 +08:00
huang 2e78ea3d58 按月提交显示每月的代码统计量（以前是ASCII码） 2015-07-18 13:09:26 +08:00
huang 9c4eab4e04 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-18 13:02:54 +08:00
huang 9c63e2a87e 1、版本库添加成员代码提交统计 
2、版本库成员过多拥挤问题
 2015-07-18 13:02:28 +08:00
yutao f4b88dce70 个人主页 2015-07-18 12:50:44 +08:00
sw a7666af597 Merge branch 'yutao' into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2015-07-17 17:38:07 +08:00
guange 59a4b4656b change git config 2015-07-16 20:46:04 +08:00
sw f909fbb835 作品列表增加分班过滤 2015-07-15 16:01:03 +08:00
guange 006ed66d7a 新注册用户可以同步到gitlab 2015-07-15 15:51:49 +08:00
yutao 00c50d8114 个人主页->访客 2015-07-14 15:16:15 +08:00
sw aa5255c430 创建作品之后再调用编程作业接口，参数传递增加作品的ID 2015-07-10 17:20:04 +08:00
sw aeb0d23289 Merge branch 'develop' into sw_new_course 
Conflicts:
	app/views/homework_common/index.html.erb
 2015-07-10 15:42:53 +08:00
sw e73517cfd0 扣分规则显示 2015-07-10 15:34:55 +08:00
sw 4b275bcbdf 根据返回值，作业获取question的id 2015-07-10 11:36:44 +08:00
yutao 5c011fd342 个人主页 2015-07-09 15:27:49 +08:00
huang 3bb3cbe2bd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-06 16:38:53 +08:00
huang 898ef29116 用户得分：项目得分中添加发帖得分（帖子回复在协同得分） 2015-07-06 16:38:16 +08:00
zhangshenjerry 0c70169dfc 创新竞赛--编辑竞赛通知页面导航处不要显示“添加通知” 
创新竞赛--竞赛通知：添加竞赛通知置条件为空，提示信息“竞赛标题/描述不能为空”错误
 2015-07-06 13:10:35 +08:00
sw 5e90684677 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/homework_common_controller.rb
 2015-07-06 10:44:07 +08:00
guange f56e48d60a Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-07-04 22:31:07 +08:00
guange b762ae6bdd 报告人员只能克隆，不能提交，其他可以克隆和提交 2015-07-04 22:29:25 +08:00
huang be2b3a78d6 修改项目资源引用未选着项目时提示 2015-07-04 15:26:01 +08:00
huang 02805fd145 1、修改邮件显示样式及国际化 
2、发布作业代码更新
 2015-07-04 12:12:44 +08:00
huang 750070bdc7 configuration冲突处理 2015-07-03 15:51:54 +08:00
huang 17280e78ab 引用模式的修改 2015-07-03 15:00:15 +08:00
huang e986ee4e4e Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/_edit.html.erb
 2015-07-03 10:51:54 +08:00
sw 2344e3d07f admin用户导出缺失文件列表功能 2015-07-02 10:41:08 +08:00
huang f9cecbee5c 缺陷显示中回复和留言修改 2015-07-02 09:20:27 +08:00
guange 6fa67051e1 本项目的成员可以使用自己的用户名和密码克隆 2015-07-01 22:54:07 +08:00
sw 07d95bdda9 课程列表内容 2015-07-01 17:34:17 +08:00
sw f9880a00fd admin界面增加课程列表及相关路由 2015-07-01 16:41:17 +08:00
sw 7338f0d44e 未完善个人资料的用户创建可以报错 2015-07-01 10:02:50 +08:00
guange 797ed5081d 同步登录 2015-06-30 22:12:34 +08:00
sw fa31fe421b 匿评列表导出Excel 2015-06-30 16:36:37 +08:00
sw c2e21f7a0c 缺评列表导出 2015-06-30 15:30:51 +08:00
huang 65ee86bb45 1，解决git中英文500错误 
2.解决编辑器输入样式邮件显示异常问题
 2015-06-26 17:07:31 +08:00
huang df910a9c2d 更改邮件提示语（同步国际化） 2015-06-26 14:44:26 +08:00
huang 5b2202de75 处理配置文件冲突 2015-06-24 09:41:33 +08:00
huang f65f2dc926 课程通知、回复、发布缺陷、回复合二为一 2015-06-24 09:31:52 +08:00
sw fa19d4c066 Merge branch 'szzh' into sw_new_course 2015-06-23 15:58:54 +08:00
huang 5d1b157cd7 更新邮件（特殊情况）：缺陷留言为空，只更新状态 2015-06-23 15:49:39 +08:00
huang a2e84de88f 解决issue为空情况 2015-06-19 15:58:40 +08:00
huang a7a7c57f6a 解决回复为空的情况不显示问题 2015-06-19 15:46:49 +08:00
sw 810561c31b 老师才可以查看缺评情况 2015-06-19 10:26:56 +08:00
huang 2f8c8ea6ca Merge branch 'szzh' into dev_hjq 2015-06-19 10:24:04 +08:00
sw 1c10775619 Merge branch 'guange_dev' into szzh 2015-06-19 10:18:24 +08:00
sw 43363e8bcb 缺评情况功能 2015-06-18 17:56:28 +08:00
huang 28e9c090ec 实时发送：发布作业邮件通知 2015-06-18 10:23:51 +08:00
guange f58b530484 给课程活动慢加上缓存，并且加入了开关 2015-06-18 09:13:20 +08:00
guange 5bdad52e63 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-16 21:14:25 +08:00
guange 742506f52b IE8不能提交作业 2015-06-16 21:13:40 +08:00
huang e1b059b3d2 上传项目资源添加到邮件按天发送 2015-06-16 14:57:35 +08:00
sw 61eb3ecc62 1、新建作业上一步下一步改为页面刷新 
2、下一步路由改为post
 2015-06-16 14:45:57 +08:00
huang 5c36cf5c9d Merge branch 'szzh' into dev_hjq 2015-06-11 16:36:19 +08:00
huang a4f1edcdee 更新：wiki项目其它成员可以收到； 
项目、课程留言其它成员可以收到
邮件显示页面国际化
 2015-06-11 16:30:14 +08:00
huang 15697e05ed 按天发送中添加项目留言 2015-06-11 10:02:27 +08:00
sw 57804a118d 课程作业列表中展开按钮 2015-06-10 16:37:18 +08:00
sw 574c7373ec Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-10 15:16:54 +08:00
huang 0d9bdae5b0 邮件按天发送新界面 2015-06-10 15:02:44 +08:00
sw 857d3d5f62 问卷调查结果导出功能 2015-06-09 17:03:28 +08:00
huang c62d468ed3 修改项目新闻和课程通知冲突 2015-06-05 15:54:56 +08:00
sw 59c4e04e37 删除bid相关路由 2015-06-05 09:57:33 +08:00
guange 971755c74a Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-04 22:39:40 +08:00
sw 1cff2a85e9 Merge branch 'dev_hjq' into szzh 2015-06-04 17:45:51 +08:00
huang 0c19199be9 按天发送中添加项目新闻 2015-06-04 17:25:44 +08:00
sw 89d15e7673 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-04 16:56:30 +08:00
yutao cd0752f5da 课程讨论区动态与我相关 2015-06-04 15:55:41 +08:00
guange 36afb4d1f8 视频在公共贴吧的帖子回复里发不 2015-06-04 13:55:38 +08:00
sw 0d292d8ee6 课程留言为空时的提示 2015-06-04 11:18:06 +08:00
guange 3cc6fc1a64 删掉additional_enviroment.rb 2015-06-03 18:15:08 +08:00
sw b935f50b36 课程内作业列表、新建作业等路由关闭，相关页面、方法删除 2015-06-02 15:20:44 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
guange b6d22cfb31 添加文件预览接口 2015-06-01 23:02:55 +08:00
guange 21a143651a Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-29 18:27:32 +08:00
guange 2981d354ad Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-29 16:34:33 +08:00
sw a562cc7409 Merge branch 'dev_hjq' into szzh 2015-05-29 16:12:50 +08:00
huang d6aeb5b0e7 Merge branch 'szzh' into dev_hjq 2015-05-29 14:52:24 +08:00
huang d9ae9c8061 修改邮件通知提醒（邀请：未激活 
点击链接：激活并加入项目）
 2015-05-29 14:36:44 +08:00
alan 98f38b0a5b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-05-28 16:34:56 +08:00
sw 4d43cd2765 点赞功能 2015-05-28 16:10:40 +08:00
huang e2ec7d5f3e QQ在线支持功能 2015-05-28 15:45:36 +08:00
alan 1c760e8117 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-05-28 15:14:57 +08:00
sw 3f9855f25c 老师删除作业功能 2015-05-28 14:13:47 +08:00
guange 6f15738817 换一个autologin,解决老数据问题 2015-05-28 12:23:56 +08:00
sw e1a3ed4b82 到处Excel 2015-05-28 11:07:28 +08:00
guange 1fe49c8cb1 添加删除作业功能 2015-05-27 19:39:06 +08:00
guange 47e3e93a2f cookies 删除也需要domain 2015-05-27 19:37:46 +08:00
alan 32a6c29c7c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	Gemfile
	app/views/layouts/base_projects.html.erb
	app/views/projects/_development_group.html.erb
	app/views/projects/_research_team.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:42:25 +08:00
alan 59c77e870c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	db/schema.rb
	public/javascripts/course.js

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:01:52 +08:00
sw fea784cbcc 1、添加评分回复路由改变 
2、删除回复功能及界面刷新
 2015-05-27 15:11:11 +08:00
sw a0324f5e39 增加评分回复，以及相关显示 
评分回复真实信息显示
评分回复以及回复删除
 2015-05-27 11:25:32 +08:00
guange f3a15ce313 加入性能分析 oneapm 2015-05-26 23:09:10 +08:00
alanlong9278 b1a60d3118 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-26 00:01:15 +08:00
sw c289af2e7c 评分 2015-05-23 11:24:24 +08:00
guange b5d9cf55ff 将域名配置加入到管理员后台 2015-05-22 15:59:37 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
alan 799f561d77 Merge branch 'szzh' into memcached_alan 
Conflicts:
	Gemfile
	app/views/issues/index.html.erb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:42:26 +08:00
sw 25672aa229 编辑作业功能完成 2015-05-20 17:01:08 +08:00
sw 40f6295609 1、新建作业功能完成 
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
 2015-05-20 16:49:19 +08:00
huang 3f744d46f2 超级管理员界面--贴吧回复成功 2015-05-20 16:24:32 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
yutao a35abf1f1f 修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程” 2015-05-20 11:56:34 +08:00
sw 7684a6b253 1、实现作业列表展示页面 
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
 2015-05-19 17:12:43 +08:00
guange 9b0602fd9c 新增学生作业下载spec 2015-05-18 17:26:50 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
huang 6c500109c9 修改项目上传资源 2015-05-13 10:06:04 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
sw cfe3021391 用户收索国际化丢失 2015-05-08 09:16:11 +08:00
sw cba473269d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:31:22 +08:00
huang f08357d300 用户反馈添加提示：课程问题反馈给老师 2015-05-07 09:17:47 +08:00
sw cba760b8b0 课程、项目搜索提示 2015-05-06 15:01:26 +08:00
sw c0b7819870 修改资料时昵称提示以及样式 2015-05-06 14:20:55 +08:00
guange 297cb9182e 开发本地还是采用filecache 2015-05-06 11:08:33 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
huang b39e00b5c7 项目讨论区--内容必填 
添加国际化
 2015-05-06 09:26:14 +08:00
huang 0b524b8a40 登录后主页只显示我的项目 
方法定义
功能实现
 2015-05-05 16:29:53 +08:00
guange 86af233042 修正autologin多终端登录问题 2015-05-05 11:45:58 +08:00
alan 14a4cfa0db Signed-off-by: alan <547533434@qq.com> 2015-05-04 16:25:00 +08:00
alan 54078e114c redis缓存服务器的搭建以及对首页的缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 15:20:40 +08:00
alan c80263a66e Merge branch 'guange_dev' into memcached_alan 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb
	config/environments/production.rb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-04 14:58:11 +08:00
huang 119e540373 邮件邀请系统已注册的用户 2015-04-30 11:08:36 +08:00
guange 273b360b51 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-28 09:53:50 +08:00
guange b70ada57e6 邮件未处理text发送类型，导致每日发送失败 2015-04-27 21:54:49 +08:00
whimlex e30c446847 项目私有问题提示信息 2015-04-27 17:49:05 +08:00
guange 86347cab89 现在可以通过rake redmine📧test[guange] 发送测试邮件 2015-04-27 16:44:53 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
whimlex 15d7cde055 意见反馈 2015-04-23 16:57:18 +08:00
sw de192761b8 Merge branch 'szzh' into guange_dev 
Conflicts:
	Gemfile
	config/application.rb
 2015-04-22 14:53:40 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
guange 336dba414e 缓存修改为redis存储 2015-04-22 13:01:33 +08:00
huang 154ee9f38b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 12:43:35 +08:00
huang 2f021aecee 项目成员列表添加角色。用户得分 2015-04-22 12:43:20 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
huang 49f33dd50c 类型bug修复 2015-04-22 10:50:12 +08:00
lizanle 0de5ddd14c 题型用户上传百度云 2015-04-22 10:33:09 +08:00
huang be5c7ac6dd 修改项目类型术语 
图标
 2015-04-22 10:24:15 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
whimlex ab93d19b56 动态中显示更新项目缺陷样式异常 2015-04-21 16:17:51 +08:00
whimlex 84d7e63d54 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:11:15 +08:00
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
alanlong9278 945192f1d8 添加memcached配置 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-21 09:41:40 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-17 15:07:01 +08:00
lizanle 54f8079ba6 去掉html符号 2015-04-17 14:34:57 +08:00
lizanle 3bba1f93b4 版本库名输入条件描述去掉换行符 2015-04-17 12:01:31 +08:00
sw 9f862ad7a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-17 11:11:03 +08:00
sw a8b1ca10b3 1、学生作业 --> 作品 
2、学生交了作品之后显示修改作品
 2015-04-17 10:36:32 +08:00
huang d1e7777040 关注列表样式 2015-04-16 20:00:07 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
huang bd800a53e4 项目简介显示 2015-04-16 10:00:36 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +08:00
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
huang 5ae5cfda03 项目配置添加申请加入 
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
 2015-04-14 15:34:04 +08:00
sw ead0ffb2f4 Merge branch 'develop' into szzh 2015-04-14 10:50:30 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
guange eb4d9a4ffc 1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下，用于nfs 2015-04-13 20:44:46 +08:00