sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
caec5e5490
|
个人主页动态
|
10 years ago |
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
sw
|
dafc128f34
|
增加部分默认参数的设置
|
10 years ago |
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
10 years ago |
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
huang
|
85b90f9958
|
消息代码清理
|
10 years ago |
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
10 years ago |
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
lizanle
|
a53b9f9049
|
留言模块
|
10 years ago |
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
048319ef8e
|
个人主页
|
10 years ago |
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
sw
|
8247a29b85
|
只有admin用户可以修改个人简介
|
10 years ago |
lizanle
|
d735eee4a3
|
关注和取消关注
|
10 years ago |
cxt
|
fce523606c
|
个人主页
|
10 years ago |
cxt
|
e4c9f05c7b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
bd00870eba
|
个人主页
|
10 years ago |
sw
|
56a1283033
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
sw
|
d8b87ccc37
|
作业列表滚动到底部显示下面10条作业
|
10 years ago |
lizanle
|
70e9d75cc6
|
登陆后的搜索
|
10 years ago |
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
10 years ago |
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
4915f7977e
|
个人动态
|
10 years ago |
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
huang
|
4c974266b8
|
没消息显示!
|
10 years ago |
huang
|
3ecdb2940b
|
去掉统计信息
|
10 years ago |
huang
|
0da75afc88
|
消息排序(公共表)
|
10 years ago |
huang
|
5306d7e2a4
|
列表排序(未完)
|
10 years ago |
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
10 years ago |
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
10 years ago |
ouyangxuhua
|
b7a473a1b2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
cxt
|
51c2f595d1
|
个人主页动态
|
10 years ago |
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
10 years ago |
huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
10 years ago |
sw
|
7f2f2c5d40
|
个人主页,项目更多功能
|
10 years ago |
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
10 years ago |
huang
|
3858e87482
|
user留言类型
|
10 years ago |
huang
|
aadfd16e6a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
374c596a50
|
添加新图标,新base
|
10 years ago |