 huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
10 years ago |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
10 years ago |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
10 years ago |
 cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
 sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
10 years ago |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
10 years ago |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
|
sw
|
b3919256fa
|
111
|
10 years ago |
|
lizanle
|
5b40628a5b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9ca1234324
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
sw
|
7a4d562773
|
课程主页，项目主页 500
|
10 years ago |
|
sw
|
8be7509b33
|
课程、竞赛主页跳转到个人主页
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
ac60fdf0b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
de5dd08b55
|
登录之后跳到个人主页
|
10 years ago |
|
sw
|
9437188c9b
|
登录界面enter键监听
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
10 years ago |
|
lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
3a21c4e2fa
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
ad8bd379a1
|
用户资源过滤
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
lizanle
|
2b7beaeae8
|
上次登录的地址用户id变为当前用户id
|
10 years ago |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
10 years ago |
|
guange
|
5fb2989427
|
Merge remote-tracking branch 'origin/szzh' into homework
|
10 years ago |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
lizanle
|
7916ca2ee3
|
密码重置
|
10 years ago |
|
lizanle
|
d99c1dd72a
|
重置密码的base错了。
|
10 years ago |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
|
guange
|
3ae4d01284
|
.
|
10 years ago |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
631283ae79
|
remove grack
|
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
|
e4a36b9be2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
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 |
|
lizanle
|
ba9a64360e
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
65b5b467d4
|
服务协议
|
10 years ago |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
10 years ago |
|
lizanle
|
ccfd69602c
|
服务协议
|
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
|
47b20a7633
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
8247a29b85
|
只有admin用户可以修改个人简介
|
10 years ago |
|
lizanle
|
d500ea0790
|
关注人数变化
|
10 years ago |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
10 years ago |
|
lizanle
|
4ee571e586
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
cf12ee877e
|
编辑资料的时候个人说明隐藏
|
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
|
5c43c902c4
|
编辑资料css
|
10 years ago |
|
lizanle
|
70e9d75cc6
|
登陆后的搜索
|
10 years ago |
 ouyangxuhua
|
24f26749c0
|
修改memo对应的memo_messages的viewed字段
|
10 years ago |
|
ouyangxuhua
|
0056fa9db3
|
修改了课程问卷的link_to以及对应的course_messages的viewed字段
|
10 years ago |
|
ouyangxuhua
|
f56d9ed265
|
设置作业对应的forge_messages表的viewed字段
|
10 years ago |
|
lizanle
|
c360bdaf7d
|
logout
|
10 years ago |
|
lizanle
|
79bd438c87
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
f2e406a416
|
登陆注册按钮改为页面跳转
|
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
|
097d52c07a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
4915f7977e
|
个人动态
|
10 years ago |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
d25971f546
|
登陆界面
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
huang
|
4c974266b8
|
没消息显示！
|
10 years ago |
|
huang
|
64e54cda75
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
3ecdb2940b
|
去掉统计信息
|
10 years ago |
|
ouyangxuhua
|
32e67a3cb1
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
12c3f5a723
|
消息讨论区viewed字段更新
|
10 years ago |
|
huang
|
bff139b9a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
10 years ago |
|
ouyangxuhua
|
354cb52339
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d83ed09617
|
更新viewed字段
|
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 |
|
ouyangxuhua
|
bf596d7b4b
|
更新新闻viewed字段
|
10 years ago |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
10 years ago |
|
lizanle
|
39b022f696
|
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 |
|
lizanle
|
614743d8d4
|
登陆界面
|
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 |
|
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
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 |
|
lizanle
|
830815d3fd
|
课程资源搜索bug
|
10 years ago |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
cc4661a9b8
|
Merge branch 'szzh' into develop
|
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 |
