 cxt
|
7d6f952737
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 15:12:55 +08:00 |
|
cxt
|
118b731dc4
|
点击动态链接进入相关列表
|
2015-08-31 15:12:46 +08:00 |
 lizanle
|
9a1fa316bb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-31 15:06:38 +08:00 |
|
lizanle
|
19dfd77cad
|
将资源发送至 会换行，调宽
|
2015-08-31 15:06:07 +08:00 |
 suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2015-08-31 14:55:15 +08:00 |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
2015-08-31 14:52:56 +08:00 |
|
cxt
|
23c1ac5a4a
|
项目问题的动态内容显示超出边框
|
2015-08-31 14:28:43 +08:00 |
|
cxt
|
8345a9d94e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 14:13:33 +08:00 |
|
cxt
|
fedc125731
|
附件名称在可用的范围内尽可能显示全
|
2015-08-31 14:13:17 +08:00 |
|
lizanle
|
5b40628a5b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-31 11:59:42 +08:00 |
|
lizanle
|
e9b501058b
|
上传以后资源数改变
|
2015-08-31 11:59:33 +08:00 |
 sw
|
8763243e31
|
Merge branch 'develop' into szzh
|
2015-08-31 10:36:38 +08:00 |
|
lizanle
|
9ca1234324
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 10:23:12 +08:00 |
 huang
|
f6baf03470
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-08-30 11:25:31 +08:00 |
|
huang
|
c0067eb616
|
Merge branch 'szzh' into develop
|
2015-08-30 11:24:29 +08:00 |
|
huang
|
6dd372863f
|
Merge branch 'dev_hjq' into szzh
|
2015-08-30 11:22:50 +08:00 |
|
huang
|
3807c4ea2a
|
Merge branch 'szzh' into dev_hjq
|
2015-08-30 11:21:58 +08:00 |
|
huang
|
e652e92217
|
新增消息迁移
|
2015-08-30 11:20:37 +08:00 |
|
huang
|
7ed93c1d80
|
消息总表数据迁移
|
2015-08-29 19:26:23 +08:00 |
|
sw
|
7a4d562773
|
课程主页，项目主页 500
|
2015-08-29 19:15:06 +08:00 |
|
sw
|
6f3bed94d9
|
Merge branch 'szzh' into develop
|
2015-08-29 19:05:17 +08:00 |
|
sw
|
ab173fb704
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 19:04:36 +08:00 |
|
sw
|
8be7509b33
|
课程、竞赛主页跳转到个人主页
|
2015-08-29 19:03:36 +08:00 |
|
sw
|
c416a312cf
|
取消发布作业时间
|
2015-08-29 19:02:47 +08:00 |
|
cxt
|
96021bee73
|
项目讨论区的回复不显示用户名称
|
2015-08-29 18:59:39 +08:00 |
|
sw
|
09a994f76a
|
职称增加副教授等职称
|
2015-08-29 18:54:34 +08:00 |
|
sw
|
ca0c7a4fb0
|
个人主页职称
|
2015-08-29 18:51:35 +08:00 |
|
cxt
|
6c09e41a09
|
个人主页课程讨论区动态报错
|
2015-08-29 18:09:58 +08:00 |
|
sw
|
a337f06a69
|
Merge branch 'szzh' into develop
|
2015-08-29 18:05:23 +08:00 |
|
sw
|
bfd13bf98a
|
课程回复按钮样式
|
2015-08-29 17:54:56 +08:00 |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
|
sw
|
f81bab6319
|
课程回复
|
2015-08-29 17:19:03 +08:00 |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 17:10:56 +08:00 |
|
huang
|
43170c696c
|
迁移总表时间
|
2015-08-29 17:09:44 +08:00 |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
2015-08-29 17:08:55 +08:00 |
|
suntao
|
ecd355df0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_poll.html.erb
|
2015-08-29 17:08:01 +08:00 |
|
suntao
|
fc47b793ee
|
动态块间距调整
|
2015-08-29 17:06:21 +08:00 |
|
lizanle
|
ac60fdf0b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 17:05:13 +08:00 |
|
sw
|
1e9f5cebd2
|
首页查询问题
|
2015-08-29 17:04:44 +08:00 |
|
lizanle
|
de5dd08b55
|
登录之后跳到个人主页
|
2015-08-29 17:03:31 +08:00 |
|
cxt
|
cb88e406d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:59:29 +08:00 |
|
cxt
|
a7f161804e
|
描述和回复超出边框
|
2015-08-29 16:59:13 +08:00 |
|
sw
|
9437188c9b
|
登录界面enter键监听
|
2015-08-29 16:55:49 +08:00 |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:52:44 +08:00 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
cxt
|
d48cc8073a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 16:40:00 +08:00 |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
2015-08-29 16:39:37 +08:00 |
|
sw
|
6d768100f8
|
输入为空不提交表单
|
2015-08-29 16:14:02 +08:00 |
|
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
2015-08-29 16:09:30 +08:00 |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
2015-08-29 16:08:09 +08:00 |