 lizanle
|
051c921108
|
资源库 多选发送给出提示
|
2015-08-21 15:58:32 +08:00 |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +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
|
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 |
|
lizanle
|
7deafac280
|
资源库 修改
|
2015-08-21 10:02:26 +08:00 |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
2015-08-20 17:38:30 +08:00 |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
2015-08-20 17:00:54 +08:00 |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
|
lizanle
|
f97a55e164
|
资源库 删除
|
2015-08-20 14:01:33 +08:00 |
|
lizanle
|
107a5686d1
|
资源库 全选反选
|
2015-08-20 11:37:32 +08:00 |
|
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |
|
lizanle
|
0ef7d5f0fa
|
资源库可见性问题
|
2015-08-19 12:04:06 +08:00 |
|
lizanle
|
e7f818deb9
|
资源库搜索问题
|
2015-08-19 09:20:39 +08:00 |
|
lizanle
|
3836cfb40b
|
资源库
|
2015-08-18 17:45:14 +08:00 |
|
lizanle
|
43d57074e5
|
资源库
|
2015-08-18 17:26:39 +08:00 |
 cxt
|
652f5fa6e1
|
超级管理员的留言列表、帖子、最近登录用户列表的缺陷修复
|
2015-08-18 17:00:58 +08:00 |
|
lizanle
|
ae6260571b
|
资源库
|
2015-08-18 16:57:41 +08:00 |
|
lizanle
|
375c016783
|
资源库
|
2015-08-18 15:42:36 +08:00 |
|
lizanle
|
32aef6f289
|
资源库
|
2015-08-18 15:36:15 +08:00 |
|
lizanle
|
7219586b1e
|
资源库
|
2015-08-18 15:25:36 +08:00 |
|
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接，添加查询条件。
|
2015-08-18 14:40:12 +08:00 |
|
lizanle
|
76be15f79b
|
资源库
|
2015-08-18 11:53:54 +08:00 |
|
lizanle
|
25460cd255
|
资源库
|
2015-08-18 09:31:03 +08:00 |
|
cxt
|
bc993e3b5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-18 09:18:10 +08:00 |
 sw
|
545b07a34c
|
Merge branch 'develop' into szzh
|
2015-08-17 15:24:53 +08:00 |
 huang
|
a71ff944c0
|
消息排序
|
2015-08-17 10:42:38 +08:00 |
|
cxt
|
ebd056a4b9
|
Merge branch 'develop' into szzh
|
2015-08-17 10:41:28 +08:00 |
|
sw
|
5c1661a65a
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-08-15 19:48:13 +08:00 |
|
sw
|
c97ec1a370
|
111
|
2015-08-15 19:47:50 +08:00 |
|
sw
|
0ba9cfe5dd
|
提升迁移文件效率
|
2015-08-15 19:47:24 +08:00 |
|
huang
|
8d30bec8a4
|
Merge branch 'dev_hjq' into szzh
|
2015-08-15 17:10:44 +08:00 |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
2015-08-15 17:10:02 +08:00 |
|
huang
|
07605d2d6d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-15 17:09:48 +08:00 |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-08-15 17:09:10 +08:00 |
|
sw
|
92752add5f
|
Merge branch 'szzh' into develop
|
2015-08-15 17:08:15 +08:00 |
|
lizanle
|
421f86cdaf
|
资源库
|
2015-08-15 17:07:50 +08:00 |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
2015-08-15 17:06:50 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
|
huang
|
fc244982bc
|
处理冲突
修改浏览器兼容问题
|
2015-08-15 17:06:19 +08:00 |
|
sw
|
5d000ea431
|
增加系统评分
|
2015-08-15 17:02:54 +08:00 |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
2015-08-15 16:54:51 +08:00 |
|
huang
|
f731af0134
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-15 16:51:28 +08:00 |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
2015-08-15 16:50:21 +08:00 |
|
huang
|
64e1d88285
|
去掉项目消息提示
未登录情况下访问跳转至403
|
2015-08-15 16:11:40 +08:00 |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
2015-08-15 15:44:44 +08:00 |