 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 |
|
lizanle
|
033aea28c5
|
新成员注册的时候报错
|
10 years ago |
|
sw
|
0489b02e54
|
课程留言无法删除
|
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 |
|
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
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 |
|
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接，添加查询条件。
|
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 |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
huang
|
64e1d88285
|
去掉项目消息提示
未登录情况下访问跳转至403
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
sw
|
ac4d529ebc
|
编程作业取消，并设定匿评为内置功能
|
10 years ago |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
10 years ago |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
10 years ago |
|
sw
|
6051d0797d
|
课程搜索结果不正确
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
huang
|
510613f9a4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
10 years ago |
|
sw
|
23f8bd8312
|
搜索课程结果列表课程动态
|
10 years ago |
|
sw
|
29092db557
|
我的课程/我的项目按照课程/项目最新动态的时间排序
|
10 years ago |
|
huang
|
5dd2befe88
|
添加消息看过后即不显示功能
|
10 years ago |
|
ouyangxuhua
|
11ad8d6d42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
96c4924c89
|
Merge branch 'ouyangxuhua' into szzh
|
10 years ago |
|
sw
|
a240a2785f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
ouyangxuhua
|
d67d21eb42
|
1、解决项目搜素 分页异常问题
|
10 years ago |
|
lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
10 years ago |
|
lizanle
|
51f71d1081
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
d43ded4f8b
|
1.没有可导入的问卷提示
2.教辅也可以导入老师的问卷
|
10 years ago |
|
huang
|
4589016027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
82747a7690
|
留言添加消息提示
|
10 years ago |
|
lizanle
|
a282d81551
|
加入课程或者已经加入的课程，提示后进行跳转
|
10 years ago |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
sw
|
0099c99829
|
增加错误信息的存储
|
10 years ago |
|
sw
|
3f51368bb2
|
老师布置作业界面增加错误信息的提示
|
10 years ago |
|
sw
|
c176122c00
|
迟交扣分、缺评扣分2分
|
10 years ago |
|
sw
|
8dbaff537a
|
编程作业取消上线
|
10 years ago |
|
sw
|
9a7a1def66
|
编程作业有多个输入输出测试集一样时只有第一个会进行编译结果的赋值
|
10 years ago |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
10 years ago |
|
huang
|
9d6ac57052
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
e70748fd81
|
去掉项目辅助工具（dts、yun）
|
10 years ago |
|
sw
|
d6fe9939f6
|
老师测试代码base64加密，
返回值json取值有问题
|
10 years ago |
|
huang
|
b42d8c6d2c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
93ef63d60d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
sw
|
9da18bcad4
|
老师测试结果的返回
|
10 years ago |
|
sw
|
c507a97ac6
|
根据编译返回结果，自动刷新页面是否成功
|
10 years ago |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
10 years ago |
|
sw
|
3e5af49281
|
点击测试时增加事件的发送
|
10 years ago |
|
sw
|
a68fcf74aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ce89c7d119
|
用户留言后界面的刷新，留言的分页显示
|
10 years ago |
|
sw
|
d790fb31e4
|
匿名用户不可在个人主页留言
|
10 years ago |
|
sw
|
a667d97768
|
进入其他人个人主页时，点击他创建的课程报错
|
10 years ago |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
10 years ago |
|
lizanle
|
a0a5f34108
|
导入以前的问卷
|
10 years ago |
|
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
10 years ago |
|
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
10 years ago |
|
sw
|
38599614d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
f31015c989
|
上线编程作业
|
10 years ago |
