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

4074 Commits

Author SHA1 Message Date
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 096bc145da 问卷样式调整 2016-10-19 20:05:21 +08:00
cxt 9c1630b682 问卷的标题显示过长 2016-10-19 19:43:35 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt 26121d895f 袁可 编程测试 2016-10-19 18:09:29 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
daiao b16a9d8ab6 项目配置样式调整 2016-10-19 17:45:24 +08:00
huang 2c795cf08c 项目样式 2016-10-19 17:41:19 +08:00
Tim af5db3713c issue详情页面，属性页面，回复页面，二级回复页面宽度调整 2016-10-19 14:57:31 +08:00
Tim e4a6a5f58d 项目issue状态宽度调整 2016-10-19 11:17:34 +08:00
yuanke b907b626a9 代码测试结果不全分数100分的BUG修复 2016-10-19 10:27:40 +08:00
Tim a58cebdf5c 提交改动页面宽度扩展 2016-10-18 17:30:07 +08:00
Tim aa379980d7 版本库显示页面宽度扩展 2016-10-18 15:40:23 +08:00
yuanke c0e6085e74 注册时登录名改为只能字母和数字、字母开头4-15长度 2016-10-18 14:47:06 +08:00
Tim 622fa382ca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 11:30:57 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
Tim fb9e1a02df 项目动态宽度调整 2016-10-18 11:30:42 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制；更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
cxt 61bfe405f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:35:13 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
cxt a709f5c720 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:16:39 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
Tim 0c481de79d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 13:41:45 +08:00
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
cxt d5eea455e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:53 +08:00
Tim ef9e9aca04 弹框居中显示 2016-10-14 19:35:53 +08:00
cxt 5870c3eaaf 子栏目讨论区列表的排序、作品内容的样式调整 2016-10-14 18:24:54 +08:00
cxt 142e301e53 必答换行 2016-10-14 18:03:49 +08:00
cxt e59f3f887a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:44:42 +08:00
cxt d247109819 编程作业提示信息 2016-10-14 16:44:37 +08:00
Tim 75a68e9844 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:34:09 +08:00
Tim a302dcca04 匿评分数tip 2016-10-14 16:33:56 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
cxt 38d43cfb67 必答不应换行 2016-10-14 16:11:46 +08:00
cxt 45008d9868 班级问卷：鼠标点击描述框，光标却自动定位到第二行了 2016-10-14 15:55:47 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
Tim 2735aca331 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-14 14:51:09 +08:00
Tim 86de58f793 问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整 2016-10-14 14:50:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
cxt 252da9c3d3 Merge branch 'cs_optimize_txz' into develop 2016-10-13 14:24:01 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
huang e2ee75d8c1 项目宽版架构优化（主要是model及与课程等模块的分离） 2016-10-13 10:52:48 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
Tim 0773c12cde 暂时保留project.css中共用的班级主页css 2016-10-13 10:12:40 +08:00
Tim 746e27903e 版本显示与提交变更页面宽度调整 2016-10-13 09:49:34 +08:00
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
Tim c693afdee8 project.css去重，提取到public.css 2016-10-11 17:26:36 +08:00
Tim 005cd09d4a 大纲中按钮样式移到common.css中；project.css中部分样式去重；翻页去掉灰色边线；大纲项目公用样式提取到public.css中 2016-10-11 14:58:50 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +08:00
daiao da630a728e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-10-09 09:02:39 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
Tim 7d3847656b 分班名称过长折行显示问题；分班编辑按钮定位；分班icon css 2016-09-30 17:01:55 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt 4da5144cd5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-29 11:29:49 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
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
yuanke dc051f0ec3 博客回复颜色修改 2016-09-08 18:17:11 +08:00
yuanke 9e66bcb2ab 微信通知二级回复修改 2016-09-08 18:11:40 +08:00
yuanke 5c626f94b5 微信二级回复框不显示修改 2016-09-08 18:04:37 +08:00
yuanke b43f8cf974 调试 2016-09-08 17:44:38 +08:00
yuanke 8f3a73d400 调试 2016-09-08 17:37:00 +08:00
yuanke b6fdbc11a6 微信回复框修改 2016-09-08 16:22:19 +08:00
yuanke ab383031a6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-08 15:56:21 +08:00
yuanke 58037c3796 微信二级回复修改 2016-09-08 15:56:09 +08:00
Tim e5b1b920e6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-08 15:37:07 +08:00
Tim ca4c668c9b 邮箱提示位置调整 2016-09-08 15:36:58 +08:00
yuanke e74516cb68 微信修改个人资料 2016-09-08 15:34:48 +08:00
Tim 031ba38655 性别选框样式调整 2016-09-08 15:28:22 +08:00
yuanke 8584d1dccb 修改微信二级回复回复框的BUG 2016-09-08 15:05:27 +08:00
Tim 216c834a40 微信修改资料select框去边框；二级回复显隐点击效果更改 2016-09-08 14:15:00 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
yuanke 1109eba460 微信上传图片功能先屏蔽 2016-09-08 08:46:29 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
Tim 2bb2a64dde 上传头像按钮和头像重合，并使上传按钮有效 2016-09-07 15:32:48 +08:00
cxt 0ae4d26ec0 课程大纲的内容区域应该和下面的回复区域的宽度一致 2016-09-07 15:22:15 +08:00
yuanke d8a4eb56cf 微信上传头像修改 2016-09-07 15:14:46 +08:00
yuanke 133b8af6ca Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-07 14:19:19 +08:00
yuanke c234a8d2cb 个人资料修改功能 2016-09-07 14:19:07 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改；测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
Tim 01246f65ba Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-06 17:10:11 +08:00
Tim bd7cd7e244 二级回复点击显隐效果 2016-09-06 17:09:57 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
Tim 96e7d14060 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-06 09:17:40 +08:00
Tim 05170c43ed 微信动态详情二级回复 2016-09-06 09:17:29 +08:00
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
yuanke f540ac282d Merge branch 'weixin_guange' into develop 2016-09-02 16:37:16 +08:00
Tim 92ae8865f0 删注释 2016-09-02 16:35:16 +08:00
Tim 77c727e18a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-02 16:34:46 +08:00
Tim 7fe1394403 ios自动定位输入框 2016-09-02 16:34:33 +08:00
yuanke 6571b94bf1 Merge branch 'weixin_guange' into develop 2016-09-02 16:08:49 +08:00
yuanke ed7308969c 微信帖子删除后显示 2016-09-02 15:45:07 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
Tim 9e317c4a8f 二级回复英文单词过长不折行 2016-09-02 13:54:34 +08:00
Tim 0974153364 课程加入路径显示 2016-09-02 13:49:08 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
yuanke 12f854f31b Merge branch 'weixin_guange' into develop 2016-09-02 10:55:43 +08:00
yuanke a6bb19eb60 微信动态回复增加点赞 2016-09-02 10:54:40 +08:00
Tim 2316b3fe7b 回复添加点赞 2016-09-02 10:21:50 +08:00
yuanke 5cda2292d0 Merge branch 'weixin_guange' into develop 2016-09-02 09:48:35 +08:00
yuanke 5d47ee0c43 修改项目班级动态BUG 2016-09-02 09:42:45 +08:00
Tim 0dff52ff09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-01 16:01:25 +08:00
Tim 40f5510195 侧导航文字和按钮不重合 2016-09-01 16:01:16 +08:00
yuanke aaa263f01e Merge branch 'weixin_guange' into develop 2016-09-01 15:58:16 +08:00
yuanke 0a398b38da 修改按钮颜色 2016-09-01 15:57:29 +08:00
Tim 4d93b860f9 作品信息确认时，描述文字折行 2016-09-01 15:35:45 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
Tim 4c64e883ea 加入班级、项目时，增加获取邀请码提示 2016-09-01 14:30:21 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
Tim 76b7469f75 课程列表icon缩小 2016-09-01 14:04:53 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
yuanke a6241afe04 . 2016-09-01 13:36:27 +08:00
yuanke 251fd36748 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-01 11:18:52 +08:00
yuanke d4f8bd29f4 班级项目成员管理BUG修改 2016-09-01 11:18:42 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
Tim 742100d9b5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-01 10:41:32 +08:00
Tim 2251869881 iphone下视角滚动 2016-09-01 10:40:57 +08:00
yuanke 8644ad178c 修复班级项目 删除成员的BUG 2016-09-01 10:21:29 +08:00
yuanke c3c2516e6b 微信班级、项目增加删除成员和退出功能 2016-08-31 17:19:12 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
cxt 9c327fe05e at符号前面是标点符号或没有空格还是弹出用户列表。 2016-08-31 14:59:27 +08:00
Tim eda735db58 footer文字居中 2016-08-31 14:40:34 +08:00
Tim d11f673711 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-31 14:30:32 +08:00
Tim ec15474c3a 成员管理更改时，确定按钮样式变更 2016-08-31 14:30:16 +08:00
yuanke 6c5eaf2779 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-31 14:21:50 +08:00
yuanke 292e778a8c 微信班级项目增加删除和退出功能 2016-08-31 14:21:38 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
Tim 48f110bbc8 新增退出项目，成员管理删除 2016-08-31 13:53:11 +08:00
Tim e0fed38f1d 新增退出班级及删除成员 2016-08-31 10:53:58 +08:00
yuanke e37a2fee1e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:25:46 +08:00
yuanke b4a5179a1b 修改班级成员管里的配置返回后显示空白及@issue链接无效的问题 2016-08-30 14:25:36 +08:00
Tim 14ece14b78 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:12:15 +08:00
Tim bc1caf3d54 表情处理 2016-08-30 14:12:05 +08:00
yuanke 4e312595fe Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:08:23 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +08:00
Tim e30416f6b3 手机表情处理 2016-08-30 10:49:44 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
Tim ac0cc37fe4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:23 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
cxt acb18ca4c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:40:26 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
Tim a8d551105b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:28:45 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
cxt 1e169985a4 访问计数的颜色调整 2016-08-29 15:23:35 +08:00
cxt 95ec047653 班级名称过长时，动态中标题显示与动态编辑图标按钮重叠 2016-08-29 14:12:42 +08:00
Tim a467338161 iphone定位js 2016-08-29 11:32:11 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
Tim d940f957ec css问题更改 2016-08-26 18:36:59 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
yuanke 82779c99ea 字符串去掉空白时，空格不去掉。 2016-08-26 09:59:00 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
Tim 3e78dec32a 将课程、项目公用类放至public.css中 2016-08-25 16:07:57 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
yuanke ea238cd407 微信班级发布问题改为发起讨论 2016-08-25 15:45:39 +08:00
yuanke 589df7e498 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 15:34:22 +08:00
yuanke 5b73e7dc19 修改发布帖子标题的长度及班级动态中不显示头像 2016-08-25 15:34:13 +08:00
Tim 6b4e25520d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 14:30:50 +08:00
Tim 78123b5db7 iphone设备输入时，自动定位到输入框 2016-08-25 14:30:42 +08:00
yuanke bb2a1de98c 资源详情返回更多按钮BUG修改 2016-08-25 14:26:31 +08:00
yuanke fd2021a1fe 微信资源界面发送后返回处理 2016-08-25 14:05:21 +08:00
Tim ae09d7ff27 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 13:39:13 +08:00
Tim bb935e42a8 发帖时，标题字符限制；发布按钮不遮住输入框 2016-08-25 13:39:02 +08:00
yuanke aa11f39b2d Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/class.html
	public/javascripts/wechat/controllers/class.js
 2016-08-25 11:24:27 +08:00
yuanke 3673ed3f1d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 10:55:59 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
huang 61fe0fc77c 项目讨论区发帖时 标题为空 内容为空给出提示 2016-08-25 10:50:18 +08:00
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +08:00
Tim 7682a4d45d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-24 17:03:11 +08:00
Tim a13ec60173 修复无效的css 2016-08-24 17:02:59 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00