Commit Graph

15285 Commits

Author SHA1 Message Date
yuanke 1e8f496718 代码查重结果 不显示未提交的作品 2016-07-14 10:06:37 +08:00
yuanke 4bce77627d Merge branch 'develop' into yuanke 2016-07-14 09:54:18 +08:00
yuanke af2b306953 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 09:52:10 +08:00
yuanke 3c426c8d15 微信中英文逗号修改 2016-07-14 09:52:02 +08:00
txz 24821ba01d 登录与注册页面,输入文字显示不全bug 2016-07-14 09:44:35 +08:00
Tim 108866989e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-14 09:22:40 +08:00
Tim 538303f4d1 导航头像处理 2016-07-14 09:11:38 +08:00
txz e61aa9e0dc 回复框高度自动增减js同步 2016-07-13 16:53:17 +08:00
yuanke 15ccf5cfbe Merge branch 'yuanke' into develop 2016-07-13 15:56:44 +08:00
yuanke 3ffb909e15 修改发送创建班级的通知消息 2016-07-13 15:54:58 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
yuanke a5acc2641e 微信点赞保证各个切换之间点赞状态保持一致 2016-07-13 14:06:56 +08:00
huang 61bf6604b1 解决ajax情况下,issue状态选框不显示问题 2016-07-13 12:23:28 +08:00
huang ef931d1491 编辑issue,与回复issue冲突问题(局部刷新) 2016-07-13 12:07:27 +08:00
yuanke 5ea4eff876 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-13 10:09:55 +08:00
yuanke 5cd394c4ae 修改微信班级测验报错的BUG 2016-07-13 10:09:47 +08:00
huang 845f36c4f3 解决z注册时候邮箱不能是大写加下划线的形式 2016-07-13 10:00:04 +08:00
txz 49468d30e8 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-13 09:54:40 +08:00
txz f83d791de1 进入课程后,课件,作业,测验及学生管理tab样式更改 2016-07-13 09:54:37 +08:00
cxt 9bf853d2bb 管理员可修改课程名称和英文名称 2016-07-13 09:49:24 +08:00
yuanke 3700f437cb 测试版微信配置 2016-07-13 09:45:30 +08:00
yuanke b4ac13c157 修改编程作业没main函数系统评分100的BUG 2016-07-13 09:36:43 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
yuanke e8a9f34922 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-13 08:44:30 +08:00
yuanke f63df877db 将未命名课程去掉 2016-07-13 08:44:20 +08:00
txz 2cc87f1dd8 课程页面各tab显示bug 2016-07-12 17:33:55 +08:00
huang 191261d3b8 each time to 10s 2016-07-12 17:30:29 +08:00
yuanke 4a7fb0e0b5 点击查看班级详情跳入班级信息页面 2016-07-12 17:08:16 +08:00
yuanke 824f9d9174 新增创建班级的模版消息 2016-07-12 17:00:01 +08:00
guange 4908a68a7d 时间utc问题 2016-07-12 16:49:15 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
guange ae3212082c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-12 16:35:15 +08:00
guange 8df0dcae7a 调用编辑接口不成功时,打印具体的信息 2016-07-12 16:35:06 +08:00
cxt c46fcc48b1 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/users/_join_course_course_message.html.erb
2016-07-12 16:26:13 +08:00
huang e766adf087 add delete to qa 2016-07-12 16:23:30 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
yuanke 2844ac2e65 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 15:52:08 +08:00
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定 2016-07-12 15:51:58 +08:00
txz 78a6785b6b 微信回复框自动增高 2016-07-12 15:18:51 +08:00
txz 77f5ad09d2 各详情页面回复内容全部显示 2016-07-12 15:00:49 +08:00
txz 717bbe2ffa 回复框多行提交后初始化 2016-07-12 14:33:52 +08:00
txz 4434eb3620 回复框固定在最下显示 2016-07-12 14:10:30 +08:00
txz 9d91e9397b 微信邀请码提示文字修改 2016-07-12 11:01:01 +08:00
txz f33feb7d84 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:43:26 +08:00
txz 243f0bbe7d 微信详情内容与回复中链接添加蓝色 2016-07-12 10:43:21 +08:00
cxt 955c258856 复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程 2016-07-12 10:35:52 +08:00
yuanke 4111ae632c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:25:28 +08:00
yuanke d4681eea00 我的资源里面显示来源 和大小 并可以下载课件 2016-07-12 10:25:18 +08:00
cxt 66c40ba139 动态的更新时间 2016-07-12 09:41:00 +08:00
txz e3fe95213f 增加二级回复与文字间距离 2016-07-12 09:34:06 +08:00