 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 |
 sw
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
2015-09-02 14:10:41 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 11:15:53 +08:00 |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
2015-09-02 11:15:38 +08:00 |
 ouyangxuhua
|
16e018a444
|
更改未读消息样式的字体大小
|
2015-09-02 10:55:40 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
 guange
|
d5be41eebc
|
merge
|
2015-09-02 10:41:59 +08:00 |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
2015-09-02 10:27:10 +08:00 |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
2015-09-02 09:25:34 +08:00 |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
2015-09-02 09:05:52 +08:00 |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
2015-09-01 17:21:17 +08:00 |
|
suntao
|
313ee0f9d8
|
footer对齐调整
|
2015-09-01 16:30:10 +08:00 |
|
suntao
|
59bbfeb0b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:25:22 +08:00 |
|
suntao
|
56644ca173
|
点击展开更多样式
|
2015-09-01 16:25:05 +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 |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
2015-09-01 15:43:59 +08:00 |
 lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +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 |
|
huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 15:24:51 +08:00 |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
2015-09-01 15:10:56 +08:00 |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 14:40:24 +08:00 |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
2015-09-01 14:37:34 +08:00 |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
2015-09-01 14:18:44 +08:00 |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 11:29:53 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
2015-09-01 11:25:52 +08:00 |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
2015-09-01 10:43:30 +08:00 |
|
ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
2015-09-01 09:56:59 +08:00 |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
2015-09-01 09:42:03 +08:00 |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
2015-09-01 09:13:34 +08:00 |
|
ouyangxuhua
|
316f660ca4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 08:47:57 +08:00 |
|
suntao
|
1d1d2f738d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 17:51:08 +08:00 |
|
suntao
|
acf5db7067
|
placeholder显示等
|
2015-08-31 17:50:50 +08:00 |
|
ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
2015-08-31 17:49:48 +08:00 |
|
huang
|
311634abf1
|
修改消息列表样式
|
2015-08-31 16:53:54 +08:00 |
 cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
2015-08-31 16:53:41 +08:00 |
|
suntao
|
2804d7d730
|
resource图片替换
|
2015-08-31 15:42:56 +08:00 |
|
cxt
|
4ab91984f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 15:33:39 +08:00 |
|
cxt
|
fa57a6c889
|
主页动态的样式修改
|
2015-08-31 15:33:20 +08:00 |
|
suntao
|
ac353841b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 15:21:28 +08:00 |
|
suntao
|
d3869b03cd
|
资源库版面样式调整
|
2015-08-31 15:21:09 +08:00 |
|
lizanle
|
9a1fa316bb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-31 15:06:38 +08:00 |
|
lizanle
|
19dfd77cad
|
将资源发送至 会换行，调宽
|
2015-08-31 15:06:07 +08:00 |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2015-08-31 14:55:15 +08:00 |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
2015-08-31 14:52:56 +08:00 |
|
cxt
|
23c1ac5a4a
|
项目问题的动态内容显示超出边框
|
2015-08-31 14:28:43 +08:00 |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
2015-08-31 09:33:20 +08:00 |
|
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
guange
|
85ee2b86cd
|
.
|
2015-08-29 18:21:01 +08:00 |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 17:10:56 +08:00 |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
2015-08-29 17:08:55 +08:00 |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:52:44 +08:00 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
sw
|
17e9b2d293
|
编辑个人简介文本框
|
2015-08-29 14:48:47 +08:00 |
|
suntao
|
0d8624a642
|
颜色更新
|
2015-08-29 14:43:28 +08:00 |
|
suntao
|
886a00e18d
|
footer间距调整
|
2015-08-29 14:22:29 +08:00 |
|
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 |