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

8166 Commits

Author SHA1 Message Date
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
sw 33924680b2 修改开启匿评提示 2015-09-25 15:02:56 +08:00
sw 4a838611fd 新建作业选择课程下拉框按时间倒排 2015-09-25 15:01:24 +08:00
sw 29fd5b41e2 调整用户搜索界面样式 2015-09-25 14:55:58 +08:00
sw 709e099770 增加部分作业关联表的判断 2015-09-25 14:33:33 +08:00
lizanle 35dd56d51c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 12:32:03 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00
ouyangxuhua b265b20753 1.消息中，回复了项目帖子，显示主题； 
2.回复了消息帖子的tips中，“内容”改为“回复内容”，并调整样式
 2015-09-25 12:01:21 +08:00
huang fa88e50bcd Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-25 11:47:13 +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 c466ac876e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:22:50 +08:00
ouyangxuhua 123a6c862d 匿名用户评阅，修改样式 2015-09-25 11:22:35 +08:00
lizanle a763fc4860 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:17:38 +08:00
lizanle e4e1a0818e 论坛样式问题 2015-09-25 11:17:31 +08:00
ouyangxuhua 3e857ba48f 作业消息：截止日期快到时，给出消息提醒。修改提醒内容及样式 2015-09-25 11:04:46 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
lizanle 80bf8d83f3 项目资源和课程资源 js需要分开 2015-09-25 10:38:26 +08:00
lizanle 061d41e50a 课程资源 和 项目资源 页面通用，需要对js进行判断 2015-09-25 10:35:43 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
ouyangxuhua c445e933bf 修改作业消息颜色 2015-09-25 10:18:43 +08:00
ouyangxuhua 892aa166ee 增加作业消息的截止日期为24点 2015-09-25 10:16:27 +08:00
ouyangxuhua 9d25f58ee4 调整提交作业消息tips的颜色及标题字体 2015-09-25 10:13:34 +08:00
lizanle 924183b1cc js合并错误 2015-09-25 10:04:56 +08:00
lizanle f99ccf724c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 09:44:29 +08:00
lizanle c1bd17b07e 项目论坛发帖排序比较乱。 去掉置顶功能（发帖的功能里原来有置顶按钮。现在没有了。所以排序也要取消） 2015-09-25 09:44:15 +08:00
ouyangxuhua 72d1d12cef 修改发布作业的tips的内容及样式 2015-09-25 09:40:30 +08:00
ouyangxuhua 6e9d276d87 作业消息，老师对应的课程改成课程名称 2015-09-25 09:30:48 +08:00
sw d564f1ea2e Merge branch 'guange_homework' into szzh 2015-09-25 09:30:13 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
ouyangxuhua 6433d223c6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-25 09:27:22 +08:00
ouyangxuhua 8935d12602 修改作业消息显示内容 2015-09-25 09:27:03 +08:00
huang e60119d6d3 解决匿名用户消息中实名评价的bug 2015-09-25 08:59:34 +08:00
sw 040f5ff645 Merge branch 'develop' into szzh 2015-09-24 17:21:53 +08:00
huang 20465764a7 Merge branch 'szzh' into dev_hjq 2015-09-24 17:20:36 +08:00
huang 25309df83f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 17:19:27 +08:00
huang 1e8cb91ab4 boards 2015-09-24 17:18:58 +08:00
ouyangxuhua bc9a332be3 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 17:11:55 +08:00
ouyangxuhua a3840ebad9 作业匿评开启失败对应页面显示 2015-09-24 17:11:39 +08:00
huang b66de0ee9f issue相关问题 2015-09-24 17:03:43 +08:00
huang 25a604d7b8 issue解决冲突 2015-09-24 16:59:19 +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
huang fcf34b5918 修复项目配置中“私有” “公开”问题 2015-09-24 16:38:36 +08:00
cxt bb0db1e21d 课程动态页面 2015-09-24 16:30:14 +08:00
lizanle 6b98b2a273 暂时不可点击的链接 不用手型光标 2015-09-24 16:17:50 +08:00
sw 6807f649bf 1、作品列表头像显示全部一样 
2、匿评作业开启匿评之后学生可以在作业列表修改作业
 2015-09-24 16:17:50 +08:00
huang 38ba47f8c8 讨论区结构修改 
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
 2015-09-24 16:16:37 +08:00
lizanle 8f29970af5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-24 16:02:22 +08:00
lizanle 2aa52bfc59 论坛翻页 每页都要加链接 2015-09-24 16:02:15 +08:00
ouyangxuhua c17a1555bf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 15:09:27 +08:00
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
ouyangxuhua f4cad2897a 1.修改老师关闭作品评阅和开启作品评阅内容和样式 
2.修改老师关闭作品评阅和开启作品评阅的tips内容
 2015-09-24 14:48:48 +08:00
huang 032ccdb2b8 先建项目 --项目类型默认提示 2015-09-24 14:01:29 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
lizanle 9f22eed093 帖子的名称也要修改 2015-09-24 13:38:40 +08:00