Commit Graph

9091 Commits

Author SHA1 Message Date
lizanle cc6fe754d4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 15:45:46 +08:00
lizanle 756aae0cf2 发布issue编辑器可以上传代码并高亮显示了 2015-09-10 15:45:08 +08:00
cxt e6d5d17859 轻抚展开更多->展开更多 2015-09-10 15:08:10 +08:00
cxt 5f0aac9265 点击打开编辑资料,显示保存的性别 2015-09-10 15:01:59 +08:00
cxt 50aa22c5e5 个人动态的“点击展开更多”改为“轻抚展开更多”,鼠标移到方框上即自动加载更多动态 2015-09-10 10:01:43 +08:00
sw a841c20896 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:51:13 +08:00
cxt 28d4bae9e7 修改课程/项目的导航栏区域的文字样式 2015-09-09 17:53:34 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
cxt 5b14dbba45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:47:09 +08:00
cxt 6ed0a151dc 头像下拉框的样式修改 2015-09-09 17:45:39 +08:00
lizanle f892beebc1 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 17:15:04 +08:00
lizanle 763939f176 这个可以不用了 2015-09-09 17:12:02 +08:00
sw 1bf90739be 调整从资源库选择资源到作业、作品中弹框的初始位置 2015-09-09 17:00:11 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw adcd3b1ad5 去掉无用加载的js 2015-09-09 16:54:08 +08:00
sw 401b0bc7e3 textarea自动拉伸高度优化,编辑普通作业作品功能完成 2015-09-09 16:50:46 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
lizanle 24dce81b31 高度参数用一个 2015-09-09 14:57:42 +08:00
lizanle c393a0ea01 个人中心 留言界面 编辑框 ie浏览器下报错 2015-09-09 14:00:44 +08:00
lizanle b2afe18ccd 个人中心 留言界面 编辑框自适应高度 2015-09-09 13:44:23 +08:00
lizanle 4ad139e6fd 添加一点注释 2015-09-09 11:38:08 +08:00
lizanle 4b1153d0a5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 11:28:40 +08:00
lizanle 1dd4700eb2 个人中心留言功能 编辑框自适应高度 2015-09-09 11:28:28 +08:00
cxt 7474d19120 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 11:23:37 +08:00
cxt 040f3f588d 鼠标移到头像上方,才显示账户下拉菜单 2015-09-09 11:23:23 +08:00
lizanle 6adbceec7b Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 10:55:48 +08:00
lizanle 95f66a304c 通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知,讨论区,留言都可以自动的长高,缩短
2015-09-09 10:55:32 +08:00
cxt 8fec99114a "关于我们"的样式调整 2015-09-09 10:39:11 +08:00
cxt 6bf4a3dd13 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 10:21:57 +08:00
cxt a991500e55 登录首页的样式修改 2015-09-09 10:21:44 +08:00
lizanle faf5f1eab5 通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短 2015-09-09 09:52:39 +08:00
sw e040c20f08 admin界面,最后登录的用户列表报错 2015-09-09 09:36:44 +08:00
lizanle 169c56a58d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 09:22:08 +08:00
lizanle 3b9d1d6200 讨论区编辑框可以自动长高缩短 2015-09-09 09:22:01 +08:00
sw 1c91510ce2 Merge branch 'guange_homework' into szzh 2015-09-09 09:11:48 +08:00
sw 068b03cd8f Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework 2015-09-09 09:11:30 +08:00
guange c413d66c44 程序作业打分 2015-09-09 00:43:54 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
sw 137a0b16a0 1、文件的样式图片
2、点击编程弹框时,测试输入获取焦点
2015-09-08 15:40:25 +08:00
guange 52c2719a46 去掉老式的编程作业提交 2015-09-08 14:48:02 +08:00
sw 48cb07c453 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-08 14:44:50 +08:00
sw 1cbda41997 11 2015-09-08 14:43:59 +08:00
cxt 6f64152ec7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-08 11:56:04 +08:00
cxt cdca8dea4d 去掉缺陷描述的图片点击显示大图后的蓝色边框 2015-09-08 11:55:52 +08:00
lizanle 23e60bf007 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-08 11:18:10 +08:00
lizanle de822daf44 个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
2015-09-08 11:18:02 +08:00
sw e4209007b1 Merge branch 'guange_homework' into szzh 2015-09-08 10:28:21 +08:00
sw 3b24bb375a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-08 08:50:00 +08:00
sw a29d004fdc 没有加入课程的用户进入作业列表报错 2015-09-08 08:45:29 +08:00
guange be29bcc8bd 模拟答题记入数据库 2015-09-07 23:47:14 +08:00