 cxt
|
693c5878a5
|
Merge branch 'szzh' into develop
|
2015-08-21 16:14:51 +08:00 |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
2015-08-21 16:07:18 +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 |
|
huang
|
604fe40f84
|
poll after create
|
2015-08-21 15:55:17 +08:00 |
 sw
|
d942cc3123
|
性别的判断
|
2015-08-21 15:40:38 +08:00 |
|
huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
2015-08-21 15:27:01 +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 |
|
sw
|
2db6696fd4
|
个人动态的级联新增和级联删除
|
2015-08-21 14:21:10 +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 |
|
huang
|
953817800a
|
问卷发布后才能提交
|
2015-08-21 11:46:04 +08:00 |
|
huang
|
580735ef79
|
修改删除的关联的500问题
|
2015-08-21 11:28:10 +08:00 |
|
huang
|
947fcc160c
|
修改列表显示样式！
|
2015-08-21 10:49:13 +08:00 |
|
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
2015-08-21 10:44:09 +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 |
|
lizanle
|
7deafac280
|
资源库 修改
|
2015-08-21 10:02:26 +08:00 |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
2015-08-21 09:41:59 +08:00 |
|
huang
|
893c1c753f
|
修复留言嵌套回复问题
|
2015-08-20 18:54:01 +08:00 |
|
huang
|
840caf18f3
|
修改排序
|
2015-08-20 17:40:01 +08:00 |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
2015-08-20 17:38:30 +08:00 |
|
cxt
|
4c87071765
|
个人动态
|
2015-08-20 17:24:34 +08:00 |
|
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
2015-08-20 17:20:38 +08:00 |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
2015-08-20 17:00:54 +08:00 |
 ouyangxuhua
|
2f21b4663d
|
消息颜色更改
|
2015-08-20 16:46:22 +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
|
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 |