 sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
2015-09-06 16:51:33 +08:00 |
|
sw
|
970de3374c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 16:50:39 +08:00 |
 huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
2015-09-06 16:50:03 +08:00 |
|
sw
|
089c4ab490
|
1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
|
2015-09-06 16:49:29 +08:00 |
|
sw
|
e0376b5176
|
tag的导航栏和底部导航栏修改
|
2015-09-06 16:46:03 +08:00 |
|
sw
|
29379788fe
|
个人动态里回复缺陷留言增加登录判断
|
2015-09-06 16:31:15 +08:00 |
|
sw
|
9f8fee8267
|
个人积分报500
|
2015-09-06 15:46:28 +08:00 |
 lizanle
|
da43b00ddf
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 15:41:50 +08:00 |
|
lizanle
|
08fd7e125f
|
作业从资源库引入作者为别人的资源不能删除bug
|
2015-09-06 15:41:43 +08:00 |
 cxt
|
8ecf70588d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 15:31:37 +08:00 |
|
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
2015-09-06 15:31:26 +08:00 |
|
lizanle
|
baf3d90836
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 15:19:11 +08:00 |
|
lizanle
|
704337fe56
|
全选所有资源，然后再用关键字过滤，全选checkbox和选择资源的个数应该清空
|
2015-09-06 15:16:32 +08:00 |
|
sw
|
f3e4812d00
|
修改计算项目得分方法名
|
2015-09-06 15:01:59 +08:00 |
|
sw
|
78cfed2b68
|
缺陷列表过滤修改
|
2015-09-06 14:29:04 +08:00 |
|
sw
|
56a96acbf0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-09-06 12:10:11 +08:00 |
|
sw
|
6607e72ca4
|
user_score_helper.rb还原
|
2015-09-06 12:08:24 +08:00 |
|
huang
|
a30ee2cb10
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-09-06 11:55:59 +08:00 |
|
huang
|
87387273d8
|
解决消息链接点击一次多一条的问题
|
2015-09-06 11:55:20 +08:00 |
|
sw
|
96a2beb342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 11:23:54 +08:00 |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
|
cxt
|
d274b675db
|
去掉动态中的“缺陷描述”、“通知描述”等文字
|
2015-09-06 10:07:18 +08:00 |
|
lizanle
|
9caa7a421a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 09:05:37 +08:00 |
|
lizanle
|
f8c85ccb83
|
个人动态页面 回复框固定高度减少
|
2015-09-06 09:05:24 +08:00 |
|
huang
|
4ce8282bd2
|
修改项目500问题
|
2015-09-03 19:19:46 +08:00 |
|
huang
|
f5b4b02fb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 17:19:04 +08:00 |
|
huang
|
dd06aa3a92
|
添加为空判断
|
2015-09-03 17:15:38 +08:00 |
 guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 16:59:24 +08:00 |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
2015-09-03 16:58:38 +08:00 |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
2015-09-03 16:28:49 +08:00 |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
2015-09-03 16:09:40 +08:00 |
|
huang
|
02ace5693f
|
去掉项目多余的横线
|
2015-09-03 16:02:58 +08:00 |
|
guange
|
8ac8edeb71
|
Merge branch 'guange_homework' into szzh
|
2015-09-03 12:38:47 +08:00 |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
2015-09-02 22:09:23 +08:00 |
|
huang
|
719cbee3ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:48:27 +08:00 |
|
huang
|
a78b28f1b7
|
0条消息则不显示“全部设为已读”
|
2015-09-02 21:47:42 +08:00 |
|
guange
|
f6edbb238e
|
隐去编程作业的得分
|
2015-09-02 21:47:07 +08:00 |
|
guange
|
d07873cdf0
|
时间格式修改
|
2015-09-02 21:44:08 +08:00 |
|
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
|
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +08:00 |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
2015-09-02 21:33:03 +08:00 |
|
sw
|
359e34471b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:30:59 +08:00 |
|
sw
|
7424c82eae
|
留言框高度
|
2015-09-02 21:30:31 +08:00 |
|
huang
|
c7f15d3a3e
|
修改留言html样式
|
2015-09-02 20:06:47 +08:00 |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:52:56 +08:00 |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
2015-09-02 19:52:44 +08:00 |
|
sw
|
6a6fbea446
|
提交作品样式
|
2015-09-02 19:41:45 +08:00 |
|
huang
|
1ba0c86828
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 19:38:31 +08:00 |
|
huang
|
70f80bb36f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:36:29 +08:00 |
|
huang
|
7d6d349c4d
|
讨论区鼠标经过显示html代码
|
2015-09-02 19:35:51 +08:00 |
|
lizanle
|
b4ae611718
|
贴吧交流url
|
2015-09-02 19:14:13 +08:00 |
|
sw
|
c2bfbfecee
|
编辑作业按钮隐藏
|
2015-09-02 19:11:34 +08:00 |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
|
guange
|
1c8b24822d
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-02 18:25:16 +08:00 |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:17:34 +08:00 |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
2015-09-02 18:18:08 +08:00 |
|
guange
|
dd4e67ebdb
|
使用新的作业提交界面
|
2015-09-02 18:09:52 +08:00 |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
2015-09-02 18:06:05 +08:00 |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:02:16 +08:00 |
|
huang
|
4c76292e5e
|
message--viewed
|
2015-09-02 18:00:36 +08:00 |
 suntao
