 huang
|
425e679f27
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 11:00:31 +08:00 |
|
huang
|
db1dfa34ac
|
恢复邮件配置文件
|
2015-09-19 11:00:00 +08:00 |
 ouyangxuhua
|
0fcbbebd36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 10:58:00 +08:00 |
|
ouyangxuhua
|
e033a03c7a
|
tips
|
2015-09-19 10:57:42 +08:00 |
|
huang
|
70f53a8376
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 10:55:36 +08:00 |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
2015-09-19 10:54:50 +08:00 |
|
ouyangxuhua
|
71794ccffc
|
tips显示主题和内容
|
2015-09-19 10:25:58 +08:00 |
|
ouyangxuhua
|
1e97f9224f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 09:22:51 +08:00 |
|
ouyangxuhua
|
400f394d05
|
tips标题
|
2015-09-19 09:22:36 +08:00 |
|
huang
|
32f90ea591
|
"同意加入"只有自己才能看到
|
2015-09-19 09:19:35 +08:00 |
|
huang
|
3728fe9626
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-19 09:12:08 +08:00 |
|
huang
|
16084a8d08
|
Merge branch 'szzh' into dev_hjq
|
2015-09-19 09:11:39 +08:00 |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
2015-09-19 00:03:45 +08:00 |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
2015-09-18 23:18:15 +08:00 |
|
huang
|
cc5052a0d4
|
Merge branch 'szzh' into dev_hjq
|
2015-09-18 18:52:22 +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 |
|
huang
|
7045b8db2e
|
Merge branch 'dev_hjq' into szzh
|
2015-09-18 17:51:59 +08:00 |
|
huang
|
79881f3dca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 17:49:54 +08:00 |
|
ouyangxuhua
|
3a4400cfee
|
tips样式
|
2015-09-18 17:49:43 +08:00 |
|
huang
|
ff2e3e168d
|
开启/关闭匿评消息通知
|
2015-09-18 17:49:19 +08:00 |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-18 17:39:37 +08:00 |
|
huang
|
ba2474e480
|
关闭匿评消息
|
2015-09-18 17:38:19 +08:00 |
|
sw
|
4061aa8a14
|
提交作品关联项目提示信息
|
2015-09-18 17:34:44 +08:00 |
|
sw
|
bb197897b7
|
作品列表enter键搜索，以及提示信息修改
|
2015-09-18 17:27:10 +08:00 |
|
sw
|
ec4c7f531d
|
匿评作业成绩计算错误
|
2015-09-18 17:16:31 +08:00 |
|
huang
|
c8f7655d1e
|
系统消息样式
|
2015-09-18 17:01:30 +08:00 |
 cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
2015-09-18 16:34:37 +08:00 |
|
sw
|
20b4c056a8
|
历史数据：普通作业改为匿评作业
|
2015-09-18 16:19:30 +08:00 |
|
sw
|
1d39df5469
|
C改为大写、编程属性设置的修改
|
2015-09-18 16:15:05 +08:00 |
|
ouyangxuhua
|
70e8db0ba9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 16:10:10 +08:00 |
|
ouyangxuhua
|
e8d6fe1e4b
|
显示系统消息标题
|
2015-09-18 16:09:55 +08:00 |
|
sw
|
607c31c8c5
|
编辑图片按钮图片不正确
|
2015-09-18 16:08:59 +08:00 |
|
huang
|
4daaf76458
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 15:57:52 +08:00 |
|
huang
|
434e223c86
|
修改标题
|
2015-09-18 15:57:29 +08:00 |
|
ouyangxuhua
|
8de41cdd24
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 15:57:24 +08:00 |
|
ouyangxuhua
|
2db6b8311d
|
1.修改tips宽度；
2.修改图片的max-width
|
2015-09-18 15:56:26 +08:00 |
|
huang
|
17bf74bdfd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 15:26:34 +08:00 |
|
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
2015-09-18 15:25:45 +08:00 |
|
ouyangxuhua
|
9c74ff0b34
|
1.系统消息显示主题；
2.系统消息中冒号修改为中文形式
|
2015-09-18 14:36:47 +08:00 |
|
cxt
|
20ea692260
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-18 14:31:33 +08:00 |
|
cxt
|
154cd7de6f
|
子域名的更改
|
2015-09-18 14:31:19 +08:00 |
|
sw
|
cf2a00d7a8
|
作业列表增加：编程语言提示，匿评阶段提示
|
2015-09-18 14:25:04 +08:00 |
|
huang
|
c3223982cd
|
修改系统消息链接跳转
|
2015-09-18 14:08:09 +08:00 |
|
huang
|
5d14ff10cb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 14:04:41 +08:00 |
|
huang
|
81743143c2
|
优化用户留言页面
|
2015-09-18 14:04:02 +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 |
|
sw
|
9d9ed24d1b
|
111
|
2015-09-18 13:51:37 +08:00 |
|
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
2015-09-18 13:30:25 +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 |