 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
|
17aae7c79d
|
解决CSS冲突
|
2015-08-21 17:40:28 +08:00 |
|
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
2015-08-21 17:13:42 +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
|
051c921108
|
资源库 多选发送给出提示
|
2015-08-21 15:58:32 +08:00 |
|
huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
2015-08-21 15:27:01 +08:00 |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
2015-08-21 15:23:03 +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
|
a53e66d4b0
|
消息中同事显示 评论和 打分
|
2015-08-21 14:04:10 +08:00 |
|
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
2015-08-21 14:00:24 +08:00 |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
2015-08-21 13:53:36 +08:00 |
|
huang
|
241d525e2c
|
问卷名为空的显示“未命名问卷”
|
2015-08-21 13:08:05 +08:00 |
|
huang
|
3f3c55cb52
|
修复名字为空的缺陷
|
2015-08-21 12:59:50 +08:00 |
|
lizanle
|
3feff49ca3
|
资源库 只能删除上传者为自己的资源
|
2015-08-21 10:32:13 +08:00 |
|
lizanle
|
cf243d47e5
|
资源库 只能删除上传者为自己的资源
|
2015-08-21 10:28:29 +08:00 |
|
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
2015-08-21 10:14:04 +08:00 |
|
huang
|
9b827a698c
|
鼠标经过的时候显示完整的标题
|
2015-08-21 10:02:58 +08:00 |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
2015-08-21 09:41:59 +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
|
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 |
|
lizanle
|
f97a55e164
|
资源库 删除
|
2015-08-20 14:01:33 +08:00 |
|
huang
|
404a6f4bca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 14:00:47 +08:00 |
|
huang
|
6b847e27d9
|
修正问题
|
2015-08-20 14:00:31 +08:00 |
 ouyangxuhua
|
cb773e37ea
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 12:49:49 +08:00 |
|
ouyangxuhua
|
ee09a105d2
|
贴吧帖子改名
|
2015-08-20 12:46:31 +08:00 |
|
huang
|
f829c6ff23
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
|
2015-08-20 12:45:21 +08:00 |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
2015-08-20 12:44:32 +08:00 |
|
ouyangxuhua
|
84182171f5
|
消息信息显示
|
2015-08-20 12:41:53 +08:00 |
|
lizanle
|
107a5686d1
|
资源库 全选反选
|
2015-08-20 11:37:32 +08:00 |
|
ouyangxuhua
|
88fe0a69f4
|
消息显示判断
|
2015-08-20 10:38:14 +08:00 |
|
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
|
ouyangxuhua
|
d387a529d7
|
增加公共贴吧消息
|
2015-08-19 17:28:43 +08:00 |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |
|
sw
|
a536af8fa3
|
用户show界面更新
|
2015-08-19 15:18:12 +08:00 |
|
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
2015-08-19 15:03:04 +08:00 |
|
ouyangxuhua
|
ff3edf4d5e
|
消息显示
|
2015-08-19 11:12:47 +08:00 |
|
lizanle
|
3836cfb40b
|
资源库
|
2015-08-18 17:45:14 +08:00 |
|
lizanle
|
43d57074e5
|
资源库
|
2015-08-18 17:26:39 +08:00 |
|
lizanle
|
ae6260571b
|
资源库
|
2015-08-18 16:57:41 +08:00 |
|
huang
|
90661066d3
|
区分课程/项目讨论区
课程项目/新闻 的消息显示方式
|
2015-08-18 16:53:26 +08:00 |
|
huang
|
5f29655406
|
issue状态更新显示
|
2015-08-18 16:35:19 +08:00 |
|
lizanle
|
375c016783
|
资源库
|
2015-08-18 15:42:36 +08:00 |