 ouyangxuhua
|
c17a1555bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-24 15:09:27 +08:00 |
 guange
|
0b4c8b05f1
|
JAVA语言支持
|
2015-09-24 15:09:15 +08:00 |
|
ouyangxuhua
|
f4cad2897a
|
1.修改老师关闭作品评阅和开启作品评阅内容和样式
2.修改老师关闭作品评阅和开启作品评阅的tips内容
|
2015-09-24 14:48:48 +08:00 |
 huang
|
59d26db1eb
|
Merge branch 'szzh' into dev_hjq
|
2015-09-24 14:02:15 +08:00 |
|
huang
|
032ccdb2b8
|
先建项目 --项目类型默认提示
|
2015-09-24 14:01:29 +08:00 |
 lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
|
lizanle
|
9f22eed093
|
帖子的名称也要修改
|
2015-09-24 13:38:40 +08:00 |
|
lizanle
|
38a24e8fe4
|
论坛消息回复改版
|
2015-09-24 12:17:14 +08:00 |
 sw
|
60ef287f12
|
Merge branch 'szzh' into develop
|
2015-09-24 11:47:52 +08:00 |
|
huang
|
ba395fd2eb
|
Merge branch 'dev_hjq' into szzh
|
2015-09-24 11:47:10 +08:00 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
huang
|
4c71e2c256
|
项目类型提示JS
|
2015-09-24 11:44:02 +08:00 |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
2015-09-24 11:31:07 +08:00 |
|
huang
|
d343ca8572
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-24 11:19:44 +08:00 |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
2015-09-24 11:19:07 +08:00 |
|
ouyangxuhua
|
e41de221c5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-24 11:08:27 +08:00 |
|
ouyangxuhua
|
756664a3db
|
作业消息修改，增加称呼、tips内容
|
2015-09-24 11:07:09 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
lizanle
|
44b93af307
|
tag浮动
|
2015-09-24 09:52:57 +08:00 |
|
huang
|
bb676b697b
|
新建项目添加“项目类型选择”
新建项目新样式
|
2015-09-24 09:47:40 +08:00 |
|
lizanle
|
b9ff46f8d0
|
帖子的编辑与删除
|
2015-09-24 09:40:53 +08:00 |
|
sw
|
ad6fbf6c9b
|
点击作品名称、姓名、学号、时间列都可以展开作品
|
2015-09-24 09:25:56 +08:00 |
|
huang
|
54065e49a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-23 17:37:31 +08:00 |
|
ouyangxuhua
|
53eaac295e
|
个人留言中，对方回复留言，tips中增加原留言内容
|
2015-09-23 17:37:40 +08:00 |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
2015-09-23 17:36:36 +08:00 |
|
sw
|
d727097ed2
|
1、已开启匿评代码没有匿评设置功能
2、匿评结束不显示
|
2015-09-23 17:33:06 +08:00 |
|
sw
|
7b37f3a9f4
|
开启匿评、关闭匿评任务编写
|
2015-09-23 17:25:38 +08:00 |
|
lizanle
|
c8d07dedf6
|
帖子添加编辑 删除 链接
|
2015-09-23 17:09:21 +08:00 |
|
ouyangxuhua
|
5ca80d9a4c
|
1.添加作业消息的详细内容，包括扣分、截止日期等
2.对老师和学生，给出的tips要有区别
|
2015-09-23 16:46:29 +08:00 |
|
lizanle
|
7383ac7aa9
|
删除贴吧功能
|
2015-09-23 16:36:11 +08:00 |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
2015-09-23 16:27:13 +08:00 |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
2015-09-23 15:14:37 +08:00 |
|
ouyangxuhua
|
1fe8c60a32
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-23 14:55:13 +08:00 |
|
ouyangxuhua
|
841c680bb1
|
1.作业消息增加显示老师、课程、课程季度等信息
2.作业内容为空时，tips中不显示内容
|
2015-09-23 14:53:50 +08:00 |
|
huang
|
5b671c5109
|
issue 引用模式修改
issue相关代码优化
|
2015-09-23 14:27:47 +08:00 |
|
sw
|
9d474d6528
|
设置匿评属性静态页面
|
2015-09-23 13:54:36 +08:00 |
|
lizanle
|
0d8010382e
|
头像宽度不够
|
2015-09-23 11:42:08 +08:00 |
|
lizanle
|
e82e303bb1
|
论坛描述自动换行
|
2015-09-23 11:34:16 +08:00 |
|
lizanle
|
d9c0809f53
|
创建帖子的提示信息分开显示
|
2015-09-23 11:27:38 +08:00 |
|
lizanle
|
5ba889ecc1
|
错别字
|
2015-09-23 11:14:44 +08:00 |
|
lizanle
|
272d9fa527
|
论坛的标签可修改
|
2015-09-23 11:02:22 +08:00 |
|
sw
|
5643ad3fa5
|
Merge branch 'szzh' into develop
|
2015-09-23 10:04:31 +08:00 |
|
sw
|
193eb0cb6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-23 10:03:45 +08:00 |
 cxt
|
afb1a8f53f
|
回复框发送按钮的样式调整
|
2015-09-23 09:59:23 +08:00 |
|
sw
|
b5af66ffc2
|
取消匿评时间的js判断
|
2015-09-23 09:58:31 +08:00 |
|
sw
|
3cb125ccbf
|
发布作业界面取消开启匿评日期和关闭匿评日期的设置
删除无效代码文件
|
2015-09-23 09:51:30 +08:00 |
|
lizanle
|
1d84064221
|
论坛描述长度过长不会换行显示
|
2015-09-23 09:45:24 +08:00 |
|
lizanle
|
15b573871a
|
论坛名称为空，可以不去校验
|
2015-09-23 09:36:25 +08:00 |
|
lizanle
|
9d6263a9d1
|
名称和描述不能为空的提示信息应该分开写
|
2015-09-23 09:31:49 +08:00 |