 huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
2015-10-08 16:10:33 +08:00 |
 lizanle
|
4a1df8c15a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-08 14:34:11 +08:00 |
|
lizanle
|
418e7e379d
|
编辑室不能移动光标
|
2015-10-08 14:33:58 +08:00 |
|
lizanle
|
9291758ef4
|
鼠标移到tag上变手型
|
2015-10-08 14:24:51 +08:00 |
|
huang
|
6179e455d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-08 14:23:49 +08:00 |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
2015-10-08 14:23:32 +08:00 |
|
lizanle
|
e76f9a169e
|
注释
|
2015-10-08 14:14:28 +08:00 |
|
lizanle
|
7cbee4cd53
|
编辑tag有时候不能用
|
2015-10-08 14:11:54 +08:00 |
|
lizanle
|
c8357a6364
|
批量修改tag
|
2015-10-08 13:51:55 +08:00 |
|
lizanle
|
912fdf480a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-08 11:34:20 +08:00 |
|
lizanle
|
0cd96f579e
|
批量修改tag
|
2015-10-08 11:34:12 +08:00 |
|
huang
|
d22234dfe4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-08 11:13:52 +08:00 |
|
huang
|
e563354c85
|
项目删除
|
2015-10-08 11:13:17 +08:00 |
|
lizanle
|
56db8b4232
|
批量修改tag的bug
|
2015-10-08 11:08:26 +08:00 |
|
huang
|
88b8854ed7
|
修改吧主和发帖人消息重复的问题
|
2015-09-30 11:31:29 +08:00 |
 sw
|
fed1a99bec
|
课程动态报500
|
2015-09-30 10:49:04 +08:00 |
|
sw
|
af892fa7ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:44:00 +08:00 |
|
sw
|
11314a5366
|
第二个人打分之后，评分结果的样式
|
2015-09-30 10:43:40 +08:00 |
|
huang
|
548a18d1fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:32:16 +08:00 |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
2015-09-30 10:31:47 +08:00 |
|
sw
|
1acadd1edf
|
1、测试时间显示不正确
2、作品列表时间增加判断
|
2015-09-30 09:50:14 +08:00 |
|
sw
|
52eabd5c0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 18:03:00 +08:00 |
|
sw
|
87e4bfdd3f
|
课程内导入作业却将作业发布到被导入的课程
|
2015-09-29 18:02:11 +08:00 |
|
lizanle
|
ecbf1ca692
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 17:54:47 +08:00 |
|
lizanle
|
4f8e9ea2cd
|
编辑按钮被注释了
|
2015-09-29 17:54:33 +08:00 |
|
sw
|
f2b8e01aee
|
Merge branch 'develop' into szzh
|
2015-09-29 17:33:57 +08:00 |
 Tim
|
b6a8a69be8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:30:02 +08:00 |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
2015-09-29 17:28:45 +08:00 |
|
lizanle
|
9f9b68ef2a
|
帮助中心报500的问题
|
2015-09-29 17:16:53 +08:00 |
|
sw
|
9569bda67c
|
上传图片功能不可 用
|
2015-09-29 16:51:22 +08:00 |
|
lizanle
|
b798c6747b
|
删除贴吧 函数名重复了
|
2015-09-29 16:40:55 +08:00 |
|
huang
|
cfdaf1f1b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 16:21:53 +08:00 |
|
huang
|
1eac300fb7
|
去掉打印结果
|
2015-09-29 16:21:36 +08:00 |
|
sw
|
2e9d6d396f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 16:17:03 +08:00 |
|
lizanle
|
9d122886a9
|
删除帖子会删除贴吧
|
2015-09-29 16:10:43 +08:00 |
|
sw
|
a3ce43c3d5
|
去掉与我相关
|
2015-09-29 16:01:23 +08:00 |
|
Tim
|
74dc276383
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 16:01:18 +08:00 |
|
Tim
|
f2b2062b9c
|
贴吧点赞位置再调整
|
2015-09-29 16:01:01 +08:00 |
|
huang
|
39800b2aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 16:00:10 +08:00 |
|
huang
|
3f6d64877a
|
1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
|
2015-09-29 15:59:48 +08:00 |
 ouyangxuhua
|
17cfa10dca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:46:04 +08:00 |
|
ouyangxuhua
|
b29546cd13
|
评论了项目新闻消息，其内容应该为新闻题目，而非评论内容。
|
2015-09-29 15:45:52 +08:00 |
|
Tim
|
852435d708
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:44:23 +08:00 |
|
Tim
|
1613f41e77
|
点赞判断
|
2015-09-29 15:44:04 +08:00 |
 cxt
