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

2276 Commits

Author SHA1 Message Date
Tim 223b17d8fe 普通作品列表、系统评分作品列表、匿评作品列表格式修改 2015-11-05 14:45:22 +08:00
huang 4608190529 增加点击选择历史版本记录 2015-11-05 14:31:43 +08:00
cxt 35c60c3253 作品列表的作品信息样式调整 2015-11-05 09:37:56 +08:00
cxt c6f365c1ac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-05 09:00:22 +08:00
lizanle 6ae28a1bef Merge branch 'szzh' into dev_zanle 2015-11-04 16:29:42 +08:00
cxt 1133b35169 作业tag的调整 作业截止时间精确到分 2015-11-04 15:24:24 +08:00
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 11:16:25 +08:00
cxt e06f08aa3b 作业状态的更改 2015-11-04 11:16:11 +08:00
lizanle de0ca8d3d8 课程相关的ke 内容提交bug 2015-11-04 11:03:45 +08:00
lizanle 43d9c5636a 课程发布通知的在ie11下的bug 2015-11-04 10:13:25 +08:00
huang 98ee22a3b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 17:19:47 +08:00
lizanle 8d25b5676c tag_name名称长度扩大至120个字符 2015-11-03 14:56:32 +08:00
lizanle f1092d5072 去掉上传文件的时候文件名后的 可选的描述 2015-11-03 14:33:59 +08:00
lizanle b84628af9d regist_btn color 2015-11-03 11:23:56 +08:00
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器； 
编写创建组织页面。
 2015-11-03 11:19:38 +08:00
lizanle 6f002613d0 答疑框 2015-11-03 10:55:35 +08:00
huang a4209bc9f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 10:52:49 +08:00
lizanle 594a1b01ef Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-03 10:37:21 +08:00
lizanle 3360a25a42 项目 主页 资源上传 不要翻页，直接弹出资源弹出框 2015-11-03 10:28:13 +08:00
huang edf9b4a6b5 修改样式 2015-11-02 20:01:19 +08:00
huang 4d5d012ecf 版本库相关界面调整 2015-11-02 16:41:15 +08:00
huang 05bb40c8a7 Merge branch 'develop' into gitlab_guange 2015-11-02 13:58:09 +08:00
huang 8ec2dc3196 多版本库情况： 
1、没有新增项目提供接口
2、新建页面历史版本库列表
 2015-11-02 13:53:35 +08:00
cxt 25e1eb75ab 课程内发布作业失败 2015-11-02 09:49:58 +08:00
huang aa4710d872 git中忽略配置文件 
提交记录新界面
修改获取用户路径
 2015-10-30 15:46:06 +08:00
lizanle b97ad10cc9 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-30 14:10:19 +08:00
lizanle 27a2a2890f 大纲设置图标 鼠标放上去呈手型 
图标一直显示
 2015-10-30 14:10:08 +08:00
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-30 13:59:33 +08:00
cxt 6dcc97d5d1 添加作业的发布功能 2015-10-30 13:58:54 +08:00
lizanle 4d7ca63a12 添加一个参数控制 
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
 2015-10-30 11:51:09 +08:00
lizanle 6b1c140258 更改宽度 2015-10-30 11:12:50 +08:00
lizanle 9e1c675c66 根据大纲搜索结果适应高度 2015-10-30 10:49:58 +08:00
lizanle 70003a8d9c 课程大纲功能 弹出框样式问题 2015-10-30 10:19:57 +08:00
lizanle 578bb2537d 课程大纲功能 2015-10-29 17:09:03 +08:00
lizanle a747983a51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-29 14:05:58 +08:00
cxt b0aee8c92f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-29 10:43:16 +08:00
cxt 958d781997 作品列表的样式修改 2015-10-29 10:43:01 +08:00
ouyangxuhua c3a67a544b 修改系统消息logo为红色trustie 2015-10-29 09:23:04 +08:00
lizanle b67afc2b95 大纲 2015-10-29 09:07:26 +08:00
lizanle 5b624330cf Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	app/views/layouts/base_courses.html.erb
	public/stylesheets/courses.css
 2015-10-29 09:04:59 +08:00
