 lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
2962408c06
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
3a21c4e2fa
|
登录之后跳到个人主页
|
10 years ago |
 cxt
|
250d7a48dc
|
主页动态页面的刷新
|
10 years ago |
 sw
|
6cb21d3430
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
73ffbb7dfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c0daebd75c
|
上传图片js
|
10 years ago |
|
sw
|
b65243ba62
|
添加关注、取消关注js刷新
|
10 years ago |
|
sw
|
a2ec65a0c9
|
添加关注与取消关注
|
10 years ago |
|
cxt
|
b30a07d651
|
个人主页动态
|
10 years ago |
|
sw
|
498775b0a8
|
登录界面多了一个<
教授职称
|
10 years ago |
suntao
|
a22727efb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
5e25b64004
|
提交按钮对齐
|
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 |
 huang
|
4e1766d578
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
5f4b879fb7
|
修改消息过滤条件
|
10 years ago |
|
sw
|
e455f93ee1
|
上传图片；浏览图片按钮
|
10 years ago |
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
lizanle
|
ca2b20bd99
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
92298160a7
|
搜索后的资源总数在搜索框右边展示
|
10 years ago |
|
huang
|
8e70bc22e0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
f438d300dd
|
消息数据迁移（未完）
|
10 years ago |
|
suntao
|
1351742919
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
10 years ago |
|
lizanle
|
577376a037
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
2b7beaeae8
|
上次登录的地址用户id变为当前用户id
|
10 years ago |
 ouyangxuhua
