jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,956 Commits 98 Branches 0 Tags 0 B
Commit Graph

3804 Commits

Author SHA1 Message Date
huang 6f8957ee99 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 17:02:31 +08:00
huang f9fcc5d961 修改项目顶头空白太多的问题 2016-09-28 17:02:17 +08:00
Tim daa887fe0a issue列表样式调整 2016-09-28 16:56:46 +08:00
Tim 3f559a04bb issue列表边框颜色更改；issue题目宽度增长；回复数和编辑删除位置调整及显隐js实现 2016-09-28 15:20:42 +08:00
Tim 69a9171430 分班列表样式调整；作业动态翻页居中 2016-09-28 10:47:58 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
daiao 8fb440c593 项目issue功能修改 2016-09-27 17:01:04 +08:00
yuanke 89d91f69c2 Merge branch 'weixin_guange' into develop 2016-09-27 16:20:07 +08:00
Tim edd03d05d0 日历中issue号与完成度超出边框问题修复 2016-09-27 14:03:26 +08:00
Tim 86835fc916 全局设置input框聚焦后边框不显示css删除 2016-09-27 09:58:04 +08:00
yuanke 1620a13565 修改图片放大js的一个BUG 2016-09-27 09:13:46 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
huang 528aeaff89 Merge branch 'rep_quality' into develop 2016-09-26 22:20:08 +08:00
daiao 0ec1ecc2bf issue功能优化 2016-09-26 16:22:14 +08:00
Tim 0e531aa529 题库标题颜色加深，common.css去重 2016-09-26 14:27:33 +08:00
yuanke 60a936bcee Merge branch 'weixin_guange' into develop 2016-09-23 17:47:40 +08:00
daiao 73089e6a6a issue开始时间与结束时间改动 2016-09-23 17:23:12 +08:00
Tim 60cce7c781 微信作业新增提交作品数，最后提交及评阅动态 2016-09-23 17:16:15 +08:00
cxt 398a6f1da7 Merge branch 'cxt_course' into develop 2016-09-23 16:50:45 +08:00
cxt 0a74660cfb Merge branch 'cs_optimize_txz' into develop 2016-09-23 16:49:04 +08:00
Tim 13f3ffec9f 侧导航调整 2016-09-23 16:47:12 +08:00
daiao 7b5fc8b323 issues列表功能 2016-09-23 14:53:36 +08:00
Tim 56a55eb911 作业动态和详情添加提交作品数及提交动态 2016-09-23 14:41:09 +08:00
Tim 86a3ce185d 个人主页侧导航宽度限制更改，提示框效果及js实现 2016-09-23 14:17:23 +08:00
daiao ca00f0b9f8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 11:31:31 +08:00
daiao 8336fb2684 项目issue功能 2016-09-23 11:31:23 +08:00
huang 751665089c 完成项目base搭建 2016-09-23 11:28:00 +08:00
daiao e16b5b2f5d issue界面功能调整 2016-09-23 09:27:34 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
daiao 1da7b79cfb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:05:37 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
yuanke 61c2f8fdd6 修改增加分班名称过长问题 2016-09-22 16:17:23 +08:00
Tim 0431d28fd1 分班管理样式调整 2016-09-22 15:35:43 +08:00
Tim 8a46d66e5c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/edit_class_group.html
	public/assets/wechat/join_classgroup.html
 2016-09-22 15:29:28 +08:00
Tim b965e270e2 分班管理页面增加课程名，课程名与班级名之间点号同时显示，图标圆形显示 2016-09-22 15:27:16 +08:00
yuanke 0716d4fa38 默认图片不显示 2016-09-22 14:29:00 +08:00
yuanke 40d98887e9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 14:04:17 +08:00
yuanke a169ad087b 加入分班时选择暂无返回班级列表刷新 2016-09-22 14:03:59 +08:00
Tim 0b1a22d9aa 分班管理样式更改 2016-09-22 13:56:57 +08:00
yuanke 11132d3459 修改加入班级时选择分班后跳入页面 2016-09-22 10:49:53 +08:00
yuanke 72190a3639 去掉调试 2016-09-22 10:47:02 +08:00
yuanke eeef2e78f3 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-22 09:56:55 +08:00
yuanke 1798b8a086 微信班级logobug修改 2016-09-22 09:56:46 +08:00
Tim ab72bf5f08 分班管理界面調整 2016-09-22 09:48:37 +08:00
Tim 25b2418730 完善资料界面问题反馈框样式更新 2016-09-21 14:33:46 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
Tim fec493b287 Merge branch 'develop' into cs_optimize_txz 2016-09-21 09:44:59 +08:00
Tim e4f6852d1b 我的作业页面，按钮字体大小统一，作品数宽度增加 2016-09-21 09:44:02 +08:00
yuanke 930acd382c 微信图片点击调试 2016-09-20 15:14:48 +08:00
yuanke 8bb1323612 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/edit_userinfo.html
 2016-09-20 14:59:40 +08:00