lizanle eaba915598 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-28 17:37:41 +08:00
Tim 1a2edd9103 课程大纲图标等修改 2015-10-28 17:34:41 +08:00
lizanle c2be8b4eec 课程大纲界面 2015-10-28 15:54:27 +08:00
Tim 510a1f5fdb 搜索按钮鼠标覆盖效果 2015-10-28 15:02:21 +08:00
Tim 61dc979ee4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-28 14:53:39 +08:00
Tim e58dcc851b 资源库搜索图标替换 2015-10-28 14:34:39 +08:00
huang 87b1790f04 未完成功能JS提示 2015-10-28 09:23:12 +08:00
huang 00ce480d52 查看文件，强制不换行 
鼠标光标游走屏幕跟走效果
 2015-10-27 17:26:43 +08:00
huang 2cf1f05022 修改目录结构 2015-10-27 16:32:25 +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
huang 7970a46469 1、添加功能：依据分支切换显示不同的提交记录 
2、切换分支刷新页面
3、版本库显示页面修稿
 2015-10-27 11:41:25 +08:00
lizanle 242b7bc998 undo redo的改变个数改为1 2015-10-27 10:29:57 +08:00
cxt 25d6ed520e 首页的问题动态增加附件上传时间 2015-10-27 09:45:22 +08:00
huang 34a8d0890c 相政新界面 2015-10-26 17:18:59 +08:00
lizanle ca0b7e77ba 论坛帖子显示序号问题 2015-10-26 17:15:44 +08:00
lizanle 4a91c51b33 当前选中的字体提示问题 2015-10-26 17:15:13 +08:00
cxt 2f9cb94e7e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-26 15:26:15 +08:00
cxt 2f4b29085c 首页动态中的表格超出边框 2015-10-26 15:26:05 +08:00
lizanle c93c2e4bb3 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-26 14:44:10 +08:00
lizanle 4fca8022f3 贴吧 帖子 序号问题 2015-10-26 14:43:58 +08:00
cxt efe4b8609f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-26 11:55:52 +08:00
cxt 2824b56481 增加首页教师加入课程的入口 2015-10-26 11:54:59 +08:00
lizanle 69bc26033e 防止url删减报错 
url博客内容长度限制改为20000
 2015-10-26 10:54:27 +08:00
lizanle eaf4ad354f Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/courses_controller.rb
	app/services/courses_service.rb
	app/views/courses/join.js.erb
	public/stylesheets/new_user.css
 2015-10-26 10:21:13 +08:00
ouyangxuhua 6924a3e7bb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-24 16:13:05 +08:00
ouyangxuhua a42a58fb42 修改火狐浏览器出现多余省略号的问题 2015-10-24 16:09:44 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
cxt 274db8d080 作品列表页面的作业信息添加附件的显示 2015-10-24 14:53:49 +08:00
huang 0a4fd92d8c 查看代码，显示在project右侧 
翻滚
代码展示编辑状态（颜色区分样式）
 2015-10-24 11:51:02 +08:00
ouyangxuhua 16f0868df3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-23 16:28:40 +08:00
ouyangxuhua bc3fbc270f 将学生改成同学 2015-10-23 16:28:22 +08:00
huang 2221fb4d7a committers跳转问题 
按钮样式
 2015-10-23 16:28:17 +08:00
Tim 4bedc81524 作品列表提交按钮位置调整 2015-10-23 16:26:58 +08:00
huang b45d140a74 没有上传代码显示页面 
目录接头top修改
 2015-10-23 16:20:32 +08:00
Tim 83b984a909 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-23 15:46:09 +08:00
Tim b063be917b 附件图标更改；弹窗文字上padding减小 2015-10-23 15:45:48 +08:00
huang 7ab6c45262 1、转换界面添加提示。 
2、url样式
 2015-10-23 15:37:58 +08:00
ouyangxuhua 4a188dc81d 对所有作业消息，统一在内容前加圆点，并且调整颜色 2015-10-23 14:28:24 +08:00
ouyangxuhua 9375227250 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-23 09:33:29 +08:00
ouyangxuhua 7845a0e712 修改作业消息的内容及样式 2015-10-23 09:33:16 +08:00
cxt e2990fb55c 控制动态描述的高度为20行，可展开和收起。 2015-10-22 17:42:02 +08:00
cxt 4b6f8efc5a 作品列表添加作业信息 2015-10-22 16:57:36 +08:00
huang 4c5843a169 1、title数据更新 
2、summary调整
3、本版库显示，变更页面
4、相关CSS
 2015-10-22 16:03:22 +08:00
huang 1157dcaa06 版本库summary 
文件目录
新版本库地址
按分支显示提交记录
相关界面
 2015-10-22 13:44:35 +08:00
