 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 |
 guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
guange
|
85ee2b86cd
|
.
|
2015-08-29 18:21:01 +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 |
|
sw
|
63c7ea8d4e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 15:42:11 +08:00 |
|
sw
|
0c731a39e6
|
Merge branch 'develop' into szzh
|
2015-08-29 15:34:35 +08:00 |
|
sw
|
98d533e8f9
|
1、整理迁移文件
2、个人动态添加与更新判断不正确
|
2015-08-29 15:34:18 +08:00 |
|
lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
2015-08-29 15:25:58 +08:00 |
|
lizanle
|
2962408c06
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 15:08:00 +08:00 |
|
lizanle
|
3a21c4e2fa
|
登录之后跳到个人主页
|
2015-08-29 15:07:47 +08:00 |
|
cxt
|
65756967ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:50:42 +08:00 |
|
cxt
|
41ba874749
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:50:05 +08:00 |
|
cxt
|
250d7a48dc
|
主页动态页面的刷新
|
2015-08-29 14:49:50 +08:00 |
|
sw
|
b8bc32c127
|
Merge branch 'szzh' into develop
|
2015-08-29 14:49:30 +08:00 |
|
sw
|
6cb21d3430
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:49:01 +08:00 |
|
sw
|
17e9b2d293
|
编辑个人简介文本框
|
2015-08-29 14:48:47 +08:00 |
|
sw
|
73ffbb7dfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:46:44 +08:00 |
|
sw
|
c0daebd75c
|
上传图片js
|
2015-08-29 14:46:30 +08:00 |
|
suntao
|
0d8624a642
|
颜色更新
|
2015-08-29 14:43:28 +08:00 |
|
sw
|
b65243ba62
|
添加关注、取消关注js刷新
|
2015-08-29 14:37:53 +08:00 |
|
sw
|
a2ec65a0c9
|
添加关注与取消关注
|
2015-08-29 14:34:59 +08:00 |
|
cxt
|
b30a07d651
|
个人主页动态
|
2015-08-29 14:27:16 +08:00 |
|
sw
|
498775b0a8
|
登录界面多了一个<
教授职称
|
2015-08-29 14:24:54 +08:00 |