Commit Graph

15349 Commits

Author SHA1 Message Date
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
yuanke ea88c92d31 测试用 2016-07-19 10:54:04 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改,我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00
Tim 1fc2bbd56a 作业资源库弹框,资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +08:00
Tim 73401d6b41 下拉图标等显示 2016-07-19 09:09:13 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
cxt fdf925a0b8 个人主页留言动态:如图回复当前用户自己的留言却不能删除,“展开回复”后又可删除了,刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
yuanke b2f9839d13 微信:测试版菜单 2016-07-18 14:43:54 +08:00
cxt 8e3488132b 导入作业:公共题库中显示的却是我的题库,我的题库中显示的却是公共题库 2016-07-18 14:43:47 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz
Conflicts:
	app/views/versions/index.html.erb
2016-07-18 14:32:17 +08:00
Tim 76555680e0 项目css统一 2016-07-18 14:30:01 +08:00
yuanke fea8d56d8d 修改为测试版配置 2016-07-18 14:28:45 +08:00
yuanke ff13d2e572 微信增加作业发送,修改发送的权限,修改菜单 2016-07-18 14:24:59 +08:00
Tim 3940d8f558 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-18 14:18:18 +08:00
cxt 9e5e7a75b0 编程作业关闭匿评后,老师点击模拟答题,却弹出匿评提示 2016-07-18 14:09:41 +08:00
huang 412d74e295 优化最近动态获取方法 2016-07-18 13:57:00 +08:00
huang d94f9762ce Merge branch 'develop' into rep_quality 2016-07-18 11:27:41 +08:00
huang 5c046f922e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-18 11:25:57 +08:00
huang 097374df14 去掉全局变量,通过filter获取 2016-07-18 11:25:45 +08:00
cxt a9ee1d10cd 新增班级成员的消息通知,跳转至该班级的成员配置页面 2016-07-18 11:19:56 +08:00
huang 3198f8a473 解决版本库提交记录中:上传图片或者非可以预览文件 显示详情500问题 2016-07-18 11:17:22 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange cd69149d3a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:09:53 +08:00
yuanke 8968c991ff 微信:作业增加发送功能 2016-07-18 11:08:02 +08:00
yuanke 51918e1340 Merge branch 'develop' into weixin_guange 2016-07-18 08:34:42 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
yuanke 7fe3f9fe71 配置改为测试版 2016-07-15 20:30:50 +08:00
yuanke cb060e518e 正式版配置 2016-07-15 20:25:08 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
yuanke 552f1a2709 正式版配置 2016-07-15 19:47:33 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
yuanke 67fa6da8ae 我的资源界面加载前 不显示暂无数据 2016-07-15 19:18:30 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
yuanke 7dd26bb5d9 邀请码BUG修改 2016-07-15 18:19:37 +08:00
guange 82aa369687 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 18:11:01 +08:00
guange c02245adfb 邀请码分享 2016-07-15 18:08:19 +08:00
yuanke 69009122e6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 17:39:28 +08:00
yuanke ba1af901ad 强制更新myresource.js 2016-07-15 17:39:21 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-15 17:38:56 +08:00
cxt 7725db9c69 题库报500 2016-07-15 17:38:32 +08:00
cxt fcc8a08138 课程列表的样式问题 2016-07-15 17:38:10 +08:00
txz b7477a73e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 17:31:36 +08:00
txz 6491e16c64 微信课程列表底边重合问题 2016-07-15 17:31:33 +08:00
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00