Commit Graph

1270 Commits

Author SHA1 Message Date
lizanle 4766cff41d 不符合条件的输入的时候,不显示结果 2015-10-30 10:46:51 +08:00
lizanle 578bb2537d 课程大纲功能 2015-10-29 17:09:03 +08:00
lizanle ac82910aa5 大纲 2015-10-29 11:53:52 +08:00
lizanle b67afc2b95 大纲 2015-10-29 09:07:26 +08:00
lizanle c2be8b4eec 课程大纲界面 2015-10-28 15:54:27 +08:00
huang 211b5c2db9 Merge branch 'szzh' into gitlab_guange 2015-10-28 09:27:52 +08:00
lizanle a0683d4900 加入课程界面输入框没有对齐
博客关注粉丝文字也要加超链接
2015-10-27 15:17:40 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange
Conflicts:
	db/schema.rb
2015-10-27 14:42:05 +08:00
lizanle 07a2263b16 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/controllers/courses_controller.rb
	public/stylesheets/new_user.css
2015-10-27 14:08:08 +08:00
cxt 2824b56481 增加首页教师加入课程的入口 2015-10-26 11:54:59 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
huang 1157dcaa06 版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
2015-10-22 13:44:35 +08:00
lizanle 707244886c 学校列表分页 2015-10-16 14:48:59 +08:00
cxt 8ea5d98b6c 课程讨论区发布帖子、编辑帖子的实现 2015-10-15 16:17:48 +08:00
lizanle d012820a54 显示用户的真姓名 2015-10-14 12:04:07 +08:00
Tim 58c8851a99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-14 09:26:20 +08:00
Tim 64ec465126 意见反馈窗口调整 2015-10-14 09:25:54 +08:00
lizanle 1c72d59f71 forum tag双击可编辑的函数错误,导致编辑器在火狐浏览器插入图片bug 2015-10-13 09:25:52 +08:00
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +08:00
lizanle dc3cb3a26b _logined_header.html头像 鼠标移入就要有效果 2015-10-09 13:38:35 +08:00
huang 548a18d1fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:32:16 +08:00
huang edf6f8e1f0 消息提示,显示新消息数目 2015-09-30 10:31:47 +08:00
lizanle 4f8e9ea2cd 编辑按钮被注释了 2015-09-29 17:54:33 +08:00
lizanle b798c6747b 删除贴吧 函数名重复了 2015-09-29 16:40:55 +08:00
Tim a0f4cabcf2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:24:30 +08:00
Tim 971ff1e692 贴吧点赞位置调整 2015-09-29 15:24:15 +08:00
lizanle 9e4896fc7b Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 15:13:14 +08:00
lizanle 138b24b34c oschina模式的代码插入 2015-09-29 15:13:05 +08:00
Tim 21408f3843 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:35:02 +08:00
Tim cc99120f25 贴吧样式更改 2015-09-29 14:34:39 +08:00
lizanle c75487fcf5 防止论坛名字太长 2015-09-29 14:27:53 +08:00
lizanle ea3900b50a Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 12:05:40 +08:00
lizanle a8bb7ca2bc 导航 2015-09-29 12:05:30 +08:00
sw f2d3ec980a 点击发布作业,作业列表标题栏自动获得焦点 2015-09-29 10:48:50 +08:00
sw ad4fc50fbb 1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
2015-09-29 10:20:13 +08:00
sw 6194be8933 界面样式调整。js修改
在课程内发布作业时无课程id
2015-09-28 17:09:07 +08:00
lizanle 5e0ae3a6bb 编辑贴吧描述匡样式修改 2015-09-28 14:11:46 +08:00
lizanle ea515cbb5d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 13:36:05 +08:00
lizanle f340941e3e 贴吧描述(历史数据)显示存在html代码 2015-09-28 13:35:59 +08:00
ouyangxuhua e4140ac411 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 13:29:17 +08:00
ouyangxuhua ab0013d659 1.项目问题中,问题类型为“周报”时,消息提示应为“发布了周报”;
2.stylesheet_link_tag 中,prettify应该加上引号,否则报错。
2015-09-28 13:29:02 +08:00
lizanle f2dd69f9b6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 11:42:50 +08:00
lizanle 62bf136bea 标题内容 如果换行,那么就换行显示 2015-09-28 11:42:32 +08:00
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 08:46:20 +08:00
sw b84ec1360a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:58:57 +08:00
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-25 16:32:25 +08:00
sw fd4a2b19c8 课程界面老师数量 2015-09-25 16:11:59 +08:00
lizanle 926bdd81e8 论坛名换行问题 2015-09-25 15:52:28 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle 924183b1cc js合并错误 2015-09-25 10:04:56 +08:00