Commit Graph

2005 Commits

Author SHA1 Message Date
txz 24821ba01d 登录与注册页面,输入文字显示不全bug 2016-07-14 09:44:35 +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
txz bd29859a28 创建课程和参与课程区分样式 2016-07-11 14:46:35 +08:00
txz 114512d3d9 资源宽度限制 2016-07-11 11:05:49 +08:00
txz 6ea1a605c9 flex布局兼容css更新 2016-07-11 10:37:56 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题,删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +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
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
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
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
Conflicts:
	db/schema.rb
2016-07-05 16:49:50 +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
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
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