 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 |
 lizanle
|
5002daad52
|
帖子内容显示不对
|
2015-09-29 10:34:05 +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 |
|
ouyangxuhua
|
2557e9063d
|
修改开启匿评中的send_message_anonymous_comment方法成对应代码
|
2015-09-29 10:25:37 +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
|
f4e2f6c4ff
|
作业截止日期消息时间调整，代码优化
|
2015-09-29 10:03:11 +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
|
0336cc2cf6
|
issue截止时间消息提醒
|
2015-09-29 09:22:57 +08:00 |
whimlex
|
0f52c24cd5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 09:08:06 +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 |
|
cxt
|
12c394c36e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 16:11:18 +08:00 |
|
cxt
|
955d87a98c
|
新增测试集的编辑框自适应高度
|
2015-09-28 16:09:59 +08:00 |
|
ouyangxuhua
|
80fabf0681
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 16:09:55 +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 |
|
cxt
|
e1348a4845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 15:24:27 +08:00 |
|
cxt
|
038bcdb80e
|
课程动态的作业编辑菜单样式调整
|
2015-09-28 15:24:03 +08:00 |
|
ouyangxuhua
|
eac31cda7f
|
修改个人主页最新动态图片显示超出边界问题
|
2015-09-28 15:13:42 +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 |
|
sw
|
821290da31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 14:20:10 +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
|
e298f738ed
|
调整课程动态的过滤列表样式
|
2015-09-28 14:10:04 +08:00 |
|
cxt
|
f5a6d5d349
|
首页的作业动态添加编辑菜单
|
2015-09-28 14:09:27 +08:00 |
|
huang
|
c0d95bf872
|
Merge branch 'develop' into dev_hjq
|
2015-09-28 13:37:29 +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 |