 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 |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
10 years ago |
|
ouyangxuhua
|
246594db40
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c8399cdf58
|
去掉forum
|
10 years ago |
|
ouyangxuhua
|
afdcb53a72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
10 years ago |
|
ouyangxuhua
|
d387a529d7
|
增加公共贴吧消息
|
10 years ago |
|
sw
|
f48e77901a
|
用户上传头像功能
|
10 years ago |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
10 years ago |
|
sw
|
e64c15a026
|
个人主页基本页面布局完成
|
10 years ago |
|
sw
|
a536af8fa3
|
用户show界面更新
|
10 years ago |
|
sw
|
b6a2be72e4
|
调整CSS，修改图片，实现部分功能动态效果
|
10 years ago |
|
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
10 years ago |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
10 years ago |
|
lizanle
|
0ef7d5f0fa
|
资源库可见性问题
|
10 years ago |
|
huang
|
e9c7125822
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
2d282f73cb
|
项目讨论区
|
10 years ago |
|
ouyangxuhua
|
dd401aca1a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ff3edf4d5e
|
消息显示
|
10 years ago |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
10 years ago |
|
lizanle
|
e7f818deb9
|
资源库搜索问题
|
10 years ago |
|
lizanle
|
3836cfb40b
|
资源库
|
10 years ago |
|
lizanle
|
43d57074e5
|
资源库
|
10 years ago |
|
cxt
|
652f5fa6e1
|
超级管理员的留言列表、帖子、最近登录用户列表的缺陷修复
|
10 years ago |
|
lizanle
|
ae6260571b
|
资源库
|
10 years ago |
|
huang
|
90661066d3
|
区分课程/项目讨论区
课程项目/新闻 的消息显示方式
|
10 years ago |
|
huang
|
5f29655406
|
issue状态更新显示
|
10 years ago |
|
lizanle
|
375c016783
|
资源库
|
10 years ago |
|
lizanle
|
32aef6f289
|
资源库
|
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
|
9c4e89177f
|
留言
|
10 years ago |
|
ouyangxuhua
|
3e4f726855
|
增加留言、指派给我
|
10 years ago |
|
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接，添加查询条件。
|
10 years ago |
|
lizanle
|
76be15f79b
|
资源库
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
sw
|
b27944fad7
|
增加css文件以及个人主页静态页面、缺失图片
|
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
|
4b07001d2a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
472254019e
|
优化
|
10 years ago |
|
ouyangxuhua
|
8f23a81261
|
消息显示样式更新
|
10 years ago |
|
huang
|
a677119ba0
|
修改界面样式
|
10 years ago |
|
ouyangxuhua
|
7ae44af0ab
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e72eeb37c8
|
通知显示
|
10 years ago |
|
huang
|
fe077a27fb
|
消息查询代码优化
|
10 years ago |
|
ouyangxuhua
|
fda8c802fb
|
消息显示
|
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 |
|
huang
|
07605d2d6d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
421f86cdaf
|
资源库
|
10 years ago |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
fc244982bc
|
处理冲突
修改浏览器兼容问题
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
huang
|
f731af0134
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
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
|
2cb5292dc1
|
完成课程讨论区消息回复方法
|
10 years ago |
|
huang
|
4013ff486a
|
消息界面调整
|
10 years ago |
|
sw
|
9b424a5b17
|
课程问卷调查----点击问卷列表中如图空白处也返回相关问卷详情页面
|
10 years ago |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
10 years ago |
|
sw
|
6051d0797d
|
课程搜索结果不正确
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
sw
|
16aea5ef42
|
迟交扣分0-50分
|
10 years ago |
|
sw
|
a8283a2861
|
点击问卷动态，跳转到答题界面
|
10 years ago |
|
sw
|
50fa03d00c
|
发布问卷时，该问卷才显示在动态，取消发布后取消显示该动态
|
10 years ago |
|
huang
|
a5c941f48c
|
课程发布通知消息提示
|
10 years ago |
|
sw
|
5cf6b7e76a
|
课程发布时间--->创建时间
|
10 years ago |
|
huang
|
0917030395
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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
|
3e9f3f4e70
|
课程动态，无对应数据时报错
|
10 years ago |
|
sw
|
4b5022bfc6
|
课程动态报错
|
10 years ago |
|
huang
|
69050b4271
|
指派给自己的缺陷不发送消息提示
|
10 years ago |
|
sw
|
23f8bd8312
|
搜索课程结果列表课程动态
|
10 years ago |
|
sw
|
29092db557
|
我的课程/我的项目按照课程/项目最新动态的时间排序
|
10 years ago |
|
sw
|
b036d5b63d
|
网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
|
10 years ago |
|
huang
|
fbf21fc51b
|
清除旧版本消息提示
|
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 |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
ouyangxuhua
|
96c4924c89
|
Merge branch 'ouyangxuhua' into szzh
|
10 years ago |
|
ouyangxuhua
|
e5289410dd
|
项目搜索页码显示问题
|
10 years ago |
|
ouyangxuhua
|
115e1e67d5
|
加入项目跳转至相应项目
|
10 years ago |
|
ouyangxuhua
|
78ccfe6a03
|
添加关注
|
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 |
|
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
10 years ago |
|
sw
|
ce76308864
|
课程动态，历史数据的迁移
|
10 years ago |
|
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
10 years ago |
|
sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
10 years ago |
|
huang
|
2d40c7a4d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
5f87d5806b
|
解决留言消息提示中遗留的bug
|
10 years ago |
|
lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
10 years ago |
|
sw
|
a1dfe13728
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
477db5841b
|
没有选择导入问卷的时候提示
|
10 years ago |
|
lizanle
|
51f71d1081
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
d43ded4f8b
|
1.没有可导入的问卷提示
2.教辅也可以导入老师的问卷
|
10 years ago |
|
cxt
|
21f81a931a
|
修改个人主页的“新建课程”“新建项目”“加入课程””加入项目“的按钮样式
|
10 years ago |
|
sw
|
733eeaf34f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
09b1c03ef2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
44f22feefd
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
huang
|
a51b532a0b
|
个人主页CSS
|
10 years ago |
|
sw
|
3d2a91c6be
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
08c4df8570
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
10 years ago |
|
huang
|
69adc98fe4
|
个人主页左侧显示不正常
|
10 years ago |
|
huang
|
f16d269101
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
ba84e19048
|
修正底部问题
|
10 years ago |
|
sw
|
f482d64a72
|
编译错误才存储错误信息
|
10 years ago |