Tim 17afc1a9fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:31:18 +08:00
huang b172fa7512 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:30:22 +08:00
huang 515dad66e2 课程资源库附件单独JS实现 2015-10-20 10:30:09 +08:00
Tim 1dd0954a94 意见反馈宽度调整 2015-10-20 10:29:51 +08:00
Tim ad77104485 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-20 10:23:03 +08:00
Tim f59593cc1c 学校信息修改样式更改 2015-10-20 10:22:47 +08:00
huang b3cd3c48d2 修改私有样式 2015-10-20 10:11:43 +08:00
huang dc1e72a64b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-19 18:30:41 +08:00
huang 588bc2ed98 页面显示公开/私有 2015-10-19 18:30:28 +08:00
Tim 787b3fa5d4 贴吧点赞图标颜色更换 2015-10-19 17:20:41 +08:00
Tim 2ca83bc7c4 学校修改界面修改 2015-10-19 15:51:27 +08:00
cxt 7dd6618345 非课程成员不能将帖子置顶和锁定 2015-10-16 17:32:17 +08:00
cxt 26eda763fe 帖子锁定时动态的样式调整 2015-10-16 16:31:31 +08:00
cxt 5f3c8d928d 作业批次下拉列表的样式修改 2015-10-16 14:51:30 +08:00
Tim 4dddbe9dc7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_journalsformessage.html.erb
 2015-10-16 10:58:28 +08:00
Tim 49b994b3fe 个人动态、系统消息动态、课程动态格式调整 2015-10-16 10:54:22 +08:00
cxt c77505392a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-16 10:42:17 +08:00
lizanle 7961149d2a 解决kindeditor报错问题 2015-10-16 10:30:34 +08:00
cxt fef0475c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-16 10:19:05 +08:00
lizanle ec316e580f ke复制贴图url不对 2015-10-16 10:07:10 +08:00
cxt a16dc09afa 讨论区帖子图片可点击 2015-10-16 09:26:13 +08:00
cxt 0a43f462f5 帖子动态添加置顶显示 2015-10-15 16:44:49 +08:00
cxt caa278d9f5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/boards_controller.rb
	db/schema.rb
 2015-10-15 16:22:49 +08:00
cxt 8ea5d98b6c 课程讨论区发布帖子、编辑帖子的实现 2015-10-15 16:17:48 +08:00
lizanle b3d15b886a 学校的查询与现实问题重做 2015-10-15 12:04:55 +08:00
cxt ea66ca5e00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
	public/javascripts/init_activity_KindEditor.js
 2015-10-14 11:41:30 +08:00
cxt 8abc97ae84 个人主页添加个人留言动态 2015-10-14 11:38:16 +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
guange 6472367b68 firefox粘贴图片只能一张的bug 2015-10-13 21:47:55 +08:00
guange bdecea83ca js中edit报错 2015-10-13 21:37:41 +08:00
cxt 3ebbcedf1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-13 16:51:57 +08:00
lizanle c9b23c5597 贴吧 项目符号 应该显示 2015-10-13 15:59:02 +08:00
cxt a77f7e6f75 课程讨论区单个帖子页面的功能实现 2015-10-13 11:03:22 +08:00
cxt 03e8c3802d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-12 17:20:11 +08:00
cxt ebb7ed1f1a 讨论区单个帖子页面的二级回复 2015-10-12 17:19:55 +08:00
Tim 752494e35e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-12 16:08:51 +08:00
Tim d33a6b763d 引用资源库弹窗外观调整 2015-10-12 16:08:33 +08:00
ouyangxuhua 155dff7e27 1.增加消息列表对应的图标； 2015-10-12 15:08:01 +08:00
lizanle 485208f3ab Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-10 11:38:04 +08:00
lizanle 94bffb5458 插入头像 ， 粘贴图片 ，插入图片，都要加入域名。防止邮件中出现图片不显示的问题 2015-10-10 11:37:58 +08:00
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +08:00
Tim 9e91429b1e 鼠标在侧导航左侧文字颜色不变修复 2015-10-10 10:32:08 +08:00
Tim 99e19c51f9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 10:24:12 +08:00
Tim 48bd70b9f6 个人动态编辑图片显示 2015-10-10 10:23:52 +08:00
huang ddac70c9b8 项目成员角色Gitlab一致，单选 
添加成员按钮样式调整
 2015-10-10 10:00:11 +08:00
