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

8220 Commits

Author SHA1 Message Date
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
cxt 7057247700 首页项目动态讨论区回复无法刷新 2015-09-29 11:54:43 +08:00
cxt e0b8b7195f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 11:05:46 +08:00
cxt 7f8acf55b8 个人首页作业列表配置菜单的隐藏 2015-09-29 11:05:31 +08:00
huang f9b3f2a1c3 删除版本库部分报错代码 2015-09-29 11:02:54 +08:00
ouyangxuhua a4953c3a5a 修改开启匿评失败发送邮件的方法错误 2015-09-29 11:02:46 +08:00
huang 18d028bb7e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:52:39 +08:00
ouyangxuhua be4b5d94b0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:50:39 +08:00
ouyangxuhua 4624e26999 启动作业匿评失败的信息提醒，判断是本人还是其他人 2015-09-29 10:50:16 +08:00
sw 3c0a497d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:04 +08:00
cxt 0ecfb7b935 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:18 +08:00
cxt 3d9dcfe250 作业的最后更新时间为作品的最新提交时间 2015-09-29 10:49:08 +08:00
sw f2d3ec980a 点击发布作业，作业列表标题栏自动获得焦点 2015-09-29 10:48:50 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang d75155e04a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:43:06 +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
sw 8585748a92 课程内作业列表界面样式调整 2015-09-29 10:38:14 +08:00
ouyangxuhua 073761781d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:28:37 +08:00
cxt 4f20bb2969 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:26:41 +08:00
cxt dea03a4d9f 首页动态描述和回复的图片大小的调整和可点击 2015-09-29 10:26:22 +08:00
sw ad4fc50fbb 1、引入资源到作业移除部分css 
2、课程内点击作业列表加载更多
 2015-09-29 10:20:13 +08:00
ouyangxuhua 769a4a1bcf 1.增加issue截止日期提醒消息； 
2.修改相应rake代码
 2015-09-29 10:15:35 +08:00
lizanle b4cf2f87af Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 10:13:37 +08:00
lizanle eacd37d986 帖子的创建和编辑用编辑器 2015-09-29 10:13:25 +08:00
huang 5b0738a4cb 匿评启动失败邮件通知:实现程序及界面 2015-09-29 09:45:41 +08:00
ouyangxuhua da5e137795 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 09:28:22 +08:00
huang 5f26e331c6 缺陷截止时间到了消息通知 2015-09-28 17:31:55 +08:00
sw 9a5dba7773 课程内发布、修改、删除作业后跳转仍在课程内的作业列表 2015-09-28 17:27:01 +08:00
sw 6194be8933 界面样式调整。js修改 
在课程内发布作业时无课程id
 2015-09-28 17:09:07 +08:00
ouyangxuhua b19007f56a 修改判断用户是老师的方法 2015-09-28 16:42:20 +08:00
huang 030f9e945e 优化消息整个界面代码 2015-09-28 16:14:53 +08:00
ouyangxuhua e9d61a928a 修复项目issue中，图片显示超出边界的问题 2015-09-28 16:08:47 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
huang 0a1798eb0b Merge branch 'szzh' into dev_hjq 2015-09-28 15:44:32 +08:00
huang c3422460ce 匿评失败邮件发送框架 2015-09-28 15:38:19 +08:00
huang ba569403c3 1、匿评关闭/开启发送对象为所有成员 
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
 2015-09-28 15:35:08 +08:00
huang 2873412d1a 修改邮件--每天发送-》内容为空的问题 2015-09-28 15:06:23 +08:00
ouyangxuhua afbfc9f8b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:46:23 +08:00
ouyangxuhua b58fcb58de 作业消息的内容更新； 
更改样式
 2015-09-28 14:45:59 +08:00
lizanle 41a6b8ab06 文件名称尽可能的显示完全 2015-09-28 14:35:55 +08:00
lizanle 08c2b9395e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 14:20:33 +08:00
lizanle 4e7b0c5bdf 文件名称尽可能的显示完全 2015-09-28 14:20:23 +08:00
cxt ea18098a9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:15:35 +08:00
cxt 5909df1f69 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:11:56 +08:00
lizanle 5e0ae3a6bb 编辑贴吧描述匡样式修改 2015-09-28 14:11:46 +08:00
cxt f5a6d5d349 首页的作业动态添加编辑菜单 2015-09-28 14:09:27 +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 5174e6eeb8 添加删除确认 2015-09-28 12:02:38 +08:00
lizanle 0b5b643a8e 附件与内容距离太大 2015-09-28 11:48:57 +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
ouyangxuhua f5de071191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 11:22:18 +08:00
ouyangxuhua f8d7c61065 修改作业消息显示内容及样式 2015-09-28 11:22:00 +08:00
cxt 3254abf67f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:51:58 +08:00
cxt 6a3089bb9b 动态的回复图片超出边框 2015-09-28 10:51:24 +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
huang c250945422 修改消息500问题 2015-09-25 18:19:23 +08:00
huang 4a5dfe1109 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 17:52:50 +08:00
huang 8c84179650 修改issue更新消息重复提示的问题 2015-09-25 17:52:34 +08:00
lizanle e092b6c36e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 17:38:25 +08:00
lizanle 4845435aa3 帖子的编辑长度限制 2015-09-25 17:38:19 +08:00
sw aa07c3408f 项目资源增加TAG后点击报错 2015-09-25 17:18:01 +08:00
sw b84ec1360a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:58:57 +08:00
lizanle 745a32b684 资源库tag修改问题 2015-09-25 16:58:36 +08:00
sw 9b5a362e24 查看附件样式不正确 2015-09-25 16:57:36 +08:00
lizanle f54149a5b7 发送动态 消息会重复 2015-09-25 16:53:23 +08:00
lizanle 9a5b83c898 如果没有大于两条回复。那么展开回复就要隐藏 2015-09-25 16:34:01 +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 39c5571d73 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:32:07 +08:00
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
ouyangxuhua 6857b62f00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:30:22 +08:00
ouyangxuhua 31c5cf2163 1.将作品评论、回复作品评论等加入至作业消息列表 2015-09-25 16:30:00 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
sw fd4a2b19c8 课程界面老师数量 2015-09-25 16:11:59 +08:00
lizanle a8812dd48e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:11:20 +08:00
lizanle 959d3f1a93 万一长度过大，阻止提交 2015-09-25 16:11:12 +08:00
ouyangxuhua c906c7ee1d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:05:36 +08:00
ouyangxuhua 272bd2730a 消息中，更新了问题为留言时，去掉“留言内容”几个字； 
内容显示主题
 2015-09-25 16:05:19 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
lizanle 926bdd81e8 论坛名换行问题 2015-09-25 15:52:28 +08:00
lizanle a61e60d1b9 帖子内容会超出边框 2015-09-25 15:46:40 +08:00
lizanle 93542448e2 如果字符够了删除键 不能被屏蔽 2015-09-25 15:26:48 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle 1ee00fcae4 论坛描述自动换行 2015-09-25 15:17:14 +08:00
lizanle fc1ec7135d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:12:08 +08:00
lizanle b525f12a32 文件上传问题 2015-09-25 15:12:01 +08:00
sw 241da3a37b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:38 +08:00
huang 44a1518ddd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:08:44 +08:00
huang e15ea06e2a 修改邮件标题 2015-09-25 15:08:31 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
lizanle befd8d66f6 编辑名称检查 2015-09-25 15:05:32 +08:00