huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
2015-09-01 17:37:43 +08:00 |
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
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
|
2015-09-01 15:28:03 +08:00 |
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
2015-09-01 15:03:24 +08:00 |
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
sw
|
b3919256fa
|
111
|
2015-09-01 09:17:12 +08:00 |
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
2015-08-29 16:39:37 +08:00 |
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 12:32:08 +08:00 |
lizanle
|
ad8bd379a1
|
用户资源过滤
|
2015-08-29 12:32:00 +08:00 |
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 12:04:57 +08:00 |
sw
|
86e9ec068f
|
新建作业时,作业截止时间为空
|
2015-08-29 11:12:18 +08:00 |
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
2015-08-29 10:16:04 +08:00 |
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
2015-08-28 17:07:48 +08:00 |
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 17:02:49 +08:00 |
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
2015-08-28 16:47:43 +08:00 |
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
2015-08-28 15:51:42 +08:00 |
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
2015-08-28 14:49:55 +08:00 |
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 11:56:52 +08:00 |
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
lizanle
|
f9651d853c
|
资源每页显示的个数
|
2015-08-28 10:47:50 +08:00 |
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
huang
|
9709692a08
|
修改消息每页的显示个数
|
2015-08-28 09:55:23 +08:00 |
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-27 17:35:04 +08:00 |
huang
|
1b9da8d963
|
消息添加分页功能
|
2015-08-27 16:57:32 +08:00 |
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
2015-08-27 11:02:20 +08:00 |
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:04 +08:00 |
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 17:58:59 +08:00 |
cxt
|
caec5e5490
|
个人主页动态
|
2015-08-26 17:58:48 +08:00 |
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
2015-08-26 17:57:54 +08:00 |
sw
|
dafc128f34
|
增加部分默认参数的设置
|
2015-08-26 17:44:03 +08:00 |
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
2015-08-26 17:42:52 +08:00 |
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
|
2015-08-26 17:31:37 +08:00 |
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
huang
|
85b90f9958
|
消息代码清理
|
2015-08-26 16:56:41 +08:00 |
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
2015-08-26 16:14:50 +08:00 |
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 15:49:11 +08:00 |
lizanle
|
a53b9f9049
|
留言模块
|
2015-08-26 15:49:05 +08:00 |
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 15:25:15 +08:00 |
cxt
|
048319ef8e
|
个人主页
|
2015-08-26 15:24:57 +08:00 |
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 15:04:44 +08:00 |
sw
|
8247a29b85
|
只有admin用户可以修改个人简介
|
2015-08-26 14:50:01 +08:00 |
lizanle
|
d735eee4a3
|
关注和取消关注
|
2015-08-26 11:41:32 +08:00 |
cxt
|
fce523606c
|
个人主页
|
2015-08-25 20:08:52 +08:00 |
cxt
|
e4c9f05c7b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 19:24:37 +08:00 |
cxt
|
bd00870eba
|
个人主页
|
2015-08-25 19:24:23 +08:00 |
sw
|
56a1283033
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 19:19:41 +08:00 |
sw
|
d8b87ccc37
|
作业列表滚动到底部显示下面10条作业
|
2015-08-25 19:18:56 +08:00 |
lizanle
|
70e9d75cc6
|
登陆后的搜索
|
2015-08-25 18:59:45 +08:00 |
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
2015-08-25 16:01:31 +08:00 |
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:09:21 +08:00 |
cxt
|
4915f7977e
|
个人动态
|
2015-08-25 15:08:35 +08:00 |
sw
|
c93bc5be40
|
作业列表效果显示
|
2015-08-25 13:50:42 +08:00 |
huang
|
4c974266b8
|
没消息显示!
|
2015-08-25 13:04:25 +08:00 |
huang
|
3ecdb2940b
|
去掉统计信息
|
2015-08-25 12:43:27 +08:00 |
huang
|
0da75afc88
|
消息排序(公共表)
|
2015-08-25 11:10:08 +08:00 |
huang
|
5306d7e2a4
|
列表排序(未完)
|
2015-08-24 23:53:28 +08:00 |
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 18:17:45 +08:00 |
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
2015-08-24 18:15:46 +08:00 |
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
ouyangxuhua
|
b7a473a1b2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-24 17:46:11 +08:00 |
cxt
|
51c2f595d1
|
个人主页动态
|
2015-08-24 17:45:09 +08:00 |
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
2015-08-24 17:45:00 +08:00 |
huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-24 15:46:29 +08:00 |
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 15:32:51 +08:00 |
sw
|
7f2f2c5d40
|
个人主页,项目更多功能
|
2015-08-24 14:53:35 +08:00 |
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
2015-08-24 14:44:22 +08:00 |
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-24 13:54:22 +08:00 |
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
2015-08-24 13:54:15 +08:00 |
huang
|
3858e87482
|
user留言类型
|
2015-08-24 11:43:43 +08:00 |
huang
|
aadfd16e6a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-24 11:39:03 +08:00 |
huang
|
374c596a50
|
添加新图标,新base
|
2015-08-24 11:37:50 +08:00 |
ouyangxuhua
|
b2ac4e8e1f
|
项目消息问题
|
2015-08-24 11:27:36 +08:00 |
sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
2015-08-24 11:03:18 +08:00 |
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
lizanle
|
67c5a8e9c5
|
分页改为了15条
|
2015-08-24 10:31:25 +08:00 |
lizanle
|
830815d3fd
|
课程资源搜索bug
|
2015-08-21 21:29:33 +08:00 |
sw
|
cc4661a9b8
|
Merge branch 'szzh' into develop
|
2015-08-21 17:38:21 +08:00 |
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
2015-08-21 17:13:42 +08:00 |
lizanle
|
033aea28c5
|
新成员注册的时候报错
|
2015-08-21 17:05:54 +08:00 |
lizanle
|
f6b01b300d
|
资源库 全部里能看到课程资源,但是分类里边却没有。
|
2015-08-21 16:36:42 +08:00 |
huang
|
4e4df99bb1
|
处理冲突
|
2015-08-21 16:34:57 +08:00 |
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
cxt
|
e1fb2a6bab
|
个人主页动态
|
2015-08-21 16:07:18 +08:00 |
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
2015-08-21 14:00:24 +08:00 |
lizanle
|
8a88935b7c
|
资源库 只能看到自己的资源库
|
2015-08-21 10:44:09 +08:00 |
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
2015-08-21 10:14:04 +08:00 |
lizanle
|
7deafac280
|
资源库 修改
|
2015-08-21 10:02:26 +08:00 |
huang
|
840caf18f3
|
修改排序
|
2015-08-20 17:40:01 +08:00 |
lizanle
|
705d31b1d0
|
资源库 修改
|
2015-08-20 17:38:30 +08:00 |
cxt
|
4c87071765
|
个人动态
|
2015-08-20 17:24:34 +08:00 |
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
2015-08-20 17:20:38 +08:00 |
lizanle
|
0e8c1d1b66
|
资源库 分页
|
2015-08-20 17:00:54 +08:00 |
huang
|
7c7c337deb
|
控制界面
|
2015-08-20 16:29:43 +08:00 |
huang
|
ff53840029
|
修改消息中存在的页面bug
|
2015-08-20 16:27:49 +08:00 |
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
huang
|
93f44287aa
|
jounal状态
|
2015-08-20 14:32:46 +08:00 |
huang
|
b40122c9ee
|
跟新issue状态!
|
2015-08-20 14:18:16 +08:00 |
lizanle
|
f97a55e164
|
资源库 删除
|
2015-08-20 14:01:33 +08:00 |
huang
|
e4dda89c07
|
消息---用户留言界面
|
2015-08-20 12:44:32 +08:00 |
huang
|
b5682adcd3
|
添加统计数
|
2015-08-20 10:50:40 +08:00 |
huang
|
192f16ba79
|
修改memo类
添加新的用户留言表结构
|
2015-08-20 10:38:22 +08:00 |
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
huang
|
c8399cdf58
|
去掉forum
|
2015-08-19 17:49:47 +08:00 |
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
2015-08-19 15:03:04 +08:00 |
lizanle
|
0ef7d5f0fa
|
资源库可见性问题
|
2015-08-19 12:04:06 +08:00 |
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
2015-08-19 11:06:39 +08:00 |
lizanle
|
e7f818deb9
|
资源库搜索问题
|
2015-08-19 09:20:39 +08:00 |
lizanle
|
43d57074e5
|
资源库
|
2015-08-18 17:26:39 +08:00 |
lizanle
|
ae6260571b
|
资源库
|
2015-08-18 16:57:41 +08:00 |
huang
|
90661066d3
|
区分课程/项目讨论区
课程项目/新闻 的消息显示方式
|
2015-08-18 16:53:26 +08:00 |
huang
|
f9fc63402b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-18 15:27:37 +08:00 |
huang
|
6b55474623
|
作品被评阅
作品被回复
消息通知
|
2015-08-18 15:27:16 +08:00 |
lizanle
|
7219586b1e
|
资源库
|
2015-08-18 15:25:36 +08:00 |
ouyangxuhua
|
3e4f726855
|
增加留言、指派给我
|
2015-08-18 14:43:15 +08:00 |
lizanle
|
76be15f79b
|
资源库
|
2015-08-18 11:53:54 +08:00 |
sw
|
752fe93d72
|
已登录用户header完成
|
2015-08-18 11:47:22 +08:00 |
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
2015-08-18 10:31:40 +08:00 |
lizanle
|
25460cd255
|
资源库
|
2015-08-18 09:31:03 +08:00 |
huang
|
71f6927145
|
issue控制层消息
|
2015-08-17 16:37:05 +08:00 |
huang
|
dd1dd143f6
|
添加项目缺陷消息显示
|
2015-08-17 16:15:40 +08:00 |
huang
|
472254019e
|
优化
|
2015-08-17 16:04:04 +08:00 |
huang
|
fe077a27fb
|
消息查询代码优化
|
2015-08-17 15:04:09 +08:00 |
huang
|
239cba54d9
|
区分未读消息和已读消息
|
2015-08-17 11:34:29 +08:00 |
huang
|
a71ff944c0
|
消息排序
|
2015-08-17 10:42:38 +08:00 |
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
huang
|
64e1d88285
|
去掉项目消息提示
未登录情况下访问跳转至403
|
2015-08-15 16:11:40 +08:00 |
huang
|
9b98bdcf5c
|
1、消息看过则不提示(方法实现)
2、添加消息新按钮
|
2015-08-15 15:44:44 +08:00 |
huang
|
ed8c4ac906
|
不同类型消息发送
|
2015-08-15 02:11:18 +08:00 |
huang
|
17fad1f291
|
课程(所有消息)--发布作业、新闻、问卷界面
|
2015-08-14 17:05:27 +08:00 |
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面(未完成)
|
2015-08-14 15:48:23 +08:00 |
huang
|
2c865069d3
|
所有消息显示功能
|
2015-08-13 22:33:08 +08:00 |
sw
|
29092db557
|
我的课程/我的项目按照课程/项目最新动态的时间排序
|
2015-08-13 11:10:09 +08:00 |
huang
|
82747a7690
|
留言添加消息提示
|
2015-08-10 16:12:13 +08:00 |
sw
|
a667d97768
|
进入其他人个人主页时,点击他创建的课程报错
|
2015-07-29 15:55:23 +08:00 |
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
2015-07-29 10:34:04 +08:00 |
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
2015-07-28 16:04:40 +08:00 |
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
2015-07-28 15:56:06 +08:00 |
sw
|
ce17cb1da0
|
个人主页,TA的课程显示和课程数量、课程列表不匹配
|
2015-07-23 15:13:18 +08:00 |
yutao
|
59c1810d6b
|
个人主页
|
2015-07-18 10:55:12 +08:00 |
yutao
|
2efb4833f2
|
个人主页
|
2015-07-17 15:07:01 +08:00 |
yutao
|
8d858cccfc
|
个人主页
|
2015-07-17 13:40:53 +08:00 |
yutao
|
addf3604ec
|
个人主页
|
2015-07-16 16:58:31 +08:00 |
yutao
|
87ab758ec5
|
个人主页->动态
|
2015-07-16 10:26:09 +08:00 |
yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |
yutao
|
b7c4449f4b
|
个人主页
|
2015-07-13 16:44:53 +08:00 |
yutao
|
02d09c84b4
|
个人主页->留言
|
2015-07-10 14:17:19 +08:00 |
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
sw
|
8b0eb21d08
|
关注需求功能取消,部分用户进入个人主页报错
|
2015-06-05 11:17:00 +08:00 |
sw
|
bd6a057008
|
老师布置作业加入个人动态
|
2015-06-02 14:35:17 +08:00 |
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
2015-05-18 16:41:04 +08:00 |
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
2015-04-10 16:27:26 +08:00 |
guange
|
5a876d9df1
|
邮件发送时,单个收件人会报错
|
2015-04-10 10:41:44 +08:00 |
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
2015-03-31 11:51:34 +08:00 |
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
2015-03-16 09:28:18 +08:00 |
sw
|
bdd1980876
|
修复个人动态首页报错
|
2015-03-10 11:39:01 +08:00 |
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
2015-03-09 17:28:17 +08:00 |
sw
|
c6788e2f40
|
修复首页报错
|
2015-03-07 15:30:37 +08:00 |
sw
|
945b9ff9cf
|
修复进入我的动态,关注人没有进行权限过滤的BUG
|
2015-03-07 11:38:15 +08:00 |
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全,以及部分权限判断不正确
|
2015-03-07 11:30:21 +08:00 |
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
2015-03-06 08:59:29 +08:00 |
lizanle
|
7ee58d1d44
|
项目动态重写,并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
alan
|
36dfd7c77c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-27 15:12:56 +08:00 |
alan
|
00c0ddc600
|
admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
|
2015-01-27 15:11:24 +08:00 |
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:19:54 +08:00 |
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:18:24 +08:00 |
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
z9hang
|
6efe9ff5c6
|
注释掉无用的方法调用
|
2015-01-12 17:34:26 +08:00 |
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 10:37:32 +08:00 |
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 12:29:49 +08:00 |
sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
2014-12-30 10:57:39 +08:00 |
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
2014-12-24 09:45:23 +08:00 |
sw
|
b512bc53e9
|
修改用户搜索无法精确搜索的bUG
|
2014-12-24 09:08:42 +08:00 |
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 17:02:32 +08:00 |
sw
|
73afb7e6c8
|
调用作业课程时首先判断该作业的所属课程是否存在
|
2014-12-22 14:15:49 +08:00 |
alan
|
c99af4cb7b
|
修改《个人主页出现没权限访问链接》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 11:26:21 +08:00 |
alan
|
d81240e63c
|
修改《关注老师后,老师发布的作业都会在我主页的动态中显示出来,若我未加入该课程但感兴趣点击后返回403页面,提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 01:29:53 +08:00 |
z9hang
|
1494821b67
|
用户搜索接口
|
2014-12-10 20:27:41 +08:00 |
sw
|
fef005d2d3
|
修改搜索用户报错
|
2014-11-25 11:29:09 +08:00 |
moon
|
e4e4c94d53
|
封掉所有列表入口,及页面中更多入口
|
2014-11-21 16:59:58 +08:00 |
alan
|
e9d75bde6f
|
《修改资料》页面:工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:14:40 +08:00 |
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
2014-11-08 16:40:36 +08:00 |
z9hang
|
b141db6624
|
用户留言修复
|
2014-11-05 10:41:34 +08:00 |
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-04 17:06:16 +08:00 |
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
2014-10-21 10:40:03 +08:00 |
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
2014-10-17 15:02:09 +08:00 |
z9hang
|
57776d67c5
|
优化代码
|
2014-10-16 11:09:45 +08:00 |
sw
|
602982a124
|
龚乐鑫修改意见4:redirect_to后使用 url
|
2014-10-15 09:54:54 +08:00 |
sw
|
8cd3dd0287
|
1.#1249 未登录和非本人进入用户课程界面时隐藏课程不显示
解决方案:判断当前用户和所查看的用户是否一致,不一致取消隐藏课程的显示
2.国际化代码以及页面代码调整
|
2014-10-10 09:21:10 +08:00 |