 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 |
|
huang
|
349065db48
|
Merge branch 'dev_hjq' into szzh
|
2015-08-26 18:00:15 +08:00 |
|
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:04 +08:00 |
 cxt
|
d1577028be
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 18:00:46 +08:00 |
|
lizanle
|
5f23244742
|
忘记密码
|
2015-08-26 17:59:05 +08:00 |
|
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:59 +08:00 |
|
cxt
|
caec5e5490
|
个人主页动态
|
2015-08-26 17:58:48 +08:00 |
|
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
2015-08-26 17:57:54 +08:00 |
|
sw
|
347298124e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:55:40 +08:00 |
|
sw
|
e4a36b9be2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:55:07 +08:00 |
|
sw
|
01c8ee3898
|
1、个人主页新建课程、新建项目、加入课程功能添加
2、新建课程时导航栏的修改
|
2015-08-26 17:54:41 +08:00 |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 17:52:32 +08:00 |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
2015-08-26 17:52:23 +08:00 |
|
sw
|
dafc128f34
|
增加部分默认参数的设置
|
2015-08-26 17:44:03 +08:00 |
|
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
2015-08-26 17:42:52 +08:00 |
|
sw
|
5b9c9312f5
|
留言界面样式修改
|
2015-08-26 17:42:02 +08:00 |
|
sw
|
afeaecc478
|
作业列表增加标题
|
2015-08-26 17:37:53 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
|
cxt
|
7c3544dfec
|
个人主页动态
|
2015-08-26 17:21:58 +08:00 |
|
cxt
|
706415dc6e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:03:15 +08:00 |
|
cxt
|
2124b3c392
|
个人主页动态缺陷修复
|
2015-08-26 17:02:54 +08:00 |
|
huang
|
85b90f9958
|
消息代码清理
|
2015-08-26 16:56:41 +08:00 |
|
lizanle
|
9e9de44397
|
服务协议
|
2015-08-26 16:51:03 +08:00 |
|
lizanle
|
ba9a64360e
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 16:50:36 +08:00 |
|
lizanle
|
65b5b467d4
|
服务协议
|
2015-08-26 16:50:26 +08:00 |
|
huang
|
1dd766de1f
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-26 16:36:36 +08:00 |
|
huang
|
ef74d129c5
|
消息通知回复链接样式
|
2015-08-26 16:35:53 +08:00 |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
2015-08-26 16:14:50 +08:00 |
|
lizanle
|
5ec24913bb
|
留言背景色 留言头
|
2015-08-26 16:06:15 +08:00 |
|
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 15:49:11 +08:00 |
|
lizanle
|
a53b9f9049
|
留言模块
|
2015-08-26 15:49:05 +08:00 |
|
sw
|
af2434809b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:47:05 +08:00 |
|
huang
|
7340a664f2
|
链接颜色
|
2015-08-26 15:42:12 +08:00 |
|
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:25:15 +08:00 |
|
cxt
|
048319ef8e
|
个人主页
|
2015-08-26 15:24:57 +08:00 |
|
sw
|
4fe3ba2442
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:23:41 +08:00 |
|
sw
|
a08d32d0f3
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:18:05 +08:00 |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
2015-08-26 15:17:56 +08:00 |