lizanle 724abee12a 缩进问题 2015-10-09 15:49:50 +08:00
cxt c6cca9f17e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:40:49 +08:00
cxt 0f6ea47792 课程讨论区的列表显示 2015-10-09 14:39:40 +08:00
lizanle 5f8d21f1cb 暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:26:27 +08:00
lizanle b04e20ed7d 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:25:40 +08:00
lizanle 357a5d4139 添加点赞人数 2015-10-09 14:08:12 +08:00
huang 530d101024 项目邀请--姓名、长度JS验证 2015-10-09 11:25:21 +08:00
huang 7b18c14aa3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 10:34:18 +08:00
huang 654ebfca46 项目邀请添加：姓、名、性别 2015-10-09 10:33:10 +08:00
Tim fb5eae3ae2 搜索框图标漂移效果清除 2015-10-09 10:26:47 +08:00
Tim 0ff58b7631 修复了贴吧图片漂移的问题 2015-10-09 09:41:36 +08:00
Tim 2ceba291bf 蓝色箭头替换 2015-10-08 17:27:08 +08:00
Tim f5ff94d888 资源库固定宽度、作品描述margin、搜索框文字居中 2015-10-08 16:35:08 +08:00
lizanle 7d04ce80d4 tag为可以点击的时候 是 手型 2015-10-08 13:56:17 +08:00
lizanle c8357a6364 批量修改tag 2015-10-08 13:51:55 +08:00
lizanle d8a4e4d710 issue序号丢失的问题 
issue缩进以及代码缩进的样式不同 的问题
 2015-10-08 11:33:52 +08:00
lizanle 56db8b4232 批量修改tag的bug 2015-10-08 11:08:26 +08:00
lizanle 88ddaaaaf5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-08 10:00:23 +08:00
lizanle f71ca2391f 编辑器换行行间距巨大的bug 2015-10-08 10:00:10 +08:00
huang 326c05d0eb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 11:24:31 +08:00
huang fd020b56f7 细调红点样式 2015-09-30 11:24:17 +08:00
Tim c7a9738dc8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:52:44 +08:00
Tim ff18381f64 引用资源库弹框调整 2015-09-30 10:52:27 +08:00
sw af892fa7ef Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:44:00 +08:00
Tim 78d11b57b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:33:31 +08:00
Tim 42d4a5628d 引用资源库的icon修改 2015-09-30 10:33:13 +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
sw d1bb76cfcb 调整学生匿评界面提交按钮样式 2015-09-30 10:24:20 +08:00
lizanle d182f532a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-30 10:21:27 +08:00
lizanle acdb63974f 具体课程发布作业的样式 2015-09-30 10:21:11 +08:00
sw 9edfa49bcb 项目内上传图片按钮 2015-09-29 17:41:12 +08:00
huang 278d26e9a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:35:37 +08:00
huang fe83fe31af 项目版本库--》内容对比 2015-09-29 17:35:22 +08:00
Tim b6a8a69be8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:30:02 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
sw 3cf5e9e2b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:26:31 +08:00
lizanle 4386f3fddf 样式问题 2015-09-29 17:29:44 +08:00
sw 7cba1e5f76 课程内发布作业按钮无反应 2015-09-29 17:10:16 +08:00
lizanle 2c9e46fc77 靠左 0间距 2015-09-29 16:48:56 +08:00
lizanle b292b1580d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 16:36:58 +08:00
lizanle 38702dde64 去掉源码模式 2015-09-29 16:36:51 +08:00
cxt 06b97e281a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:20:50 +08:00
cxt 26624c8009 动态回复编辑框的“我要回复”的隐藏 2015-09-29 16:20:35 +08:00
lizanle 3c01969db1 代码缩进 2015-09-29 16:06:04 +08:00
Tim 1613f41e77 点赞判断 2015-09-29 15:44:04 +08:00
Tim 0fdf10649c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:25:01 +08:00
Tim a0f4cabcf2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:24:30 +08:00
lizanle 81092a7e32 行高调整 2015-09-29 15:24:50 +08:00
Tim 971ff1e692 贴吧点赞位置调整 2015-09-29 15:24:15 +08:00
lizanle c8b5ccdd34 行高调整 2015-09-29 15:23:09 +08:00
sw 9beaba0aac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:21:11 +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
sw b22669e36f 课程上传图片按钮 2015-09-29 14:50:29 +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
sw 515e2be4f8 课程内的作业列表匿评设置确定按钮无效 2015-09-29 14:23:50 +08:00
lizanle de62798d4d 点赞按钮位置调整 2015-09-29 13:54:54 +08:00
lizanle 4f63f3fd2a 导航 2015-09-29 12:06:56 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang 61061573a7 去掉版本库git操作指南 2015-09-29 10:42:17 +08:00
sw 22b9c6a866 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/courses.css
 2015-09-29 10:40:11 +08:00