|
fe339e6a8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:38:06 +08:00 |
|
cxt
|
03436bca2a
|
贴吧的用户链接可点击
|
2015-09-29 15:37:52 +08:00 |
|
Tim
|
0fdf10649c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:25:01 +08:00 |
|
Tim
|
a0f4cabcf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:24:30 +08:00 |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
2015-09-29 15:24:15 +08:00 |
|
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:21:11 +08:00 |
|
sw
|
16333d69f7
|
文件列表
|
2015-09-29 15:20:33 +08:00 |
|
ouyangxuhua
|
9f5c3ec05c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:15:20 +08:00 |
|
ouyangxuhua
|
ab82fff1a0
|
课程消息中，修改“评论了通知”的内容和tips
|
2015-09-29 15:15:00 +08:00 |
|
lizanle
|
9e4896fc7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 15:13:14 +08:00 |
|
lizanle
|
138b24b34c
|
oschina模式的代码插入
|
2015-09-29 15:13:05 +08:00 |
|
cxt
|
ce5579c14d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:02:57 +08:00 |
|
cxt
|
e2a5819d74
|
课程动态首页的图片可点击
|
2015-09-29 15:02:36 +08:00 |
|
sw
|
b22669e36f
|
课程上传图片按钮
|
2015-09-29 14:50:29 +08:00 |
|
Tim
|
21408f3843
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 14:35:02 +08:00 |
|
Tim
|
cc99120f25
|
贴吧样式更改
|
2015-09-29 14:34:39 +08:00 |
|
lizanle
|
c75487fcf5
|
防止论坛名字太长
|
2015-09-29 14:27:53 +08:00 |
|
ouyangxuhua
|
d9c6d9239c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 14:16:50 +08:00 |
|
ouyangxuhua
|
1f77b05879
|
如果是自己发布的作业消息，提示语改为“您”,而非某某老师
|
2015-09-29 14:16:27 +08:00 |
|
lizanle
|
6d74867150
|
清除浮动
|
2015-09-29 13:58:39 +08:00 |
|
lizanle
|
de62798d4d
|
点赞按钮位置调整
|
2015-09-29 13:54:54 +08:00 |
|
lizanle
|
ea3900b50a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 12:05:40 +08:00 |
|
lizanle
|
a8bb7ca2bc
|
导航
|
2015-09-29 12:05:30 +08:00 |
|
cxt
|
7057247700
|
首页项目动态讨论区回复无法刷新
|
2015-09-29 11:54:43 +08:00 |
|
cxt
|
e0b8b7195f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 11:05:46 +08:00 |
|
cxt
|
7f8acf55b8
|
个人首页作业列表配置菜单的隐藏
|
2015-09-29 11:05:31 +08:00 |
|
huang
|
f9b3f2a1c3
|
删除版本库部分报错代码
|
2015-09-29 11:02:54 +08:00 |
|
ouyangxuhua
|
a4953c3a5a
|
修改开启匿评失败发送邮件的方法错误
|
2015-09-29 11:02:46 +08:00 |
|
huang
|
18d028bb7e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 10:52:39 +08:00 |
|
ouyangxuhua
|
be4b5d94b0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-29 10:50:39 +08:00 |
|
ouyangxuhua
|
4624e26999
|
启动作业匿评失败的信息提醒，判断是本人还是其他人
|
2015-09-29 10:50:16 +08:00 |
|
sw
|
3c0a497d4e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 10:49:04 +08:00 |
|
cxt
|
0ecfb7b935
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 10:49:18 +08:00 |
|
cxt
|
3d9dcfe250
|
作业的最后更新时间为作品的最新提交时间
|
2015-09-29 10:49:08 +08:00 |
|
sw
|
f2d3ec980a
|
点击发布作业，作业列表标题栏自动获得焦点
|
2015-09-29 10:48:50 +08:00 |
|
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
2015-09-29 10:46:19 +08:00 |
|
huang
|
d75155e04a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-29 10:43:06 +08:00 |
|
huang
|
61061573a7
|
去掉版本库git操作指南
|
2015-09-29 10:42:17 +08:00 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
ouyangxuhua
|
e9d61a928a
|
修复项目issue中，图片显示超出边界的问题
|
2015-09-28 16:08:47 +08:00 |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
2015-09-28 15:52:30 +08:00 |