 z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
2014-05-15 19:16:36 +08:00 |
 nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:36:52 +08:00 |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
2014-05-15 17:36:39 +08:00 |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:33:58 +08:00 |
|
z9hang
|
06706b577d
|
贴吧、讨论区回复的样式修改
|
2014-05-15 16:27:56 +08:00 |
 yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
2014-05-15 15:52:25 +08:00 |
|
nwb
|
be73a232e8
|
修改显示
|
2014-05-15 13:58:54 +08:00 |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:54:06 +08:00 |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
2014-05-15 13:53:45 +08:00 |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
2014-05-15 13:37:24 +08:00 |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
|
z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
2014-05-15 11:14:44 +08:00 |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 10:50:57 +08:00 |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
|
nwb
|
aa89900813
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/files/index.html.erb
|
2014-05-15 09:26:32 +08:00 |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
2014-05-15 09:20:36 +08:00 |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
2014-05-15 09:19:59 +08:00 |
|
nwb
|
cea01b4df5
|
优化错误提示
|
2014-05-14 18:33:27 +08:00 |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 18:27:06 +08:00 |
|
z9hang
|
d2fd2f90e6
|
作业删除图标添加
|
2014-05-14 18:26:11 +08:00 |
|
yanxd
|
14e4bf5bcc
|
typo
|
2014-05-14 17:20:31 +08:00 |
|
yanxd
|
829c77879a
|
typo
|
2014-05-14 17:12:04 +08:00 |
|
z9hang
|
a19a1b74a7
|
修正作业数显示不一致问题
|
2014-05-14 17:05:51 +08:00 |
|
nwb
|
4235ca8984
|
修正BUG
|
2014-05-14 15:23:26 +08:00 |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
2014-05-14 15:16:11 +08:00 |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 15:08:30 +08:00 |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
2014-05-14 15:08:06 +08:00 |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
2014-05-14 15:03:04 +08:00 |
|
z9hang
|
77b5ce658b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 11:58:59 +08:00 |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
2014-05-14 11:58:05 +08:00 |
|
z9hang
|
91d2b58cf4
|
当前用户没有提交作业权限时屏蔽该按钮
|
2014-05-14 11:28:32 +08:00 |
|
yanxd
|
603010c30a
|
remove map
|
2014-05-14 11:22:59 +08:00 |
|
xianbo
|
a22e082cb5
|
fix repository info
|
2014-05-14 10:07:01 +08:00 |
|
xianbo
|
95dab82823
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-14 09:53:40 +08:00 |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
2014-05-14 08:50:28 +08:00 |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
2014-05-13 17:57:06 +08:00 |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
2014-05-13 16:34:53 +08:00 |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-13 11:56:55 +08:00 |
|
nwb
|
79b498914a
|
修改错误
|
2014-05-13 11:56:36 +08:00 |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
2014-05-13 11:54:21 +08:00 |
 sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-13 10:30:37 +08:00 |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
2014-05-13 10:30:15 +08:00 |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 18:46:53 +08:00 |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
2014-05-12 18:46:39 +08:00 |
|
xianbo
|
297835e25b
|
fix
|
2014-05-12 17:40:37 +08:00 |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
2014-05-12 16:01:13 +08:00 |
|
sw
|
75902ff118
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-12 10:37:23 +08:00 |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 09:33:19 +08:00 |