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

2250 Commits

Author SHA1 Message Date
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
txz e3fe95213f 增加二级回复与文字间距离 2016-07-12 09:34:06 +08:00
txz dc6127eb78 微信我的资源样式更改 2016-07-11 16:54:58 +08:00
cxt b4e6561e50 Merge branch 'cxt_course' into develop 2016-07-11 15:16:27 +08:00
txz bd29859a28 创建课程和参与课程区分样式 2016-07-11 14:46:35 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
Tim 1aee5b6955 将大纲中共用样式提出；个性签名resize：none 2016-07-11 13:56:03 +08:00
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang 93e79d9419 add hidden to css 2016-07-11 11:23:59 +08:00
txz 114512d3d9 资源宽度限制 2016-07-11 11:05:49 +08:00
txz 6ea1a605c9 flex布局兼容css更新 2016-07-11 10:37:56 +08:00
cxt 8e8d6a8439 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-11 08:48:03 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +08:00
Tim 03bb862e18 代码查重页面消息弹框显示样式丢失 2016-07-08 16:55:48 +08:00
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 16:23:29 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
Tim fec1015604 在线测验结果列表超出bug修改 2016-07-08 15:44:14 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
huang 61e2e427fd Merge branch 'rep_quality' into develop 2016-07-08 11:30:53 +08:00
txz ed39b4b4f1 动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
Tim d7fb0d4bca 添加关注，取消关注图标更新 2016-07-08 09:10:03 +08:00
Tim fbedaea768 图标显示css修改 2016-07-08 09:00:54 +08:00
Tim 65cbf14d72 提交与取消按钮间添加间距；图标不显示等 2016-07-07 17:06:31 +08:00
cxt 3b418bc44c 如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。 2016-07-07 16:46:41 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
Tim 421dc636fe 作业列表样式更新 2016-07-07 10:47:12 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
Tim 0b764d0dfc RSide样式处理 2016-07-06 15:52:18 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
Tim d2d2222ea2 组织成员列表样式调整 2016-07-06 10:00:28 +08:00
Tim 4136aa9291 二级回复，上传附件后删除图标，文件图标显示， 2016-07-06 09:07:48 +08:00
Tim d9fc479607 消息弹框显示css调整 2016-07-05 16:51:55 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
Tim 253933c85a 消息通知图标显示 2016-07-05 16:46:52 +08:00
Tim b91d6a3273 班级动态筛选框样式调整 2016-07-05 16:31:36 +08:00
Tim c3bc901925 对#Rside样式处理 2016-07-05 16:16:12 +08:00
Tim fae2dc324c 登录注册页面图标显示 2016-07-05 16:03:39 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
Tim 4cbae10934 同步devlope分支css 2016-07-05 15:01:02 +08:00
cxt 4a5bdc5e48 课程列表中的班级显示适当缩进 2016-07-05 11:01:50 +08:00
cxt f83bd3cf63 课程英文名称输入框去掉拉动图标 2016-07-05 10:52:26 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
txz 45b824938e 课程讨论区与课程通知详情页面样式更新 2016-07-04 16:41:41 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
txz bd1aae07fd 微信动态页面样式更新 2016-07-04 14:43:51 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
huang 3737ef40d0 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 21:39:29 +08:00
yuanke 1bfb2918f0 KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题 2016-07-01 20:06:12 +08:00
Tim 28c20c966e 查看标签页面显示bug 2016-07-01 19:28:55 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
Tim 9cb0160930 课程资源，学生，教师列表css调整 2016-07-01 15:15:53 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
yuanke dfd381fc99 Merge branch 'yuanke_org' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 09:31:19 +08:00
yuanke 5cc40408ee 修改KE单倍行距显示的时候不一致的BUG 2016-06-30 16:30:02 +08:00
Tim 10f52f110f 课程大纲列表点击展开收起，配置按钮链接跳转实现 2016-06-30 16:12:25 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
Tim ba1db91a1e css优化调整 2016-06-30 15:38:00 +08:00
cxt 4314f6e36a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-06-30 15:37:16 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
Tim 590b879f02 追加附件弹框不固定bug修复 2016-06-29 16:54:12 +08:00
txz 2596231ce7 微信新动态样式更新 2016-06-29 15:44:32 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
txz b2b6536a0f 微信css样式更新 2016-06-28 14:48:33 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
Tim bb4d93f911 图片路径有效化 2016-06-24 17:32:30 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
Tim a542ba46a4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:55:07 +08:00
Tim ec33569033 取消拖拽 2016-06-24 15:54:56 +08:00
Tim a3738c4cb2 新建组织，题库和资源库弹框样式检查 2016-06-24 15:42:42 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
Tim a28d775cb2 资源库，题库样式检查 2016-06-24 14:01:49 +08:00
guange f9075e08ba merge 2016-06-24 13:35:26 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name e17aa4c5d8 color 2016-06-24 11:20:39 +08:00
Your Name 05eb71036d some css to added 2016-06-24 10:47:24 +08:00
Tim d14a462f2b 替换css文件源，css样式修改 2016-06-23 17:28:21 +08:00
Your Name 8438bc7bcd somethint to added 2016-06-23 14:31:23 +08:00
huang 9f15a8aa4e 代码质量分析样式 2016-06-22 17:40:13 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
yuanke b68e227531 没激活的帐号界面 2016-06-22 14:04:47 +08:00
cxt 1b12c56960 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 16:53:36 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
Tim 1a4865be09 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 15:03:51 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
guange 62a1b5de7c 加入班级更新 2016-06-20 17:04:42 +08:00
yuanke 301556b9c3 Merge branch 'yuanke' into develop 2016-06-20 16:41:23 +08:00
yuanke d3f3f019a0 下拉菜单有时候不显示 2016-06-20 16:40:56 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
guange 4db1df0a4d css 2016-06-20 16:29:52 +08:00
guange 311f21ee5a css 2016-06-20 16:23:59 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
guange 47c443e59d 输入框变大一点 2016-06-20 15:56:57 +08:00
Tim 3548c23aad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-20 15:43:15 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
txz b17b92cc3e 微信回复后先加载后启用回复按钮 2016-06-20 11:08:57 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
yuanke f3014c3993 Merge branch 'yuanke' into develop 2016-06-17 17:25:53 +08:00
huang 2464586ed2 组织样式问题 2016-06-17 17:20:17 +08:00
yuanke 948ec58248 作业二级回复未登录显示样式问题 2016-06-17 17:18:36 +08:00
txz 18df93ba9f 微信动态列表界面问题 2016-06-17 16:16:24 +08:00
txz acf17d6252 微信详情页面链接添加颜色 2016-06-17 15:45:29 +08:00
txz 994ce342d7 微信ul布局优化 2016-06-17 15:35:58 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-06-17 14:36:12 +08:00
huang 0f17ac0e9e Merge branch 'lingbing' into develop 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-06-17 14:33:31 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
yuanke 747b2007cd 项目中未登录提示按钮样式问题 2016-06-17 13:44:11 +08:00
huang 227f2343a4 登录注册背景图片替换 2016-06-16 17:14:13 +08:00
huang 260bef0ebb 登录祖册鼠标经过颜色 2016-06-16 17:01:51 +08:00
huang 006965df50 导航背景颜色还原 2016-06-16 16:46:44 +08:00
huang 3f697355d2 chorm浏览器兼容问题 2016-06-16 16:01:56 +08:00
huang 312fa61489 输入框线条 2016-06-16 15:57:30 +08:00
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
huang d2d15710b5 解决chrome浏览器背景黄色问题 2016-06-16 15:25:43 +08:00
huang a63dffd9d3 资源库导航颜色一致 2016-06-16 14:54:27 +08:00