 guange
|
e3dd68ad24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-24 15:21:18 +08:00 |
|
guange
|
449bbc553c
|
修复issue界面js报错
|
2015-04-24 15:20:47 +08:00 |
|
guange
|
3299f7e726
|
正式库issue界面图片显示路径错误
|
2015-04-24 15:20:10 +08:00 |
 sw
|
1db41ba4bc
|
Merge branch 'szzh' into develop
|
2015-04-24 15:12:39 +08:00 |
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
2015-04-24 15:08:09 +08:00 |
|
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 15:02:53 +08:00 |
|
whimlex
|
85e1262769
|
意见反馈
|
2015-04-24 15:02:32 +08:00 |
|
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 14:58:51 +08:00 |
|
sw
|
54ef7e3325
|
修改课程讨论区报错
|
2015-04-24 14:57:44 +08:00 |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
2015-04-24 14:47:50 +08:00 |
 lizanle
|
138fff1bf5
|
暂时去掉全屏icon
|
2015-04-24 12:05:23 +08:00 |
|
lizanle
|
c384384b35
|
改变图标icon位置
|
2015-04-24 12:02:35 +08:00 |
|
lizanle
|
3810561fb1
|
改变图标icon
|
2015-04-24 12:02:09 +08:00 |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
2015-04-24 09:10:15 +08:00 |
|
lizanle
|
3e27acf03c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-24 09:07:36 +08:00 |
|
lizanle
|
f4b6b795e3
|
kindeditor增加代码编辑功能
|
2015-04-24 09:07:12 +08:00 |
|
whimlex
|
1f83950b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 18:18:50 +08:00 |
|
whimlex
|
b61d76d94e
|
意见反馈
|
2015-04-23 18:18:07 +08:00 |
|
lizanle
|
cf9cc0af82
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-23 18:08:10 +08:00 |
|
lizanle
|
681f7b75d6
|
kindeditor图片上传改为一次弹框
|
2015-04-23 18:07:51 +08:00 |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:56:11 +08:00 |
|
whimlex
|
b3e0490b90
|
意见反馈
|
2015-04-23 17:55:48 +08:00 |
|
sw
|
d883c101ab
|
Merge branch 'szzh' into develop
|
2015-04-23 17:46:37 +08:00 |
|
sw
|
cbb5fb1ee0
|
Merge branch 'guange_dev' into szzh
|
2015-04-23 17:46:00 +08:00 |
|
sw
|
e21dfe28fd
|
Merge branch 'szzh' into guange_dev
|
2015-04-23 17:45:22 +08:00 |
|
lizanle
|
f7dd4924c1
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2015-04-23 17:44:42 +08:00 |
|
guange
|
12193a0d5d
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-04-23 17:43:59 +08:00 |
|
lizanle
|
3b99c97617
|
kindeditor图片上传改为一次弹框
|
2015-04-23 17:43:34 +08:00 |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
|
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
2015-04-23 17:43:10 +08:00 |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
2015-04-23 17:43:10 +08:00 |
|
guange
|
65d62667d6
|
邮件加入三个邮件设置
|
2015-04-23 17:42:03 +08:00 |
|
sw
|
bbb3b1c340
|
Merge branch 'szzh' into develop
|
2015-04-23 17:33:31 +08:00 |
|
sw
|
b6652ed5e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:32:56 +08:00 |
|
sw
|
10bc470dcf
|
修改课程讨论区
|
2015-04-23 17:32:37 +08:00 |
 huang
|
e38639665b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:02:42 +08:00 |
|
huang
|
7e7ff92f7c
|
issueenter键不能搜索的问题
|
2015-04-23 17:02:26 +08:00 |
|
whimlex
|
15d7cde055
|
意见反馈
|
2015-04-23 16:57:18 +08:00 |
|
huang
|
4c1259ff92
|
缺陷enter键盘不能搜索（未完成）
|
2015-04-23 16:56:18 +08:00 |
|
sw
|
4224e11b52
|
课程讨论区标题换行
|
2015-04-23 16:34:09 +08:00 |
|
sw
|
66057b5b4f
|
编辑帖子时的样式
|
2015-04-23 16:19:23 +08:00 |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 16:13:19 +08:00 |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
2015-04-23 16:13:01 +08:00 |
|
huang
|
6a19ac4098
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 16:02:35 +08:00 |
|
huang
|
4da77d8a71
|
wiki页面显示
|
2015-04-23 16:02:18 +08:00 |
|
sw
|
12e65ad61f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 15:45:38 +08:00 |
|
huang
|
c9bfe00a4f
|
修改成员列表的排列
版本库页面色系
|
2015-04-23 15:31:14 +08:00 |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
2015-04-23 15:25:04 +08:00 |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 14:31:01 +08:00 |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
2015-04-23 14:04:22 +08:00 |