Commit Graph

9591 Commits

Author SHA1 Message Date
sw 5f1b4b1b24 导入作业后编辑按钮、弹出框确定按钮不可用 2015-09-25 14:16:12 +08:00
sw dfc9d89a3d Merge branch 'szzh' into develop 2015-09-25 10:13:34 +08:00
sw 68169a3832 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:09:12 +08:00
lizanle 924183b1cc js合并错误 2015-09-25 10:04:56 +08:00
lizanle f99ccf724c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 09:44:29 +08:00
lizanle c1bd17b07e 项目论坛发帖排序比较乱。 去掉置顶功能(发帖的功能里原来有置顶按钮。现在没有了。所以排序也要取消) 2015-09-25 09:44:15 +08:00
sw d6d9ffd87f Merge branch 'szzh' into develop 2015-09-25 09:31:22 +08:00
sw 7a8a838ca2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 09:30:25 +08:00
sw d564f1ea2e Merge branch 'guange_homework' into szzh 2015-09-25 09:30:13 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
huang 993c7d8f41 Merge branch 'dev_hjq' into szzh 2015-09-25 09:26:16 +08:00
huang 69290c6ea2 Merge branch 'szzh' into dev_hjq 2015-09-25 09:25:34 +08:00
huang e60119d6d3 解决匿名用户消息中实名评价的bug 2015-09-25 08:59:34 +08:00
sw bd16bc9154 Merge branch 'szzh' into develop 2015-09-24 17:22:07 +08:00
sw 040f5ff645 Merge branch 'develop' into szzh 2015-09-24 17:21:53 +08:00
huang 698be56671 Merge branch 'dev_hjq' into szzh 2015-09-24 17:21:13 +08:00
huang 20465764a7 Merge branch 'szzh' into dev_hjq 2015-09-24 17:20:36 +08:00
huang 25309df83f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 17:19:27 +08:00
huang 1e8cb91ab4 boards 2015-09-24 17:18:58 +08:00
ouyangxuhua bc9a332be3 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 17:11:55 +08:00
ouyangxuhua a3840ebad9 作业匿评开启失败对应页面显示 2015-09-24 17:11:39 +08:00
huang b66de0ee9f issue相关问题 2015-09-24 17:03:43 +08:00
huang 25a604d7b8 issue解决冲突 2015-09-24 16:59:19 +08:00
huang fcf34b5918 修复项目配置中“私有” “公开”问题 2015-09-24 16:38:36 +08:00
lizanle 6b98b2a273 暂时不可点击的链接 不用手型光标 2015-09-24 16:17:50 +08:00
sw 6807f649bf 1、作品列表头像显示全部一样
2、匿评作业开启匿评之后学生可以在作业列表修改作业
2015-09-24 16:17:50 +08:00
huang 38ba47f8c8 讨论区结构修改
任务中添加:自动开启/关闭匿评消息通知
匿评开启失败消息通知
2015-09-24 16:16:37 +08:00
lizanle 8f29970af5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-24 16:02:22 +08:00
lizanle 2aa52bfc59 论坛翻页 每页都要加链接 2015-09-24 16:02:15 +08:00
guange a42152553b 添加语言提示 2015-09-24 15:26:54 +08:00
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