|
1957100062
|
用户关注ajax刷新
|
10 years ago |
|
sw
|
f01b5681a5
|
增加项目、课程的收起
|
10 years ago |
|
ouyangxuhua
|
f99097f3d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
a111b9a3fd
|
用户关注ajax刷新
|
10 years ago |
|
sw
|
e5bf355a17
|
导航栏搜索支持enter键
|
10 years ago |
|
suntao
|
5f3532ac14
|
头像部分修改
|
10 years ago |
|
sw
|
7263598851
|
访问问卷报500
|
10 years ago |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
sw
|
00ab2bcbd4
|
作业名称过长超出边框
|
10 years ago |
|
lizanle
|
5e485e5175
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
878f48079d
|
全选框在翻页后也应该重置为不选
|
10 years ago |
|
lizanle
|
eef96701dd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
60b429b13d
|
发送成功不给提示
课程资源过少的时候不给滚动条
|
10 years ago |
|
sw
|
2d00eb982c
|
取消跳转到个人主页
|
10 years ago |
|
suntao
|
9d638b705a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
2342d1c23a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
bcec8eb35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
suntao
|
ada04e5e63
|
个人主页头像模块改动
|
10 years ago |
|
huang
|
6287f9b39e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
10 years ago |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
10 years ago |
|
huang
|
6406d5a284
|
解决邮件内容空的问题
|
10 years ago |
|
lizanle
|
53b150486d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
789b62940b
|
资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后 自选资源清零的问题
|
10 years ago |
|
huang
|
c1851a74c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
170cdad3e3
|
解决消息过滤404问题
|
10 years ago |
|
cxt
|
69178f1522
|
个人主页
|
10 years ago |
|
cxt
|
27b8d85cc5
|
个人主页
|
10 years ago |
|
sw
|
7ec10d7b39
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
10 years ago |
|
cxt
|
36860e8c4f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e448d2c05f
|
个人主页
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
sw
|
aa06c3ac03
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
49972ca476
|
样式调整，取消资源库选择资源
|
10 years ago |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
e193cb0f2d
|
消息列表界面新样式
|
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
|
148a4e2479
|
发布作业样式
|
10 years ago |
|
sw
|
bbb8e5a062
|
老师发布作业取消功能
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
sw
|
02f7538200
|
个人描述为英文时不换行
|
10 years ago |
|
huang
|
331592d78a
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
10 years ago |
|
suntao
|
4392ecdcd7
|
消息格式更改
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
suntao
|
e12bef1126
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
a19692a0c6
|
个人主页左侧修改
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
10 years ago |
|
suntao
|
02120c778f
|
样式修改
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
suntao
|
c0477fda99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
b6d58b1b58
|
样式调整
|
10 years ago |
|
sw
|
43d9697195
|
发布作业增加块的显示
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
6dde8d1ea6
|
资源库弹出框位置优化
|
10 years ago |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
10 years ago |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
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 |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
lizanle
|
7916ca2ee3
|
密码重置
|
10 years ago |
|
sw
|
cc76c13700
|
资源库样式
|
10 years ago |
|
lizanle
|
b7daa643c8
|
资源库空白处单击也要隐藏弹出框
|
10 years ago |
|
lizanle
|
a4e30d119d
|
删不掉资源的提示
|
10 years ago |
|
lizanle
|
d99c1dd72a
|
重置密码的base错了。
|
10 years ago |
|
lizanle
|
cff93331b2
|
更改登录首页的标点符号
|
10 years ago |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
|
huang
|
a7eff50c61
|
消息留言发送：回复东家，回复人和东家只能一人收到消息
|
10 years ago |
|
lizanle
|
0a898342d9
|
登录按钮可以用enter键
|
10 years ago |
|
sw
|
8cd6c7d2a0
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
lizanle
|
41a8f9d6a2
|
底部去掉marginBottom:10px
登录界面加底部
|
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
|
ed3be27687
|
消息界面样式
|
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
|
d1577028be
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
lizanle
|
5f23244742
|
忘记密码
|
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
|
347298124e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 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 |
|
sw
|
01c8ee3898
|
1、个人主页新建课程、新建项目、加入课程功能添加
2、新建课程时导航栏的修改
|
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
|
5b9c9312f5
|
留言界面样式修改
|
10 years ago |
|
sw
|
afeaecc478
|
作业列表增加标题
|
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 |
|
cxt
|
7c3544dfec
|
个人主页动态
|
10 years ago |
|
cxt
|
706415dc6e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
2124b3c392
|
个人主页动态缺陷修复
|
10 years ago |
|
huang
|
85b90f9958
|
消息代码清理
|
10 years ago |
|
lizanle
|
9e9de44397
|
服务协议
|
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
|
ef74d129c5
|
消息通知回复链接样式
|
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
|
5ec24913bb
|
留言背景色 留言头
|
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 |
|
sw
|
af2434809b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
7340a664f2
|
链接颜色
|
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 |
|
sw
|
4fe3ba2442
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
a08d32d0f3
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
10 years ago |
|
lizanle
|
24892c9645
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
7f19295b88
|
服务协议
|
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 |
|
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
10 years ago |
|
lizanle
|
d500ea0790
|
关注人数变化
|
10 years ago |
|
lizanle
|
da47f5bb00
|
登录报错后就无法登录bug
|
10 years ago |
|
sw
|
7081fc9975
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
lizanle
|
cb61816d9a
|
登录字样写错了
|
10 years ago |
|
sw
|
686af68026
|
关注、粉丝、编辑资料页面样式问题
|
10 years ago |
|
sw
|
f0a4d364b0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
10 years ago |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
10 years ago |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
10 years ago |
|
sw
|
aa28b5ba6a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
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 |
|
huang
|
0007b720b3
|
修改描述
|
10 years ago |
|
cxt
|
cccc0577c7
|
个人动态
|
10 years ago |
|
cxt
|
fce523606c
|
个人主页
|
10 years ago |
|
sw
|
ab7fd7bc8f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
18029fcb22
|
111
|
10 years ago |
|
sw
|
ad524f5a6c
|
取消课程、项目、贴吧等独自的搜索条，搜索统一使用导航栏搜索条
|
10 years ago |
|
huang
|
627ca059ca
|
解决issue的更新
和新建问题
|
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 |
|
sw
|
bedc364275
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/layouts/_unlogin_header.html.erb
|
10 years ago |
|
lizanle
|
d2135f7204
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
0be3ef0a65
|
搜索
|
10 years ago |
|
sw
|
767fc67686
|
已过期课程显示为darkgrey
|
10 years ago |
|
sw
|
6ea185f250
|
修改资料页面跳转以及搜索弹出框样式
|
10 years ago |
|
sw
|
ffe40b399d
|
个人动态表重构
|
10 years ago |
|
ouyangxuhua
|
10e39a6967
|
发帖的消息内容显示的是帖子的主题
|
10 years ago |
|
ouyangxuhua
|
24f26749c0
|
修改memo对应的memo_messages的viewed字段
|
10 years ago |
|
sw
|
30147c29ee
|
帮助中心页面跳转
|
10 years ago |
|
sw
|
a32d6697ce
|
点击确实图标，跳转到登录界面
|
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 |
|
huang
|
c6b460f520
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9096fca298
|
留言消息发送策略
|
10 years ago |
|
sw
|
e2af9e26f8
|
个人主页报错
|
10 years ago |
|
ouyangxuhua
|
67c31d59d0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
03ac1ca37c
|
消息人物头像链接
|
10 years ago |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
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
|
725143b894
|
登陆界面 错误信息提示
|
10 years ago |
|
huang
|
716ffcfdc9
|
修改留言多余内容
|
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
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
10 years ago |
|
huang
|
3170fb2377
|
相关问题
|
10 years ago |
|
huang
|
36c855cc65
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
a83fc1c8d8
|
0
|
10 years ago |
|
huang
|
90c199f15a
|
缺陷更新区别新建
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
ouyangxuhua
|
49af0cdea7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
10 years ago |
|
huang
|
4c974266b8
|
没消息显示！
|
10 years ago |
|
huang
|
b1ed9deba1
|
内容框对齐
|
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 |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
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 |
|
sw
|
67c4561b28
|
我的课程、我的项目图标
|
10 years ago |
|
cxt
|
9320cd18d3
|
个人动态的项目讨论动态
|
10 years ago |
|
sw
|
d132c08a11
|
增加footer
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
10 years ago |
|
huang
|
7961e3db6f
|
建立公共表
|
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
|
45d90639c9
|
静态页面的间距
|
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 |
|
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
d575ce5e5f
|
消息公共表
|
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 |
|
sw
|
26c5592d29
|
用户课程或项目名称过长时的显示
|
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
|
86d2f5342c
|
登陆界面
|
10 years ago |
|
lizanle
|
614743d8d4
|
登陆界面
|
10 years ago |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
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
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
10 years ago |
|
sw
|
fe91442c96
|
课程列表已关闭课程标识出来
|
10 years ago |
|
huang
|
4d0abbc4d3
|
添加消息总数和未读控制
|
10 years ago |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
10 years ago |
|
huang
|
3919f15806
|
调整消息提示样式及连接
|
10 years ago |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
|
huang
|
17b06963dd
|
添加未读样式
|
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
|
fe8924443c
|
html_safe显示
|
10 years ago |
|
huang
|
3858e87482
|
user留言类型
|
10 years ago |
|
sw
|
36152d19e8
|
个人show界面下面有一块空白界面
|
10 years ago |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
10 years ago |
|
huang
|
aadfd16e6a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
huang
|
98b6c090c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
374c596a50
|
添加新图标，新base
|
10 years ago |
|
sw
|
15c44297cc
|
用户base关联user_base.js
|
10 years ago |
|
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
10 years ago |
|
huang
|
1e6db593d6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9f664d8172
|
修改表情无法显示问题
|
10 years ago |
|
ouyangxuhua
|
657f5f9acf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ab37372dad
|
增加消息用户链接
|
10 years ago |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
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 |
|
huang
|
ff3816e97d
|
添加链接，修复留言无法显示问题
|
10 years ago |
|
lizanle
|
67c5a8e9c5
|
分页改为了15条
|
10 years ago |
|
huang
|
b9980d4ab1
|
消息没显示问题！
|
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 |
|
huang
|
4e4df99bb1
|
处理冲突
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
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
|
e1fb2a6bab
|
个人主页动态
|
10 years ago |
|
lizanle
|
051c921108
|
资源库 多选发送给出提示
|
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 |
|
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 |
|
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
10 years ago |
|
lizanle
|
3feff49ca3
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
cf243d47e5
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
huang
|
9b827a698c
|
鼠标经过的时候显示完整的标题
|
10 years ago |
|
lizanle
|
7deafac280
|
资源库 修改
|
10 years ago |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
10 years ago |
|
huang
|
893c1c753f
|
修复留言嵌套回复问题
|
10 years ago |
|
huang
|
840caf18f3
|
修改排序
|
10 years ago |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
10 years ago |
|
cxt
|
4c87071765
|
个人动态
|
10 years ago |
|
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
10 years ago |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
10 years ago |
|
huang
|
7c7c337deb
|
控制界面
|
10 years ago |
|
huang
|
ff53840029
|
修改消息中存在的页面bug
|
10 years ago |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
10 years ago |
|
huang
|
93f44287aa
|
jounal状态
|
10 years ago |
|
huang
|
b40122c9ee
|
跟新issue状态！
|
10 years ago |
|
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
f97a55e164
|
资源库 删除
|
10 years ago |
|
huang
|
404a6f4bca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
6b847e27d9
|
修正问题
|
10 years ago |
|
ouyangxuhua
|
cb773e37ea
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ee09a105d2
|
贴吧帖子改名
|
10 years ago |
|
huang
|
f829c6ff23
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
|
10 years ago |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
10 years ago |
|
ouyangxuhua
|
84182171f5
|
消息信息显示
|
10 years ago |
|
lizanle
|
107a5686d1
|
资源库 全选反选
|
10 years ago |
|
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
10 years ago |
|
ouyangxuhua
|
b256d0a24e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b5682adcd3
|
添加统计数
|
10 years ago |
|
ouyangxuhua
|
27b42a5437
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
10 years ago |
|
ouyangxuhua
|
88fe0a69f4
|
消息显示判断
|
10 years ago |
|
lizanle
|
76c2c47adf
|
资源库
|
10 years ago |
|
ouyangxuhua
|
36aff18e9d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
