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

2380 Commits

Author SHA1 Message Date
Tim 0e531aa529 题库标题颜色加深，common.css去重 2016-09-26 14:27:33 +08:00
daiao 73089e6a6a issue开始时间与结束时间改动 2016-09-23 17:23:12 +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
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
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
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
Tim 97394a6cbe 显示课程名称与班级名称 2016-09-18 16:47:13 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
cxt 020018fd31 分组作业的作品列表样式修改 2016-09-14 19:31:14 +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
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
daiao a3f444819e 项目列表名字太长排版问题 2016-09-12 10:52:43 +08:00
Tim 8c95141460 侧导航箭头显示 2016-09-09 16:48:43 +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
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
yuanke 8c71cf1946 Merge branch 'weixin_guange' into develop 2016-09-08 18:18:13 +08:00
Tim 031ba38655 性别选框样式调整 2016-09-08 15:28:22 +08:00
Tim 216c834a40 微信修改资料select框去边框；二级回复显隐点击效果更改 2016-09-08 14:15:00 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
Tim 2bb2a64dde 上传头像按钮和头像重合，并使上传按钮有效 2016-09-07 15:32:48 +08:00
cxt 0ae4d26ec0 课程大纲的内容区域应该和下面的回复区域的宽度一致 2016-09-07 15:22:15 +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
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +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
Tim 40f5510195 侧导航文字和按钮不重合 2016-09-01 16:01:16 +08:00
Tim 4d93b860f9 作品信息确认时，描述文字折行 2016-09-01 15:35:45 +08:00
Tim 76b7469f75 课程列表icon缩小 2016-09-01 14:04:53 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
Tim eda735db58 footer文字居中 2016-08-31 14:40:34 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +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
cxt 1e169985a4 访问计数的颜色调整 2016-08-29 15:23:35 +08:00
cxt 95ec047653 班级名称过长时，动态中标题显示与动态编辑图标按钮重叠 2016-08-29 14:12:42 +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
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
Tim 3e78dec32a 将课程、项目公用类放至public.css中 2016-08-25 16:07:57 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +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
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
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
Tim c8c5f5d415 iphone下flex无效 2016-08-23 16:36:59 +08:00
Tim 7d671c7758 调整输入框padding值 2016-08-23 15:04:48 +08:00
Tim a846eda77b 输入框padding调整；发帖样式新增 2016-08-22 14:29:43 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
huang 0c6e1b2ccb 版本库样式修改，显示全时间 2016-08-13 14:42:51 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
Tim b5af6f2c7f 绑定说明页面 2016-08-10 16:45:31 +08:00
Tim e85f9373c8 点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改 2016-08-10 15:37:08 +08:00
cxt fa07f2532f 题库弹框样式修改 2016-08-10 11:16:04 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
Tim d4f08f6498 课程logo替换，邀请码样式更改，班级路径显示主讲教师 2016-08-05 17:30:13 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
Tim be5e74897a 项目弹框位置调整 2016-08-05 15:26:15 +08:00
Tim cb6750cd01 输入时，忘记密码和绑定按钮重合的bug 2016-08-05 14:50:10 +08:00
Tim 56452d69f4 侧导航字体大小，颜色更改 2016-08-05 14:11:35 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
Tim b8a40862ce 改变行代码格式化，不折行 2016-08-04 14:04:55 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
Tim 950b18c250 加入班级提示 2016-08-03 16:39:22 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
Tim be36755d95 代码合并页面 2016-08-01 16:53:33 +08:00
yuanke f3ae53dc97 Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-08-01 09:21:31 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
Tim 24a6aabb6b 新建项目说明列表圆点大小与间距调整 2016-07-29 16:56:55 +08:00
Tim 4e5f3e56c7 新建项目说明文字居中 2016-07-29 16:24:42 +08:00
daiao 4d3f4c358a 微信功能 2016-07-29 16:13:25 +08:00
Tim 071ad88956 新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行 2016-07-29 15:40:47 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
Tim 6b89460295 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-28 17:11:56 +08:00
Tim 37e29404ba 微信班级管理图标可点击区域放大 2016-07-28 17:11:46 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
Tim 4bbd72ecd2 发送班级页面发送按钮定位 2016-07-28 14:58:19 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
Tim 6078db7e39 sy_public.css样式重用处理 2016-07-27 16:44:21 +08:00
Tim 9d7fa86cb6 syllabus.css样式重用处理 2016-07-27 16:33:27 +08:00
Tim 52475099dc 博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理 2016-07-27 14:36:46 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
cxt 4422bb1bc0 课程列表中的私有班级不可访问 2016-07-27 10:11:00 +08:00
Tim a2acbba34a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-26 17:30:27 +08:00
Tim e3057566c8 各详情页面内容和二级回复样式调整；回复详情内容不显示bug 2016-07-26 17:30:02 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +08:00
txz cef08a717c 课程名称过长时，邀请码无法点击bug 2016-07-22 16:09:47 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
txz 19781ded4e 输入框padding调整 2016-07-21 17:22:03 +08:00
txz 4a58777bb9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 15:56:31 +08:00
txz 0a0f8aefac 微信加入班级弹框css兼容；app页面meta标签修改 2016-07-21 15:56:27 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
yuanke 92ffbcfce6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 14:03:16 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
txz 24ee25e095 课程列表点击管理课程图标，列表展开bug修复 2016-07-21 13:54:03 +08:00
Tim fe105c84ad 弹框定位改为fixed 2016-07-21 10:18:58 +08:00
Tim 541440135f css中引用图片路径修改 2016-07-21 10:11:02 +08:00
Tim dcb541e889 资源库资源列表取消虚线 2016-07-20 17:10:51 +08:00
Tim 2850fe1b2b 预览图片边框阴影效果 2016-07-20 17:08:31 +08:00
Tim 85c9fb5dce 二级回复图片超出显示 2016-07-20 17:00:54 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式；作业列表调整 2016-07-20 15:09:01 +08:00
txz c56f7732a1 二级回复新样式 2016-07-20 14:05:17 +08:00
txz 707df88c7f tab容器宽度百分百 2016-07-19 16:05:39 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
txz 2af1a5ffb9 新增班级和管理班级输入框高度控制 2016-07-19 15:07:11 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
Tim 73401d6b41 下拉图标等显示 2016-07-19 09:09:13 +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 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
txz 6491e16c64 微信课程列表底边重合问题 2016-07-15 17:31:33 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
txz 0d08d6b192 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:14:55 +08:00
txz 6063932840 课程管理中，对课程,班级名称编辑时，字体变灰 2016-07-15 16:14:52 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
txz 5a463721b8 资源来源限制宽度 2016-07-15 14:09:22 +08:00
yuanke d50fd40307 Merge branch 'weixin_guange' into develop 2016-07-14 17:19:47 +08:00
Tim c41a116378 博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改 2016-07-14 17:00:38 +08:00
Tim 1fdd1a2a21 作业列表css与develop分支同步；popup.css优化 2016-07-14 15:28:01 +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
txz 24821ba01d 登录与注册页面，输入文字显示不全bug 2016-07-14 09:44:35 +08:00
Tim 538303f4d1 导航头像处理 2016-07-14 09:11:38 +08:00
txz f83d791de1 进入课程后，课件，作业，测验及学生管理tab样式更改 2016-07-13 09:54:37 +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 243f0bbe7d 微信详情内容与回复中链接添加蓝色 2016-07-12 10:43:21 +08:00