 sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 17:02:49 +08:00 |
|
sw
|
148a4e2479
|
发布作业样式
|
2015-08-28 16:59:40 +08:00 |
|
sw
|
bbb8e5a062
|
老师发布作业取消功能
|
2015-08-28 16:56:09 +08:00 |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
2015-08-28 16:47:43 +08:00 |
|
sw
|
02f7538200
|
个人描述为英文时不换行
|
2015-08-28 16:10:05 +08:00 |
|
sw
|
48419573ac
|
底部导航栏有2条线
|
2015-08-28 16:02:00 +08:00 |
 lizanle
|
7f9289d6c3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-28 15:49:18 +08:00 |
|
lizanle
|
18e2d05f41
|
重置邮件标题改变
|
2015-08-28 15:49:02 +08:00 |
 suntao
|
4392ecdcd7
|
消息格式更改
|
2015-08-28 15:41:50 +08:00 |
|
suntao
|
e12bef1126
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 14:51:16 +08:00 |
 huang
|
aad7a5fc82
|
Merge branch 'dev_hjq' into szzh
|
2015-08-28 14:55:22 +08:00 |
|
suntao
|
a19692a0c6
|
个人主页左侧修改
|
2015-08-28 14:50:48 +08:00 |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
2015-08-28 14:49:55 +08:00 |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
2015-08-28 14:38:46 +08:00 |
|
suntao
|
fb91958a3f
|
导航栏修改
|
2015-08-28 14:30:02 +08:00 |
|
suntao
|
02120c778f
|
样式修改
|
2015-08-28 12:09:31 +08:00 |
|
suntao
|
c0477fda99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 11:58:33 +08:00 |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 11:56:52 +08:00 |
|
suntao
|
b6d58b1b58
|
样式调整
|
2015-08-28 11:55:34 +08:00 |
|
sw
|
43d9697195
|
发布作业增加块的显示
|
2015-08-28 11:55:32 +08:00 |
|
sw
|
711b21070f
|
上传附件样式调整
|
2015-08-28 11:53:05 +08:00 |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
|
lizanle
|
6dde8d1ea6
|
资源库弹出框位置优化
|
2015-08-28 11:06:02 +08:00 |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
2015-08-28 10:47:50 +08:00 |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
2015-08-28 09:55:23 +08:00 |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
2015-08-28 09:34:02 +08:00 |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-27 17:35:04 +08:00 |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
2015-08-27 16:57:32 +08:00 |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
2015-08-27 16:20:47 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
lizanle
|
7916ca2ee3
|
密码重置
|
2015-08-27 15:15:06 +08:00 |
|
sw
|
cc76c13700
|
资源库样式
|
2015-08-27 15:07:48 +08:00 |
|
lizanle
|
b7daa643c8
|
资源库空白处单击也要隐藏弹出框
|
2015-08-27 14:49:51 +08:00 |
|
lizanle
|
a4e30d119d
|
删不掉资源的提示
|
2015-08-27 14:27:49 +08:00 |
|
lizanle
|
d99c1dd72a
|
重置密码的base错了。
|
2015-08-27 14:11:56 +08:00 |
|
lizanle
|
cff93331b2
|
更改登录首页的标点符号
|
2015-08-27 11:06:04 +08:00 |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
2015-08-27 11:02:20 +08:00 |
|
huang
|
a7eff50c61
|
消息留言发送：回复东家，回复人和东家只能一人收到消息
|
2015-08-27 10:32:45 +08:00 |
|
lizanle
|
0a898342d9
|
登录按钮可以用enter键
|
2015-08-27 10:01:13 +08:00 |
|
sw
|
8cd6c7d2a0
|
Merge branch 'guange_dev' into szzh
|
2015-08-27 09:47:41 +08:00 |
|
sw
|
95a3d47869
|
Merge branch 'develop' into szzh
|
2015-08-27 09:46:36 +08:00 |
|
sw
|
1f87c4adf5
|
重复CSS删除
|
2015-08-27 09:46:17 +08:00 |
|
lizanle
|
41a8f9d6a2
|
底部去掉marginBottom:10px
登录界面加底部
|
2015-08-27 09:28:13 +08:00 |
 guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-26 20:37:49 +08:00 |
|
guange
|
631283ae79
|
remove grack
|
2015-08-26 20:37:43 +08:00 |
|
huang
|
b5dc6cabef
|
Merge branch 'szzh' into dev_hjq
|
2015-08-26 18:46:29 +08:00 |
|
sw
|
ed3be27687
|
消息界面样式
|
2015-08-26 18:07:31 +08:00 |
|
sw
|
0e0756a42c
|
Merge branch 'szzh' into develop
|
2015-08-26 17:59:35 +08:00 |
|
sw
|
533b6a1476
|
Merge branch 'sw_new_course' into szzh
|
2015-08-26 17:58:46 +08:00 |