 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
|
fe91442c96
|
课程列表已关闭课程标识出来
|
2015-08-24 15:18:07 +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
|
36152d19e8
|
个人show界面下面有一块空白界面
|
2015-08-24 11:42:26 +08:00 |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
2015-08-24 11:40:09 +08:00 |
 huang
|
98b6c090c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 11:38:06 +08:00 |
|
huang
|
374c596a50
|
添加新图标，新base
|
2015-08-24 11:37:50 +08:00 |
|
sw
|
15c44297cc
|
用户base关联user_base.js
|
2015-08-24 11:32:14 +08:00 |
|
sw
|
3b3712891b
|
111
|
2015-08-24 11:08:16 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
|
sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
2015-08-24 11:03:18 +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 |
|
lizanle
|
67c5a8e9c5
|
分页改为了15条
|
2015-08-24 10:31:25 +08:00 |
|
huang
|
b9980d4ab1
|
消息没显示问题！
|
2015-08-24 10:30:27 +08:00 |
 guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
|
lizanle
|
830815d3fd
|
课程资源搜索bug
|
2015-08-21 21:29:33 +08:00 |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-21 19:23:17 +08:00 |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
2015-08-21 17:40:28 +08:00 |
|
sw
|
cc4661a9b8
|
Merge branch 'szzh' into develop
|
2015-08-21 17:38:21 +08:00 |
|
lizanle
|
f763fcf144
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-21 17:13:52 +08:00 |
|
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
2015-08-21 17:13:42 +08:00 |
|
sw
|
c3bd085068
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-21 17:09:00 +08:00 |
|
lizanle
|
033aea28c5
|
新成员注册的时候报错
|
2015-08-21 17:05:54 +08:00 |
|
sw
|
0489b02e54
|
课程留言无法删除
|
2015-08-21 17:00:17 +08:00 |
|
lizanle
|
2589179fca
|
管理员登陆报错
|
2015-08-21 16:57:44 +08:00 |
|
lizanle
|
f6b01b300d
|
资源库 全部里能看到课程资源，但是分类里边却没有。
|
2015-08-21 16:36:42 +08:00 |
|
sw
|
3ef3a1d405
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-21 16:36:01 +08:00 |
|
sw
|
535145f8f2
|
11
|
2015-08-21 16:35:52 +08:00 |
|
huang
|
4e4df99bb1
|
处理冲突
|
2015-08-21 16:34:57 +08:00 |
|
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |
|
huang
|
dd85c7604e
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-08-21 16:19:17 +08:00 |
|
huang
|
11176574dc
|
Merge branch 'szzh' into develop
|
2015-08-21 16:18:48 +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
|
90164fed03
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-08-21 16:16:16 +08:00 |
|
cxt
|
693c5878a5
|
Merge branch 'szzh' into develop
|
2015-08-21 16:14:51 +08:00 |
|
huang
|
29339f370f
|
Merge branch 'szzh' into develop
|
2015-08-21 16:03:47 +08:00 |
|
lizanle
|
051c921108
|
资源库 多选发送给出提示
|
2015-08-21 15:58:32 +08:00 |
|
huang
|
745cf74d0e
|
Merge branch 'dev_hjq' into szzh
|
2015-08-21 15:56:51 +08:00 |