 ouyangxuhua
|
b7a473a1b2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-24 17:46:11 +08:00 |
|
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
2015-08-24 17:45:00 +08:00 |
|
ouyangxuhua
|
bf596d7b4b
|
更新新闻viewed字段
|
2015-08-24 17:44:13 +08:00 |
 huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-24 15:46:29 +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 |
|
huang
|
3858e87482
|
user留言类型
|
2015-08-24 11:43:43 +08:00 |
|
huang
|
aadfd16e6a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-24 11:39:03 +08:00 |
|
huang
|
374c596a50
|
添加新图标，新base
|
2015-08-24 11:37:50 +08:00 |
|
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
2015-08-24 11:27:36 +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
|
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 |
|
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 |
|
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
|
f6b01b300d
|
资源库 全部里能看到课程资源，但是分类里边却没有。
|
2015-08-21 16:36:42 +08:00 |
|
huang
|
4e4df99bb1
|
处理冲突
|
2015-08-21 16:34:57 +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 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
2015-08-21 14:00:24 +08:00 |
|
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
2015-08-21 10:44:09 +08:00 |
|
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
2015-08-21 10:14:04 +08:00 |
|
lizanle
|
7deafac280
|
资源库 修改
|
2015-08-21 10:02:26 +08:00 |
|
huang
|
840caf18f3
|
修改排序
|
2015-08-20 17:40:01 +08:00 |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
2015-08-20 17:38:30 +08:00 |
|
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
2015-08-20 17:20:38 +08:00 |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
2015-08-20 17:00:54 +08:00 |
|
huang
|
7c7c337deb
|
控制界面
|
2015-08-20 16:29:43 +08:00 |
|
huang
|
ff53840029
|
修改消息中存在的页面bug
|
2015-08-20 16:27:49 +08:00 |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
|
huang
|
93f44287aa
|
jounal状态
|
2015-08-20 14:32:46 +08:00 |
|
huang
|
b40122c9ee
|
跟新issue状态！
|
2015-08-20 14:18:16 +08:00 |
|
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-20 14:07:11 +08:00 |
|
lizanle
|
f97a55e164
|
资源库 删除
|
2015-08-20 14:01:33 +08:00 |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
2015-08-20 12:44:32 +08:00 |
|
huang
|
b5682adcd3
|
添加统计数
|
2015-08-20 10:50:40 +08:00 |
|
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
2015-08-20 10:38:22 +08:00 |
|
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
|
huang
|
c8399cdf58
|
去掉forum
|
2015-08-19 17:49:47 +08:00 |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |