 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 |
 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 |
 lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
b3919256fa
|
111
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
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 |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
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 |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
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 |
|
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
|
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 |
|
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
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 |
|
sw
|
cc4661a9b8
|
Merge branch 'szzh' into develop
|
10 years ago |
|
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
10 years ago |
|
lizanle
|
033aea28c5
|
新成员注册的时候报错
|
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
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
10 years ago |
|
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
10 years ago |
|
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
7deafac280
|
资源库 修改
|
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 |
|
lizanle
|
f97a55e164
|
资源库 删除
|
10 years ago |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
10 years ago |
|
huang
|
b5682adcd3
|
添加统计数
|
10 years ago |
|
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
10 years ago |
|
lizanle
|
76c2c47adf
|
资源库
|
10 years ago |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
10 years ago |
|
huang
|
c8399cdf58
|
去掉forum
|
10 years ago |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
10 years ago |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
10 years ago |
|
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
10 years ago |
|
lizanle
|
0ef7d5f0fa
|
资源库可见性问题
|
10 years ago |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
10 years ago |
|
lizanle
|
e7f818deb9
|
资源库搜索问题
|
10 years ago |
|
lizanle
|
43d57074e5
|
资源库
|
10 years ago |
|
lizanle
|
ae6260571b
|
资源库
|
10 years ago |
|
huang
|
90661066d3
|
区分课程/项目讨论区
课程项目/新闻 的消息显示方式
|
10 years ago |
|
huang
|
f9fc63402b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
6b55474623
|
作品被评阅
作品被回复
消息通知
|
10 years ago |
|
lizanle
|
7219586b1e
|
资源库
|
10 years ago |
|
ouyangxuhua
|
3e4f726855
|
增加留言、指派给我
|
10 years ago |
|
lizanle
|
76be15f79b
|
资源库
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
10 years ago |
|
lizanle
|
25460cd255
|
资源库
|
10 years ago |
|
huang
|
71f6927145
|
issue控制层消息
|
10 years ago |
|
huang
|
dd1dd143f6
|
添加项目缺陷消息显示
|
10 years ago |
|
huang
|
472254019e
|
优化
|
10 years ago |
|
huang
|
fe077a27fb
|
消息查询代码优化
|
10 years ago |
|
huang
|
239cba54d9
|
区分未读消息和已读消息
|
10 years ago |
|
huang
|
a71ff944c0
|
消息排序
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
64e1d88285
|
去掉项目消息提示
未登录情况下访问跳转至403
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
10 years ago |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
sw
|
29092db557
|
我的课程/我的项目按照课程/项目最新动态的时间排序
|
10 years ago |
|
huang
|
82747a7690
|
留言添加消息提示
|
10 years ago |
|
sw
|
a667d97768
|
进入其他人个人主页时，点击他创建的课程报错
|
10 years ago |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
10 years ago |
|
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
10 years ago |
|
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
10 years ago |
|
sw
|
ce17cb1da0
|
个人主页，TA的课程显示和课程数量、课程列表不匹配
|
10 years ago |
 yutao
|
59c1810d6b
|
个人主页
|
10 years ago |
|
yutao
|
2efb4833f2
|
个人主页
|
10 years ago |
|
yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
