 huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
2015-09-17 15:24:12 +08:00 |
|
huang
|
b943a1de63
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:41:56 +08:00 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
 ouyangxuhua
|
d4e1c62989
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:38:17 +08:00 |
|
ouyangxuhua
|
99d6012718
|
项目邀请
|
2015-09-17 14:37:45 +08:00 |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
2015-09-17 13:58:55 +08:00 |
|
huang
|
e7fc0ca6d3
|
休整消息样式
|
2015-09-17 13:44:52 +08:00 |
|
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 13:00:30 +08:00 |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
2015-09-17 12:59:52 +08:00 |
|
ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
2015-09-17 11:42:18 +08:00 |
|
ouyangxuhua
|
d5432a8464
|
修改发送项目请求列表样式
|
2015-09-17 10:22:33 +08:00 |
|
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:36:10 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
2015-09-16 17:35:08 +08:00 |
|
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:25:43 +08:00 |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
|
ouyangxuhua
|
e2024716e9
|
显示问题差别的html样式
|
2015-09-16 15:15:12 +08:00 |
|
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 |