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

54 Commits

Author SHA1 Message Date
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
lizanle 3bba1f93b4 版本库名输入条件描述去掉换行符 2015-04-17 12:01:31 +08:00
huang d1e7777040 关注列表样式 2015-04-16 20:00:07 +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
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
huang 5ae5cfda03 项目配置添加申请加入 
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
 2015-04-14 15:34:04 +08:00
huang 78868b34f0 修改缺陷中四中颜色按钮会折断换行的bug 
区别新闻和通知
 2015-04-11 15:12:06 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
whimlex 6ff1a7d692 问题顶和踩国际化 2015-04-11 11:03:36 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
whimlex 1fae44b201 用户主页国际化修改 2015-04-10 13:21:36 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
whimlex bcf83328f2 项目界面国际化 2015-04-09 20:46:48 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
huang 4d4e1cac8b 完成新的邮件邀请界面 2015-04-09 10:25:46 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
z9hang eabcd4e92b 项目资源模块新界面（列表显示，排序等功能，样式尚未调） 2015-03-30 17:14:52 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00
whimlex 4de0255ce6 邀请邮件国际化；js冲突 2015-03-26 10:45:14 +08:00
whimlex 05d17361e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-25 17:30:54 +08:00
whimlex 1452e09154 邮件邀请邮箱格式自动填充；部分国际化 2015-03-25 17:28:22 +08:00
huang a17458f132 1、户登录名可以在“修改信息”中修改 
2、缺陷统计国家化及显示样式调整。
 2015-03-23 14:11:57 +08:00
huang 1e1ee9a248 修改邮箱匹配错误后提示语 2015-03-21 13:54:16 +08:00
huang fd9eaa93d6 关注添加+号；去掉css文件中多余符号引起的样式问题 2015-03-20 17:43:57 +08:00
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 15:59:53 +08:00
whimlex 34579e395f 附件上传bug修改；意见反馈收拉一致 2015-03-20 15:59:30 +08:00
z9hang 5278d4dd2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 11:37:22 +08:00
z9hang 4ca5687b3b #2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好 2015-03-20 11:37:09 +08:00
whimlex 3837e1fcf5 申请加入：附件上传 2015-03-20 11:34:59 +08:00
whimlex 45475c3612 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-19 17:28:38 +08:00
whimlex 6995ead66c 项目ID 2015-03-19 17:28:12 +08:00
dingxu f4dff55377 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-19 17:24:14 +08:00
dingxu 073cb07f70 邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、 
展开条样式修改
 2015-03-19 17:23:53 +08:00
whimlex b95852dfcd 附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改 2015-03-19 17:21:11 +08:00
whimlex 7e8ee49298 资源库国际化 2015-03-18 18:02:54 +08:00
whimlex cfaf788e37 新版项目成员，关注者，资源库国际化；修改国际化缺失的bug 2015-03-17 18:04:35 +08:00
whimlex 50fe8f2bb7 项目配置模块 2015-03-17 15:06:15 +08:00
whimlex aee987d634 邀请Trustie用户 2015-03-13 17:47:58 +08:00
whimlex be75bcef47 项目得分国际化 2015-03-13 11:51:53 +08:00
whimlex cef923b8a8 邮件邀请用户国际化 2015-03-13 09:46:05 +08:00
whimlex 1e5fac32b4 添加邮箱验证 2015-03-12 17:48:31 +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 d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
whimlex 458fa5b977 完善代码审查插件、账户、项目部分模块国际化 2015-03-12 15:25:27 +08:00
sw 1e23007e5d 资源库中文丢失 2015-03-12 13:58:50 +08:00