Commit Graph

15261 Commits

Author SHA1 Message Date
yuanke 4be95cd9c5 班级内作业课件测验等增加排序 2016-07-15 09:52:57 +08:00
Tim 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
yuanke b8c8b2c4ae 修改加入班级的提示 2016-07-15 09:48:10 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
yuanke 16e029d340 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 17:39:31 +08:00
yuanke 4c39dcc677 微信:修改班级下有挂起作业所有作业都不显示的BUG,将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +08:00
txz 433f12f184 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 17:34:31 +08:00
txz a43da43072 checked.png替换 2016-07-14 17:34:26 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
yuanke d50fd40307 Merge branch 'weixin_guange' into develop 2016-07-14 17:19:47 +08:00
yuanke c524409e4a 修改进入某个班级报错的BUG 2016-07-14 17:15:49 +08:00
Tim c41a116378 博客上传附件后,编辑处文件夹图标显示;大纲引用css样式更改 2016-07-14 17:00:38 +08:00
yuanke 9c560e56b6 微信修改 不能直接给数据库对象增加新属性 2016-07-14 16:54:43 +08:00
huang 7da67350fd issue列表进入详情页面,弹出新页面 2016-07-14 15:31:25 +08:00
Tim 1fdd1a2a21 作业列表css与develop分支同步;popup.css优化 2016-07-14 15:28:01 +08:00
huang e98d7a213f 系统消息点击跳转列表定位 2016-07-14 15:23:16 +08:00
huang f7c9bc0a19 消息跳转定位 2016-07-14 15:04:58 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality
Conflicts:
	app/controllers/quality_analysis_controller.rb
2016-07-14 14:08:03 +08:00
huang 8c6fca87c9 项目动态中,新闻添加快捷操作,所有操作默认显示 2016-07-14 13:57:06 +08:00
yuanke 5bd404322b 修改微信消息通知详情地址 2016-07-14 11:28:28 +08:00
yuanke c2fadc54ef 微信消息通知点击跳转页面修改 2016-07-14 11:16:45 +08:00
huang 00c414c347 issue回复填写正确的样式问题 2016-07-14 11:14:05 +08:00
Tim fdf147326c Merge branch 'develop' into cs_optimize_txz 2016-07-14 11:01:12 +08:00
Tim 2b5e31cab9 样式与develop分支同步 2016-07-14 11:00:03 +08:00
huang 9b59ca20de 修复issue详情页面,删除回复后再编辑保存issue弹出白色框问题 2016-07-14 10:39:54 +08:00
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