 sw
|
767fc67686
|
已过期课程显示为darkgrey
|
2015-08-25 18:22:46 +08:00 |
|
sw
|
59fe95bf33
|
去掉部分重复的CSS
|
2015-08-25 17:26:40 +08:00 |
|
sw
|
994a4188ce
|
未登录情况下，导航栏样式问题
|
2015-08-25 17:13:09 +08:00 |
|
sw
|
4ca3d8be03
|
搜索栏样式
|
2015-08-25 16:35:22 +08:00 |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
2015-08-25 16:01:31 +08:00 |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:09:21 +08:00 |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
2015-08-25 15:09:02 +08:00 |
 lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 14:24:29 +08:00 |
|
lizanle
|
d25971f546
|
登陆界面
|
2015-08-25 14:24:20 +08:00 |
|
sw
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
2015-08-25 14:09:37 +08:00 |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
2015-08-25 13:50:42 +08:00 |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
2015-08-25 10:30:31 +08:00 |
|
sw
|
d132c08a11
|
增加footer
|
2015-08-25 09:29:19 +08:00 |
|
sw
|
38f8aa5ba4
|
更新css文件
|
2015-08-24 18:25:33 +08:00 |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 18:17:45 +08:00 |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
2015-08-24 18:15:46 +08:00 |
 cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
2015-08-24 16:35:10 +08:00 |
|
lizanle
|
39b022f696
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 16:25:09 +08:00 |
|
lizanle
|
86d2f5342c
|
登陆界面
|
2015-08-24 16:22:22 +08:00 |
|
lizanle
|
614743d8d4
|
登陆界面
|
2015-08-24 16:22:06 +08:00 |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
2015-08-24 16:16:07 +08:00 |
|
sw
|
e746a7764f
|
处理被还原的css
|
2015-08-24 15:36:32 +08:00 |
|
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 15:32:51 +08:00 |
|
sw
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
2015-08-24 15:30:11 +08:00 |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
2015-08-24 14:53:35 +08:00 |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
2015-08-24 14:53:30 +08:00 |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
2015-08-24 14:44:22 +08:00 |
|
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-24 13:54:22 +08:00 |
|
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
2015-08-24 13:54:15 +08:00 |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
2015-08-24 11:40:09 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
|
sw
|
86b151979b
|
js相关
|
2015-08-24 11:03:09 +08:00 |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
 guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
 huang
|
17aae7c79d
|
解决CSS冲突
|
2015-08-21 17:40:28 +08:00 |
|
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
2015-08-21 16:07:18 +08:00 |
|
sw
|
d942cc3123
|
性别的判断
|
2015-08-21 15:40:38 +08:00 |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
2015-08-21 15:23:03 +08:00 |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +08:00 |
|
sw
|
73854cc35c
|
右侧静态页面如果没有内容时增加默认最小高度
|
2015-08-21 14:25:01 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
2015-08-21 13:53:36 +08:00 |
|
huang
|
947fcc160c
|
修改列表显示样式！
|
2015-08-21 10:49:13 +08:00 |
 ouyangxuhua
|
2f21b4663d
|
消息颜色更改
|
2015-08-20 16:46:22 +08:00 |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
|
sw
|
2f43296854
|
更新课程样式
|
2015-08-20 10:23:29 +08:00 |
|
sw
|
f48e77901a
|
用户上传头像功能
|
2015-08-19 17:14:19 +08:00 |