 chenmin
|
ecccbf1cf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-12 14:19:30 +08:00 |
 sw
|
0064018a37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-12 11:35:53 +08:00 |
|
sw
|
339a06007c
|
增加课程资源分离出来相关表
|
2014-08-12 11:31:42 +08:00 |
|
sw
|
835ef97510
|
wiki编辑页面插件更新
|
2014-08-12 11:22:37 +08:00 |
 zhanghaitao
|
7b3468718f
|
#898 引用回帖不转义的问题
|
2014-08-12 10:24:27 +08:00 |
|
zhanghaitao
|
64f6175f22
|
1.#912 admin管理配置窗口：项目列表、用户列表界面的文字超出显示框的修改
|
2014-08-11 17:06:45 +08:00 |
|
chenmin
|
f6f1bddaff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 17:06:24 +08:00 |
|
chenmin
|
50e172a25a
|
删除课程留言前增加提示
|
2014-08-11 16:51:45 +08:00 |
|
zhanghaitao
|
d7bfdc8de4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 16:39:35 +08:00 |
|
zhanghaitao
|
b9ee7fe00d
|
1.#878 缺陷输入计划完成时间小于开始时时间修改
2.修改时间选择的最小默认值
|
2014-08-11 16:39:18 +08:00 |
|
sw
|
0c597d23a2
|
Merge branch 'szzh' into develop
|
2014-08-11 15:09:25 +08:00 |
|
sw
|
33855f721d
|
优化课程首页效率
|
2014-08-11 15:07:56 +08:00 |
|
sw
|
f7635370d7
|
优化课程首页效率
|
2014-08-11 14:49:58 +08:00 |
|
sw
|
8724b79296
|
清理页面代码
|
2014-08-11 13:37:54 +08:00 |
|
sw
|
8c6160f496
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 09:19:20 +08:00 |
|
chenmin
|
e3ab21e409
|
修复当登陆的用户的学校没有课程时的课程列表显示bug
|
2014-08-11 09:19:40 +08:00 |
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:44:00 +08:00 |
|
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
|
sw
|
6ab17a2bf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:41:36 +08:00 |
|
sw
|
db826a71ff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:19:58 +08:00 |
|
chenmin
|
6037421c7d
|
修复没有课程的学校显示bug
|
2014-08-08 15:45:06 +08:00 |
|
chenmin
|
dd64f13e49
|
课程列表空行bug
|
2014-08-08 15:37:26 +08:00 |
|
sw
|
006d1eac8f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-08 15:34:44 +08:00 |
 z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 15:09:48 +08:00 |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
2014-08-08 15:09:32 +08:00 |
|
z9hang
|
683cd9f918
|
个人积分修改
|
2014-08-08 13:47:02 +08:00 |
|
sw
|
b5e8b12806
|
修改密码页面查询按钮改为确定
|
2014-08-08 11:32:15 +08:00 |
|
linhk
|
3d76b26e26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 09:31:42 +08:00 |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
2014-08-08 09:30:48 +08:00 |
|
zhanghaitao
|
dbe8456fd5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:56:49 +08:00 |
|
zhanghaitao
|
eac85b338f
|
标示错误修改
|
2014-08-07 17:56:29 +08:00 |
|
linhk
|
192bc8d89c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:16:26 +08:00 |
|
linhk
|
cb4869fd20
|
解决新建版本库名长255个字符时异常
解决版本库名长时，界面显示错误
|
2014-08-07 17:16:00 +08:00 |
|
zhanghaitao
|
019a1d4cba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 16:41:46 +08:00 |
|
zhanghaitao
|
d9a9867f96
|
#815 中英文显示问题修改
|
2014-08-07 16:41:31 +08:00 |
|
chenmin
|
f2f7dfaf12
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 16:21:00 +08:00 |
|
chenmin
|
d087c52314
|
课程动态为空判断
|
2014-08-07 16:20:46 +08:00 |
|
linhk
|
af683f917d
|
解决新建版本库名非法类型成功新建
|
2014-08-07 16:09:50 +08:00 |
|
linhk
|
5e8eda6a40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 15:58:37 +08:00 |
|
linhk
|
387d482059
|
解决用户注册无地区、身份可注册成功
|
2014-08-07 15:58:00 +08:00 |
|
zhanghaitao
|
4c71af51f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 15:54:22 +08:00 |
|
zhanghaitao
|
f3fe5d918e
|
#832 状态联动问题的解决
|
2014-08-07 15:54:05 +08:00 |
|
sw
|
7179943f8b
|
Merge branch 'szzh' into develop
|
2014-08-07 14:37:28 +08:00 |
|
sw
|
78343effaf
|
em.yml还原
|
2014-08-07 14:36:28 +08:00 |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
2014-08-07 14:03:06 +08:00 |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:36:08 +08:00 |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
sw
|
dac4042ee9
|
ttt
|
2014-08-07 11:31:24 +08:00 |