 sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
sw
|
86b151979b
|
js相关
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
 lizanle
|
67c5a8e9c5
|
分页改为了15条
|
10 years ago |
 huang
|
b9980d4ab1
|
消息没显示问题！
|
10 years ago |
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
10 years ago |
|
lizanle
|
830815d3fd
|
课程资源搜索bug
|
10 years ago |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
10 years ago |
|
sw
|
cc4661a9b8
|
Merge branch 'szzh' into develop
|
10 years ago |
 cxt
|
011184b537
|
个人主页
|
10 years ago |
|
lizanle
|
f763fcf144
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
10 years ago |
|
sw
|
c3bd085068
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
033aea28c5
|
新成员注册的时候报错
|
10 years ago |
|
sw
|
0489b02e54
|
课程留言无法删除
|
10 years ago |
|
lizanle
|
2589179fca
|
管理员登陆报错
|
10 years ago |
|
lizanle
|
f6b01b300d
|
资源库 全部里能看到课程资源，但是分类里边却没有。
|
10 years ago |
|
sw
|
3ef3a1d405
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
535145f8f2
|
11
|
10 years ago |
|
huang
|
4e4df99bb1
|
处理冲突
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
huang
|
dd85c7604e
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
11176574dc
|
Merge branch 'szzh' into develop
|
10 years ago |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
90164fed03
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
693c5878a5
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
10 years ago |
|
huang
|
29339f370f
|
Merge branch 'szzh' into develop
|
10 years ago |
|
lizanle
|
051c921108
|
资源库 多选发送给出提示
|
10 years ago |
|
huang
|
745cf74d0e
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
604fe40f84
|
poll after create
|
10 years ago |
|
sw
|
d942cc3123
|
性别的判断
|
10 years ago |
|
huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
10 years ago |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
10 years ago |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
10 years ago |
|
sw
|
73854cc35c
|
右侧静态页面如果没有内容时增加默认最小高度
|
10 years ago |
|
sw
|
2db6696fd4
|
个人动态的级联新增和级联删除
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
huang
|
a53e66d4b0
|
消息中同事显示 评论和 打分
|
10 years ago |
|
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
10 years ago |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
10 years ago |
|
huang
|
241d525e2c
|
问卷名为空的显示“未命名问卷”
|
10 years ago |
|
huang
|
3f3c55cb52
|
修复名字为空的缺陷
|
10 years ago |
|
huang
|
953817800a
|
问卷发布后才能提交
|
10 years ago |
|
huang
|
580735ef79
|
修改删除的关联的500问题
|
10 years ago |
|
huang
|
947fcc160c
|
修改列表显示样式！
|
10 years ago |
|
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
10 years ago |
|
lizanle
|
3feff49ca3
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
cf243d47e5
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
