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
|
9ef212b6d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-09 20:47:08 +08:00 |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
2015-04-09 20:46:48 +08:00 |
 sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-09 16:04:15 +08:00 |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
2015-04-09 10:33:15 +08:00 |
 lizanle
|
13273cecf1
|
app的创建动态描述
|
2015-04-09 10:08:47 +08:00 |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
2015-04-03 11:38:27 +08:00 |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 11:31:08 +08:00 |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
2015-04-03 11:30:48 +08:00 |
 guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
2015-04-01 11:16:57 +08:00 |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
2015-03-31 15:57:15 +08:00 |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
2015-03-30 17:14:52 +08:00 |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
2015-03-29 12:33:33 +08:00 |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
2015-03-27 17:44:29 +08:00 |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
2015-03-27 17:00:23 +08:00 |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
2015-03-27 14:13:49 +08:00 |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 11:56:13 +08:00 |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
2015-03-26 11:30:00 +08:00 |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
2015-03-26 10:45:14 +08:00 |
|
z9hang
|
30cb622abd
|
评论显示页面修改
|
2015-03-25 20:36:49 +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 |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
2015-03-25 10:41:42 +08:00 |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
2015-03-24 17:12:51 +08:00 |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
2015-03-23 17:49:18 +08:00 |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
2015-03-23 17:18:58 +08:00 |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
2015-03-23 16:53:04 +08:00 |
 huang
|
a17458f132
|
1、户登录名可以在“修改信息”中修改
2、缺陷统计国家化及显示样式调整。
|
2015-03-23 14:11:57 +08:00 |
|
sw
|
36bd04cc7a
|
国际化课程作业列表
|
2015-03-23 14:09:41 +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
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-19 17:22:25 +08:00 |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
2015-03-19 17:21:11 +08:00 |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
2015-03-18 18:02:54 +08:00 |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
2015-03-18 17:14:26 +08:00 |