 sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
 yutao
|
8e3bc28fa2
|
个人主页
|
2015-07-16 13:43:01 +08:00 |
|
yutao
|
11ae8c82d4
|
个人主页
|
2015-07-16 11:37:03 +08:00 |
|
sw
|
b6e123e476
|
右上角导航栏问题
|
2015-07-16 10:49:39 +08:00 |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
2015-07-16 10:26:09 +08:00 |
|
sw
|
66c1dfa77e
|
作品列表增加分班的过滤
|
2015-07-15 17:34:34 +08:00 |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
2015-07-15 16:01:03 +08:00 |
|
sw
|
67c054e3af
|
Merge branch 'szzh' into sw_new_course
|
2015-07-15 15:29:47 +08:00 |
 huang
|
c9c3d2e3d8
|
修改讨论区行数过高压住字体
|
2015-07-10 16:29:49 +08:00 |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
2015-07-10 15:42:53 +08:00 |
|
huang
|
b089b973ab
|
Merge branch 'szzh' into dev_hjq
|
2015-07-10 15:41:53 +08:00 |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
2015-07-10 14:17:19 +08:00 |
|
huang
|
57f6f72c64
|
修改编辑器下面多余的黑色框框
|
2015-07-10 13:09:09 +08:00 |
|
huang
|
fc61edf1fa
|
课程讨论区添加真实姓名
编辑器图片更新
|
2015-07-10 10:37:34 +08:00 |
 zhangshenjerry
|
66042a90f3
|
创新竞赛--竞赛通知：评论通知输入框显示超出边框
|
2015-07-10 09:23:36 +08:00 |
|
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
|
huang
|
8de307d198
|
项目资源库区分“项目内搜索”和“全站搜索”
|
2015-07-09 14:36:59 +08:00 |
|
sw
|
2eff8cce6a
|
更新css文件
|
2015-07-08 16:38:34 +08:00 |
|
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
2015-07-08 11:17:59 +08:00 |
|
huang
|
7ebdf4a08d
|
issue列表增加优先级
修改issue列表界面
|
2015-07-07 11:29:40 +08:00 |
|
zhangshenjerry
|
04f125c7a6
|
张申修改的bug
|
2015-07-06 11:42:26 +08:00 |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
2015-07-06 10:44:07 +08:00 |
|
sw
|
283e93c9e2
|
为启用匿评作业不现实匿评栏
|
2015-07-04 12:07:21 +08:00 |
|
huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
2015-07-03 16:04:55 +08:00 |
|
sw
|
4eb9ce6f0f
|
css报错
|
2015-07-03 10:58:30 +08:00 |
|
sw
|
d2b76e92f2
|
展开后成绩得分框显示位置
|
2015-07-03 10:55:22 +08:00 |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
2015-07-03 10:51:54 +08:00 |
|
sw
|
642fa8dd5d
|
1、缺评、迟交扣分
2、匿评提示框、最终成绩计算提示框
3、修改作业
|
2015-07-03 10:47:10 +08:00 |
|
huang
|
b16e19096f
|
添加新闻回复
|
2015-07-03 10:25:21 +08:00 |
|
sw
|
1e12b68027
|
下载附件提示遮住按钮
|
2015-07-03 10:09:49 +08:00 |
|
zhangshenjerry
|
54317af6d8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-02 15:31:34 +08:00 |
|
zhangshenjerry
|
448cedc842
|
回复的收缩
|
2015-07-02 15:30:09 +08:00 |
|
sw
|
59f6ef81cd
|
附件提示框固定位置
|
2015-06-30 10:15:04 +08:00 |
|
sw
|
90c4a38cfc
|
公共贴吧头像显示问题
|
2015-06-26 17:00:33 +08:00 |
|
sw
|
0f92a2e3cb
|
下载附件给出使用winrar解压的提示
|
2015-06-26 14:29:03 +08:00 |
|
sw
|
0215d2224e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 13:41:33 +08:00 |
|
yutao
|
5e29c6bf27
|
bug#2742:项目问题跟踪：新建问题时在描述中直接贴图，若图片长度够长，在个人动态中显示超出边框
|
2015-06-26 10:14:26 +08:00 |
|
huang
|
5d0cd4520e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-26 10:04:48 +08:00 |
|
huang
|
cf0e1b3bd5
|
修改缺陷：上传名称较长的资源，文字被截断了
|
2015-06-26 09:47:58 +08:00 |
|
yutao
|
e6a15a45c4
|
bug#2782:讨论区：若某一级回帖是视频，再二级回复该回复信息，显示时超出边框
|
2015-06-26 09:42:17 +08:00 |
|
sw
|
ebeeb9cf28
|
开启匿评后学生提交作品提示，开启匿评时对老师的提示
界面css
|
2015-06-25 15:55:57 +08:00 |
 guange
|
38b97aa558
|
下载url有两处需要处理的
|
2015-06-24 16:23:15 +08:00 |
|
guange
|
81187dea36
|
有带+号的作业无法打包下载的问题
|
2015-06-24 16:07:54 +08:00 |
|
sw
|
e3c67fb17a
|
Merge branch 'szzh' into sw_new_course
|
2015-06-19 15:05:24 +08:00 |
|
sw
|
857110d537
|
作品列表增加时间显示，相应界面调整
|
2015-06-19 11:54:01 +08:00 |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
2015-06-19 10:26:56 +08:00 |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
2015-06-19 10:18:24 +08:00 |
|
sw
|
43363e8bcb
|
缺评情况功能
|
2015-06-18 17:56:28 +08:00 |
|
sw
|
9a4e0d6be7
|
批阅结果附件显示长度
|
2015-06-18 10:11:04 +08:00 |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
2015-06-17 17:01:03 +08:00 |