lizanle 5002daad52 帖子内容显示不对 2015-09-29 10:34:05 +08:00
sw 6194be8933 界面样式调整。js修改 
在课程内发布作业时无课程id
 2015-09-28 17:09:07 +08:00
cxt 12c394c36e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:11:18 +08:00
cxt 955d87a98c 新增测试集的编辑框自适应高度 2015-09-28 16:09:59 +08:00
ouyangxuhua 80fabf0681 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:09:55 +08:00
ouyangxuhua e9d61a928a 修复项目issue中，图片显示超出边界的问题 2015-09-28 16:08:47 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
cxt e1348a4845 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 15:24:27 +08:00
cxt 038bcdb80e 课程动态的作业编辑菜单样式调整 2015-09-28 15:24:03 +08:00
ouyangxuhua eac31cda7f 修改个人主页最新动态图片显示超出边界问题 2015-09-28 15:13:42 +08:00
cxt e298f738ed 调整课程动态的过滤列表样式 2015-09-28 14:10:04 +08:00
ouyangxuhua 29b4e174fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:20:27 +08:00
ouyangxuhua f73865b771 1.修改作业消息的样式； 
2.解决系统消息时间显示问题。
 2015-09-28 10:20:14 +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 591324854b 项目缺陷点击留言，下面留言框获得焦点 2015-09-25 17:22:31 +08:00
cxt be932e3b1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:32:41 +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
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
ouyangxuhua 6591ea8e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:27:00 +08:00
ouyangxuhua 0b932267c7 调整截止日期快到了的宽度 2015-09-25 15:26:40 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
ouyangxuhua 474779498b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 14:40:22 +08:00
ouyangxuhua 1935a9caaa 调整消息页面的宽度 2015-09-25 14:38:41 +08:00
sw 5f1b4b1b24 导入作业后编辑按钮、弹出框确定按钮不可用 2015-09-25 14:16:12 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00
lizanle 9184dddb5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:50:05 +08:00
lizanle 3fe5adcaf8 统一修改tag 会 和边框有边距 2015-09-25 11:49:57 +08:00
huang 8886bda790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:46:15 +08:00
huang 44c097dbaf 1、issue回复添加新的编辑器 
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
 2015-09-25 11:45:57 +08:00
ouyangxuhua 4d1bc90161 匿名用户重新评阅作品，在消息显示中，需要正常显示 2015-09-25 11:40:57 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
Tim e8a7448a7c 资源库用户资源图标位置调整 2015-09-25 10:43:19 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
lizanle 924183b1cc js合并错误 2015-09-25 10:04:56 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
cxt 15b45e6706 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/header.css
	public/stylesheets/new_user.css
	public/stylesheets/public_new.css
 2015-09-24 16:46:08 +08:00
cxt bb0db1e21d 课程动态页面 2015-09-24 16:30:14 +08:00
guange a42152553b 添加语言提示 2015-09-24 15:26:54 +08:00
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
lizanle 38a24e8fe4 论坛消息回复改版 2015-09-24 12:17:14 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
sw f9f51557dd 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
huang 6449b2563b 1、去掉项目隐藏代码库的功能 
2、同步圈子的描述
3、圈子JS实现
 2015-09-24 11:19:07 +08:00
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle 
Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css
 2015-09-24 10:15:23 +08:00
lizanle b9ff46f8d0 帖子的编辑与删除 2015-09-24 09:40:53 +08:00
sw ad6fbf6c9b 点击作品名称、姓名、学号、时间列都可以展开作品 2015-09-24 09:25:56 +08:00
huang 54065e49a7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-23 17:37:31 +08:00
huang b94c57691a 项目新建重构 
项目先建添加项目类型
 2015-09-23 17:36:36 +08:00
lizanle c8d07dedf6 帖子添加编辑 删除 链接 2015-09-23 17:09:21 +08:00
lizanle 6ac5b738e3 论坛编辑功能 2015-09-23 16:27:13 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
lizanle eed530db2b 添加 上传附件的 文字 2015-09-23 15:14:37 +08:00
ouyangxuhua 1fe8c60a32 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-23 14:55:13 +08:00
ouyangxuhua 841c680bb1 1.作业消息增加显示老师、课程、课程季度等信息 
2.作业内容为空时，tips中不显示内容
 2015-09-23 14:53:50 +08:00
