 lizanle
|
614743d8d4
|
登陆界面
|
2015-08-24 16:22:06 +08:00 |
 sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
2015-08-24 16:16:07 +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
|
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 |
|
huang
|
b9980d4ab1
|
消息没显示问题！
|
2015-08-24 10:30:27 +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 |
 cxt
|
011184b537
|
个人主页
|
2015-08-21 17:26:52 +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 |
|
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 |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
2015-08-21 16:07:18 +08:00 |
|
lizanle
|
051c921108
|
资源库 多选发送给出提示
|
2015-08-21 15:58:32 +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 |
|
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 |
|
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 |
|
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 |
|
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
2015-08-20 11:19:26 +08:00 |
|
ouyangxuhua
|
b256d0a24e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 11:08:41 +08:00 |
|
huang
|
b5682adcd3
|
添加统计数
|
2015-08-20 10:50:40 +08:00 |
|
ouyangxuhua
|
27b42a5437
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 10:39:41 +08:00 |
|
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
2015-08-20 10:38:22 +08:00 |
|
ouyangxuhua
|
88fe0a69f4
|
消息显示判断
|
2015-08-20 10:38:14 +08:00 |
|
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
|
ouyangxuhua
|
36aff18e9d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 09:28:36 +08:00 |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
|
ouyangxuhua
|
246594db40
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-20 08:38:50 +08:00 |
|
huang
|
c8399cdf58
|
去掉forum
|
2015-08-19 17:49:47 +08:00 |
|
ouyangxuhua
|
afdcb53a72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-19 17:30:02 +08:00 |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
|
ouyangxuhua
|
d387a529d7
|
增加公共贴吧消息
|
2015-08-19 17:28:43 +08:00 |
|
sw
|
f48e77901a
|
用户上传头像功能
|
2015-08-19 17:14:19 +08:00 |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |
|
sw
|
e64c15a026
|
个人主页基本页面布局完成
|
2015-08-19 16:32:05 +08:00 |
|
sw
|
a536af8fa3
|
用户show界面更新
|
2015-08-19 15:18:12 +08:00 |
|
sw
|
b6a2be72e4
|
调整CSS，修改图片，实现部分功能动态效果
|
2015-08-19 15:13:30 +08:00 |
|
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
2015-08-19 15:03:04 +08:00 |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
2015-08-19 14:43:12 +08:00 |