Commit Graph

9200 Commits

Author SHA1 Message Date
ouyangxuhua 30e703b9bf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-16 12:40:12 +08:00
ouyangxuhua 99b300b225 问题对比显示 2015-09-16 12:38:50 +08:00
ouyangxuhua e463be04c3 课程留言更新 2015-09-16 12:38:01 +08:00
ouyangxuhua 5155e8794f 将课程留言加入消息队列 2015-09-16 11:28:35 +08:00
huang b43acd3a46 邀请用户加入项目:
特殊情况:用户登录名=邮箱名,用户修改邮箱,此时将用户作为条件邀请
2015-09-16 11:09:10 +08:00
huang 78ca55f121 优化邮件邀请策略 2015-09-16 10:49:34 +08:00
ouyangxuhua 3edeb81ba5 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-16 09:50:06 +08:00
huang b0ccf9037a 邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
2015-09-15 17:39:57 +08:00
ouyangxuhua 3bd62310ad 增加word-wrap及word-break 2015-09-15 16:45:11 +08:00
huang 9189ddd63b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-15 10:51:40 +08:00
huang 295921c89d 邮件:邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题 2015-09-15 10:50:58 +08:00
ouyangxuhua 9ba89b3fe7 系统消息样式 2015-09-14 16:48:39 +08:00
ouyangxuhua 9ba0d3293e 修改系统消息提示样式 2015-09-14 16:05:29 +08:00
huang 4a7d3c9072 系统消息增加长度 2015-09-14 15:33:11 +08:00
huang afda693e71 Merge branch 'szzh' into dev_hjq 2015-09-11 16:56:09 +08:00
huang b75247177c Merge branch 'dev_hjq' into szzh 2015-09-11 16:38:32 +08:00
huang 27fde3f642 Merge branch 'szzh' into dev_hjq 2015-09-11 16:37:50 +08:00
huang dc564c37f1 修改系统消息参数
输入内容JS控制
2015-09-11 16:36:10 +08:00
sw a3d628dc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:29:55 +08:00
sw 760b70971a 取消导入编程作业时对homework_type的赋值 2015-09-11 16:27:34 +08:00
sw 90a52aa01b 导入编程作业后、测试集数量不显示的问题 2015-09-11 16:26:35 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
ouyangxuhua b053a1e43c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
	app/models/system_message.rb
	app/views/admin/messages.html.erb

处理冲突、发布系统消息JS提醒!
2015-09-11 16:11:34 +08:00
ouyangxuhua 67dcb025aa 系统消息-修改 2015-09-11 16:05:02 +08:00
huang 3da6593720 查看别人的页面时不显示“全部设为已读” 2015-09-11 15:55:51 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq
Conflicts:
	db/schema.rb
2015-09-11 15:50:10 +08:00
huang 6209250e6d 内容长度提醒 2015-09-11 15:45:25 +08:00
huang 8c0f9d24f8 系统消息没保存成功添加验证
系统消息样式修改
2015-09-11 15:39:46 +08:00
sw 96405d7c0c 取消之后编程按钮无效 2015-09-11 15:38:58 +08:00
sw 4405a31c9c Merge branch 'guange_homework' into szzh 2015-09-11 15:07:59 +08:00
guange e9f9dd44b9 编程作业的修改功能搞定 2015-09-11 14:59:30 +08:00
huang 64bce0261d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 14:54:18 +08:00
huang 3bfdff81ba 去掉项目组织 2015-09-11 14:53:42 +08:00
lizanle dc32bba5fd Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 14:44:59 +08:00
lizanle 17b4b31449 隐藏个人中心的回复 textarea编辑框 2015-09-11 14:44:50 +08:00
ouyangxuhua 22e2510482 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 14:43:14 +08:00
ouyangxuhua 3044b07df7 系统消息颜色 2015-09-11 14:43:04 +08:00
huang c0437ae992 作业截止时间提醒界面! 2015-09-11 14:41:23 +08:00
sw 487f46bb32 上传图片后大小问题 2015-09-11 11:46:12 +08:00
guange 37e1b6d2a1 Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-11 11:43:29 +08:00
sw 6004fe1b4d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 11:36:59 +08:00
sw cd36965cd1 历史编程作业数据补齐 2015-09-11 11:31:59 +08:00
huang f1e0eed5a8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 11:03:14 +08:00
huang bb3fc97528 作业截止时间消息通知:
1、时间区段设置为24小时
2、只进行一次消息提醒
2015-09-11 11:02:40 +08:00
lizanle 8848b3975e 防止生成的kindeditor太高 2015-09-11 10:52:13 +08:00
sw f4c19c0fb0 1、homework.js on改为live
2、导入作业之后,编程功能按钮消失
2015-09-11 10:50:16 +08:00
sw 527ff41d43 1、编程作业开启匿评之后提交作品的提示
2、匿评弹框不可关闭
2015-09-11 10:44:10 +08:00
sw dfed4885de 新建作业,取消之后编程设置按钮消失 2015-09-11 10:36:16 +08:00
ouyangxuhua 36e9c20e59 系统消息 2015-09-11 10:30:01 +08:00
sw 7db774eedb 新建作业时,匿评相关属性为作业必须属性 2015-09-11 10:19:45 +08:00