|
b24909df8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:41:32 +08:00 |
|
suntao
|
1fff00bab0
|
回复模块改动
|
2015-09-02 17:41:19 +08:00 |
|
sw
|
45c54dabad
|
课程内创建作业代码还原
|
2015-09-02 17:04:01 +08:00 |
|
sw
|
e360ea0bc7
|
回复框高度为50px
|
2015-09-02 16:34:03 +08:00 |
|
huang
|
fcb9978a05
|
消息鼠标经过时显示html内容
|
2015-09-02 16:21:47 +08:00 |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
2015-09-02 16:12:33 +08:00 |
|
huang
|
4b2385cb81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:38:30 +08:00 |
|
sw
|
9df301b4cc
|
取消无用参数
|
2015-09-02 14:37:58 +08:00 |
|
huang
|
43f99c45e8
|
消息
|
2015-09-02 14:37:57 +08:00 |
|
sw
|
917442c0e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_list.html.erb
|
2015-09-02 14:37:46 +08:00 |
|
sw
|
05739931f3
|
作业列表点击加载更多
|
2015-09-02 14:34:32 +08:00 |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:34:10 +08:00 |
|
huang
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 14:32:46 +08:00 |
|
cxt
|
9f494bc14a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:35:03 +08:00 |
|
cxt
|
70c2f7de1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
2015-09-02 14:34:51 +08:00 |
|
cxt
|
63f52ea9bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:59 +08:00 |
|
cxt
|
3208574a5e
|
作业和首页的加载更多传递page参数
|
2015-09-02 14:31:46 +08:00 |
|
sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:27:43 +08:00 |
|
suntao
|
c2dbd9449e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_homeworks.html.erb
|
2015-09-02 14:24:11 +08:00 |
|
huang
|
fcdf9b3fc1
|
清理数据
|
2015-09-02 14:21:50 +08:00 |
|
sw
|
53c57668aa
|
点击显示更多按钮的显示与隐藏
|
2015-09-02 14:19:47 +08:00 |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
|
suntao
|
9b8270aed1
|
Banner padding调整
|
2015-09-02 14:15:26 +08:00 |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
2015-09-02 14:13:32 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
|
sw
|
0935a7eab1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 13:46:55 +08:00 |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
2015-09-02 13:46:33 +08:00 |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
2015-09-02 11:54:52 +08:00 |
|
sw
|
2538797a52
|
课程论坛回复刷新
|
2015-09-02 11:51:49 +08:00 |
|
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-02 11:51:27 +08:00 |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
2015-09-02 11:50:58 +08:00 |
 ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
2015-09-02 11:46:49 +08:00 |
|
sw
|
bbf4478fc0
|
课程通知回复后不能及时刷新页面
|
2015-09-02 11:45:52 +08:00 |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
2015-09-02 11:20:21 +08:00 |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 11:15:53 +08:00 |
|
sw
|
9728437953
|
作业界面样式
|
2015-09-02 11:02:41 +08:00 |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
2015-09-02 11:00:32 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
|
sw
|
6b1e0b1407
|
Merge branch 'guange_homework' into szzh
|
2015-09-02 10:42:36 +08:00 |
|
guange
|
d5be41eebc
|
merge
|
2015-09-02 10:41:59 +08:00 |