yuanke 8b771a183c 微信分班功能 2016-09-20 14:58:37 +08:00
Tim 2856cd06d5 微信图片内容点击可放大 2016-09-20 14:42:36 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 8d2636e3e6 甘特图css样式引用 2016-09-19 15:43:40 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
Tim 9c214ef57b 个人资料文字提示 2016-09-19 14:07:32 +08:00
Tim 126c18f833 我的资源页面来源宽度调整；班级动态详情页面显示课程名 2016-09-19 14:00:52 +08:00
Tim 0c0e865a20 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-19 13:23:22 +08:00
yuanke 3624d9d4ca 微信增加分班相关功能 2016-09-19 13:22:29 +08:00
Tim 7a5f21456d 微信页面名字为空时，提示文字显示 2016-09-19 11:24:44 +08:00
Tim 97394a6cbe 显示课程名称与班级名称 2016-09-18 16:47:13 +08:00
yuanke 04a2effcee 微信增加分班相关 2016-09-18 16:12:38 +08:00
yuanke 016d1f4bba Merge branch 'weixin_guange' into develop 2016-09-14 20:23:55 +08:00
yuanke ede580d03a 微信修改一个项目点返回相关的BUG 2016-09-14 20:22:26 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
yuanke c7be9cadf1 Merge branch 'weixin_guange' into develop 2016-09-14 19:38:19 +08:00
cxt 020018fd31 分组作业的作品列表样式修改 2016-09-14 19:31:14 +08:00
cxt a0f4cc1c0c 新建编程作业时的提交验证 2016-09-14 19:27:12 +08:00
cxt 6f4618fffb 分组作业可对组员单独评分 2016-09-14 17:38:57 +08:00
Tim 237d6f7d2e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-14 16:50:56 +08:00
Tim 7cd2a98f11 侧导航课程、班级名称长度控制；箭头替换；tip显示更改 2016-09-14 16:50:46 +08:00
daiao 5a25eb324b Merge branch 'dev_shcool' into develop 2016-09-14 15:13:31 +08:00
Tim ffedecab7a 新问题反馈样式；侧导航课程、班级名称长度js控制 2016-09-14 15:05:08 +08:00
yuanke 41700b1f37 微信修改绑定时的提示信息 2016-09-14 09:20:22 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
yuanke 22da03a1e0 微信注册后跳入编辑资料界面，进入别的页面无姓名则跳入编辑资料界面 2016-09-13 13:44:26 +08:00
daiao a3f444819e 项目列表名字太长排版问题 2016-09-12 10:52:43 +08:00
huang 59ebadd406 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
 2016-09-09 17:25:51 +08:00
yuanke fa61895e66 Merge branch 'weixin_guange' into develop 2016-09-09 17:11:26 +08:00
yuanke fc01558e55 修改管理课程文字提示 2016-09-09 17:09:02 +08:00
Tim 8c95141460 侧导航箭头显示 2016-09-09 16:48:43 +08:00
yuanke 80ab8801ce Merge branch 'weixin_guange' into develop 2016-09-09 16:05:32 +08:00
Tim f6efefd38d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-09 15:50:05 +08:00
Tim 862bbd1a1f 班级名称前增加课程名，一系列更改 2016-09-09 15:49:31 +08:00
cxt 724ae058db 班级左侧添加“分班”入口 2016-09-09 15:49:24 +08:00
cxt 355f0580cb 作业状态的api 2016-09-09 15:28:32 +08:00
yuanke 9997de0d96 微信课件下载不需要登录 2016-09-09 15:14:24 +08:00
yuanke 5f77c97c9d 课件下载功能 2016-09-09 15:01:46 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
 2016-09-09 13:30:10 +08:00
cxt b3f738ee5d 与班级相关平台班级名称规范调整 2016-09-09 10:23:18 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
yuanke 7a71a7bd47 Merge branch 'weixin_guange' into develop 2016-09-08 18:54:18 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
yuanke 8c71cf1946 Merge branch 'weixin_guange' into develop 2016-09-08 18:18:13 +08:00