huang 5b671c5109 issue 引用模式修改 
issue相关代码优化
 2015-09-23 14:27:47 +08:00
sw 9d474d6528 设置匿评属性静态页面 2015-09-23 13:54:36 +08:00
sw 193eb0cb6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-23 10:03:45 +08:00
cxt afb1a8f53f 回复框发送按钮的样式调整 2015-09-23 09:59:23 +08:00
sw b5af66ffc2 取消匿评时间的js判断 2015-09-23 09:58:31 +08:00
cxt 76afbdec3f 隐藏kindeditor的“插入代码”，调整项目编号/符号的样式 2015-09-23 09:23:31 +08:00
cxt 576adfac34 回复框中出现html代码的修复 2015-09-23 08:56:48 +08:00
lizanle 361b391d3c 修改分页的样式 2015-09-22 17:18:10 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
lizanle b4561fa68d 资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名 2015-09-22 16:19:39 +08:00
sw 9d2b58738e 分班过滤功能 2015-09-22 16:16:55 +08:00
Tim 93804bcfa6 关于我们图片对齐 2015-09-22 16:11:22 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
cxt 660e604045 kindeditor编辑框的列表符号样式修改 2015-09-22 15:54:19 +08:00
sw 90536efa1e 课程内姓名学号邮箱过滤，各种排序 改为js刷新页面 2015-09-22 15:52:08 +08:00
sw 2d48161928 新版作品列表界面 2015-09-22 15:03:03 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
cxt 8883093b96 "关于我们"的图片居中 2015-09-21 17:05:51 +08:00
cxt facd12640a 个人动态的回复为0时不显示“回复(0)” 2015-09-21 16:54:23 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
guange 8ab08ea30f Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-19 18:18:02 +08:00
guange b6240127a9 对编程框进行代码着色 2015-09-19 18:17:12 +08:00
sw 2a8cf2885a 布置作业时选择语言显示不正确 2015-09-19 16:23:47 +08:00
sw ccd19021ae 课程动态回复之后，编辑器变宽 2015-09-19 13:45:32 +08:00
sw a54a51c984 Merge branch 'guange_homework' into szzh 
Conflicts:
	app/models/homework_detail_programing.rb
	db/schema.rb
 2015-09-19 11:21:45 +08:00
cxt b9bac42c1a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:18:55 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
guange bebc602efc merge 2015-09-18 17:51:51 +08:00
sw 715dc28187 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 17:51:11 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44:16 +08:00
huang 850a7c937f Merge branch 'szzh' into dev_hjq 2015-09-18 17:39:37 +08:00
huang c8f7655d1e 系统消息样式 2015-09-18 17:01:30 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
sw 607c31c8c5 编辑图片按钮图片不正确 2015-09-18 16:08:59 +08:00
ouyangxuhua 2db6b8311d 1.修改tips宽度； 
2.修改图片的max-width
 2015-09-18 15:56:26 +08:00
sw cf2a00d7a8 作业列表增加：编程语言提示，匿评阶段提示 2015-09-18 14:25:04 +08:00
ouyangxuhua d807180bf2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-18 13:52:36 +08:00
ouyangxuhua c024bb5e58 1.修改系统消息样式，放在application.css中； 
2.修改消息提示样式
 2015-09-18 13:52:16 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
sw 281e97e468 课程内老师可以对作业进行编辑、删除、开启匿评 2015-09-18 12:00:04 +08:00
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 11:34:29 +08:00
cxt ad610cb0b2 测试集输入输出框的自适应高度 2015-09-18 11:29:38 +08:00
ouyangxuhua 989d74bf70 修改消息tips样式 2015-09-18 11:25:23 +08:00
sw 859fe01c52 1、编程作业无法导出缺评、匿评列表 
2、编程作业评分设置初始值
 2015-09-18 11:14:59 +08:00
sw 4b83265508 1、编程作业可以修改、删除 
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
 2015-09-18 11:05:21 +08:00
ouyangxuhua 7694a8fd2c 所有消息里的系统消息样式 2015-09-18 09:35:26 +08:00
sw 7cc5ce92c6 完成评分比例设置功能 2015-09-17 20:20:20 +08:00
sw cc7a752623 到处附件、缺评、匿评、成绩列表 2015-09-17 17:20:29 +08:00