 lizanle
|
88ee202a4c
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:36 +08:00 |
|
lizanle
|
de233cb52a
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:24 +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
|
9e896118e9
|
项目模块配置：作品下载->资源库
|
2015-03-11 15:16:20 +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 |
|
sw
|
0525b03e65
|
zh.yml删除重复的
|
2015-03-11 14:50:06 +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 |
|
sw
|
c411d1f3d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 11:23:09 +08:00 |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
2015-03-11 11:22:58 +08:00 |
|
sw
|
4d9d45f25a
|
Merge branch 'sw_new_course' into szzh
|
2015-03-11 11:22:53 +08:00 |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
2015-03-11 11:20:43 +08:00 |
|
huang
|
b10cb7836c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-11 11:19:38 +08:00 |
 guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
2015-03-11 10:52:09 +08:00 |
|
sw
|
6167490efb
|
Merge branch 'szzh' into develop
|
2015-03-11 10:30:30 +08:00 |
|
sw
|
d177f1ae89
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 10:16:23 +08:00 |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
2015-03-11 10:16:06 +08:00 |
|
whimlex
|
12c72308f0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 10:11:15 +08:00 |
|
whimlex
|
5732f0ed03
|
国际化问题修改，新添加en.yml存在中文字符，格式问题
|
2015-03-11 10:10:54 +08:00 |
|
sw
|
284625de8f
|
国际化文件错误修改
|
2015-03-11 10:07:14 +08:00 |
|
sw
|
aa3ab86fb0
|
#2013 个人主页--留言--留言输入框不见了
|
2015-03-11 09:48:35 +08:00 |
|
sw
|
c2f494911d
|
修改en.yml不正确
|
2015-03-11 09:33:36 +08:00 |
|
guange
|
e5e46819b4
|
#867 新建缺陷：校验失败也要保存上传文件信息
|
2015-03-10 22:35:36 +08:00 |
|
guange
|
fd676f13b5
|
#994 作品下载：资源排序修正
|
2015-03-10 21:50:47 +08:00 |
|
huang
|
085302e0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-10 19:01:04 +08:00 |
|
huang
|
8a7c411a46
|
去掉传入参数
|
2015-03-10 19:00:19 +08:00 |
|
sw
|
916d467352
|
Merge branch 'szzh' into develop
|
2015-03-10 17:36:31 +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 |