 suntao
|
a22727efb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:08:58 +08:00 |
|
suntao
|
5e25b64004
|
提交按钮对齐
|
2015-08-29 14:08:38 +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
|
e455f93ee1
|
上传图片；浏览图片按钮
|
2015-08-29 12:04:35 +08:00 |
 guange
|
18bfe1fc73
|
jquery升到1.11
|
2015-08-29 11:59:52 +08:00 |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
2015-08-29 11:41:12 +08:00 |
|
suntao
|
5f3532ac14
|
头像部分修改
|
2015-08-29 11:25:49 +08:00 |
|
sw
|
189405f0a9
|
课程搜索有部分文本重叠
|
2015-08-29 10:58:45 +08:00 |
|
sw
|
4d1fc0dc45
|
调整底部导航栏宽度
|
2015-08-29 10:54:45 +08:00 |
|
suntao
|
9d638b705a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 10:27:40 +08:00 |
 lizanle
|
60b429b13d
|
发送成功不给提示
课程资源过少的时候不给滚动条
|
2015-08-29 10:33:04 +08:00 |
|
suntao
|
2342d1c23a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-29 10:27:22 +08:00 |
|
suntao
|
ada04e5e63
|
个人主页头像模块改动
|
2015-08-29 10:13:32 +08:00 |
|
lizanle
|
afd7beebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 10:00:10 +08:00 |
|
lizanle
|
f2a909f0e5
|
资源移动弹出框搜索处鼠标悬浮要手型光标
|
2015-08-29 10:00:04 +08:00 |
 huang
|
6287f9b39e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 09:56:39 +08:00 |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
2015-08-29 09:56:34 +08:00 |
|
lizanle
|
553e35281a
|
资源弹出框的边框色
|
2015-08-29 09:44:36 +08:00 |
|
lizanle
|
53b150486d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 09:33:33 +08:00 |
|
lizanle
|
789b62940b
|
资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后 自选资源清零的问题
|
2015-08-29 09:33:22 +08:00 |
|
huang
|
938d0e2bbd
|
解决消息换行显示问题
|
2015-08-29 09:23:32 +08:00 |
|
suntao
|
5c960c798e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 17:29:47 +08:00 |
|
suntao
|
46ac491b5b
|
上传图片
|
2015-08-28 17:29:22 +08:00 |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
2015-08-28 17:27:51 +08:00 |
|
guange
|
e8fe397158
|
added
|
2015-08-28 17:20:39 +08:00 |
|
suntao
|
d536c81a8a
|
提交作业样式修改
|
2015-08-28 17:11:33 +08:00 |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
2015-08-28 17:07:48 +08:00 |
|
huang
|
e193cb0f2d
|
消息列表界面新样式
|
2015-08-28 17:05:27 +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
|
48419573ac
|
底部导航栏有2条线
|
2015-08-28 16:02:00 +08:00 |
|
suntao
|
4392ecdcd7
|
消息格式更改
|
2015-08-28 15:41:50 +08:00 |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
2015-08-28 15:08:07 +08:00 |
|
suntao
|
e12bef1126
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 14:51:16 +08:00 |
|
suntao
|
a19692a0c6
|
个人主页左侧修改
|
2015-08-28 14:50:48 +08:00 |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
2015-08-28 14:49:55 +08:00 |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
2015-08-28 14:38:46 +08:00 |
|
suntao
|
fb91958a3f
|
导航栏修改
|
2015-08-28 14:30:02 +08:00 |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
2015-08-28 12:04:49 +08:00 |
|
suntao
|
c0477fda99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 11:58:33 +08:00 |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 11:56:52 +08:00 |
|
suntao
|
b6d58b1b58
|
样式调整
|
2015-08-28 11:55:34 +08:00 |
|
sw
|
711b21070f
|
上传附件样式调整
|
2015-08-28 11:53:05 +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 |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
2015-08-28 09:34:02 +08:00 |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-27 17:35:04 +08:00 |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
2015-08-27 16:20:47 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
sw
|
1f87c4adf5
|
重复CSS删除
|
2015-08-27 09:46:17 +08:00 |
|
lizanle
|
41a8f9d6a2
|
底部去掉marginBottom:10px
登录界面加底部
|
2015-08-27 09:28:13 +08:00 |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 17:52:32 +08:00 |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
2015-08-26 17:52:23 +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
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +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
|
5ec24913bb
|
留言背景色 留言头
|
2015-08-26 16:06:15 +08:00 |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
2015-08-26 15:17:56 +08:00 |
|
huang
|
334e6dbd55
|
消息未读样式
|
2015-08-26 15:14:25 +08:00 |
|
sw
|
686af68026
|
关注、粉丝、编辑资料页面样式问题
|
2015-08-26 14:11:28 +08:00 |
|
sw
|
f0a4d364b0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 13:56:53 +08:00 |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
2015-08-26 13:56:37 +08:00 |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
2015-08-26 11:41:32 +08:00 |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
2015-08-26 09:36:05 +08:00 |
 cxt
|
cccc0577c7
|
个人动态
|
2015-08-26 08:51:39 +08:00 |
|
sw
|
767fc67686
|
已过期课程显示为darkgrey
|
2015-08-25 18:22:46 +08:00 |
|
sw
|
59fe95bf33
|
去掉部分重复的CSS
|
2015-08-25 17:26:40 +08:00 |
|
sw
|
994a4188ce
|
未登录情况下，导航栏样式问题
|
2015-08-25 17:13:09 +08:00 |
|
sw
|
4ca3d8be03
|
搜索栏样式
|
2015-08-25 16:35:22 +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 |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
2015-08-25 15:09:02 +08:00 |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 14:24:29 +08:00 |
|
lizanle
|
d25971f546
|
登陆界面
|
2015-08-25 14:24:20 +08:00 |
|
sw
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
2015-08-25 14:09:37 +08:00 |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
2015-08-25 13:50:42 +08:00 |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
2015-08-25 10:30:31 +08:00 |
|
sw
|
d132c08a11
|
增加footer
|
2015-08-25 09:29:19 +08:00 |
|
sw
|
38f8aa5ba4
|
更新css文件
|
2015-08-24 18:25:33 +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 |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
2015-08-24 16:35:10 +08:00 |
|
lizanle
|
39b022f696
|
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 16:25:09 +08:00 |
|
lizanle
|
86d2f5342c
|
登陆界面
|
2015-08-24 16:22:22 +08:00 |
|
lizanle
|
614743d8d4
|
登陆界面
|
2015-08-24 16:22:06 +08:00 |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
2015-08-24 16:16:07 +08:00 |
|
sw
|
e746a7764f
|
处理被还原的css
|
2015-08-24 15:36:32 +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
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
2015-08-24 15:30:11 +08:00 |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
2015-08-24 14:53:35 +08:00 |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
2015-08-24 14:53:30 +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 |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
2015-08-24 11:40:09 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
|
sw
|
86b151979b
|
js相关
|
2015-08-24 11:03:09 +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 |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
2015-08-21 17:40:28 +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 |
|
sw
|
d942cc3123
|
性别的判断
|
2015-08-21 15:40:38 +08:00 |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
2015-08-21 15:23:03 +08:00 |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +08:00 |
|
sw
|
73854cc35c
|
右侧静态页面如果没有内容时增加默认最小高度
|
2015-08-21 14:25:01 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
2015-08-21 13:53:36 +08:00 |
|
huang
|
947fcc160c
|
修改列表显示样式！
|
2015-08-21 10:49:13 +08:00 |
 ouyangxuhua
|
2f21b4663d
|
消息颜色更改
|
2015-08-20 16:46:22 +08:00 |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
2015-08-20 16:05:58 +08:00 |
|
sw
|
2f43296854
|
更新课程样式
|
2015-08-20 10:23:29 +08:00 |
|
sw
|
f48e77901a
|
用户上传头像功能
|
2015-08-19 17:14:19 +08:00 |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
2015-08-19 17:13:57 +08:00 |
|
sw
|
e64c15a026
|
个人主页基本页面布局完成
|
2015-08-19 16:32:05 +08:00 |
|
sw
|
b6a2be72e4
|
调整CSS，修改图片，实现部分功能动态效果
|
2015-08-19 15:13:30 +08:00 |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
2015-08-19 14:43:12 +08:00 |
|
ouyangxuhua
|
ff3edf4d5e
|
消息显示
|
2015-08-19 11:12:47 +08:00 |
|
sw
|
752fe93d72
|
已登录用户header完成
|
2015-08-18 11:47:22 +08:00 |
|
sw
|
b27944fad7
|
增加css文件以及个人主页静态页面、缺失图片
|
2015-08-18 10:59:31 +08:00 |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
2015-08-18 10:31:40 +08:00 |
|
huang
|
9c8679eda8
|
铃铛样式
|
2015-08-17 16:07:45 +08:00 |
|
ouyangxuhua
|
8f23a81261
|
消息显示样式更新
|
2015-08-17 15:56:16 +08:00 |
|
huang
|
a677119ba0
|
修改界面样式
|
2015-08-17 15:20:46 +08:00 |
|
ouyangxuhua
|
e72eeb37c8
|
通知显示
|
2015-08-17 15:05:26 +08:00 |
|
ouyangxuhua
|
276653d9a2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-17 11:37:14 +08:00 |
|
ouyangxuhua
|
e6cf2f400c
|
添加样式
|
2015-08-17 11:35:47 +08:00 |
|
huang
|
239cba54d9
|
区分未读消息和已读消息
|
2015-08-17 11:34:29 +08:00 |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
2015-08-15 17:10:02 +08:00 |
|
lizanle
|
421f86cdaf
|
资源库
|
2015-08-15 17:07:50 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
|
huang
|
fc244982bc
|
处理冲突
修改浏览器兼容问题
|
2015-08-15 17:06:19 +08:00 |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
2015-08-15 16:54:51 +08:00 |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
2015-08-15 16:50:21 +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
|
4013ff486a
|
消息界面调整
|
2015-08-14 17:35:10 +08:00 |
|
sw
|
9b424a5b17
|
课程问卷调查----点击问卷列表中如图空白处也返回相关问卷详情页面
|
2015-08-14 17:25:53 +08:00 |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
2015-08-14 15:48:23 +08:00 |
|
sw
|
16aea5ef42
|
迟交扣分0-50分
|
2015-08-14 15:44:54 +08:00 |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
2015-08-14 08:55:41 +08:00 |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
2015-08-12 17:45:17 +08:00 |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
|
sw
|
09b1c03ef2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-10 11:21:04 +08:00 |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-10 09:12:57 +08:00 |