 wanglinchun
|
4b54f2949d
|
首页修改2
|
2014-06-04 10:28:20 +08:00 |
|
wanglinchun
|
e5a76251a5
|
修改首页2
|
2014-06-04 10:24:47 +08:00 |
 sw
|
1889996d6f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 10:18:35 +08:00 |
 z9hang
|
c3b7c7cbe8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 10:16:46 +08:00 |
|
sw
|
80afefcd28
|
修改可对文件进行增、删等操作
|
2014-06-04 10:12:07 +08:00 |
|
wanglinchun
|
ebcdd2cc9e
|
修改首页英文显示
|
2014-06-04 10:08:57 +08:00 |
 yanxd
|
51bfb6cae8
|
user model save bug
|
2014-06-04 10:08:54 +08:00 |
|
sw
|
29ac5ff12a
|
如果当前用户已经提交过作业就不显示新增作业按钮
|
2014-06-04 09:55:38 +08:00 |
|
wanglinchun
|
b5be2d58ce
|
英文子站首页
|
2014-06-04 09:35:39 +08:00 |
|
z9hang
|
3690bf79f4
|
修复个人动态中留言人链接错误
|
2014-06-04 09:31:16 +08:00 |
|
sw
|
66c9de94a8
|
修复新增作业后页面不会跳转的问题
|
2014-06-04 09:11:06 +08:00 |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 08:51:46 +08:00 |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
2014-06-03 21:52:16 +08:00 |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
2014-06-03 18:30:53 +08:00 |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
2014-06-03 18:24:55 +08:00 |
|
z9hang
|
3a80a80841
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-03 17:36:01 +08:00 |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-03 17:21:01 +08:00 |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
2014-06-03 16:58:32 +08:00 |
|
sw
|
5ef1332ded
|
实现修改、删除作业后页面跳转
|
2014-06-03 16:47:00 +08:00 |
|
yanxd
|
510b1c4233
|
merge gem
|
2014-06-03 16:45:35 +08:00 |
|
yanxd
|
3e92281f28
|
readme.txt gbk ==> utf-8
|
2014-06-03 16:42:55 +08:00 |
|
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
2014-06-03 16:41:12 +08:00 |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
2014-06-03 15:47:00 +08:00 |
|
wanglinchun
|
81a45fe977
|
dfs
|
2014-06-03 15:27:04 +08:00 |
|
yanxd
|
7d6311f8e4
|
Merge branch 'develop' into szzh
|
2014-06-03 11:20:27 +08:00 |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
2014-06-03 11:19:20 +08:00 |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
2014-06-03 09:27:07 +08:00 |
|
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
2014-06-03 09:03:56 +08:00 |
|
wanglinchun
|
09ea833dcb
|
竞赛通知修改2
|
2014-05-30 20:52:55 +08:00 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
2014-05-30 16:27:05 +08:00 |
|
yanxd
|
bced2476cd
|
在更新下
|
2014-05-30 16:05:42 +08:00 |
|
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示，去掉了冗余的计算逻辑，打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
2014-05-30 15:52:34 +08:00 |
|
z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-30 13:41:04 +08:00 |
ganyiang
|
9f16123bed
|
修复osp显示帖子页面，footer漂移的问题
|
2014-05-30 11:29:05 +08:00 |
|
yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
2014-05-30 10:59:29 +08:00 |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
|
yanxd
|
6c5e7eca49
|
TODO
|
2014-05-30 10:49:49 +08:00 |
|
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
2014-05-30 09:49:53 +08:00 |
|
ganyiang
|
a6f6ea240d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 09:35:27 +08:00 |
|
ganyiang
|
b4c299bff8
|
修复osp中“热帖”下显示“没有帮助”的问题
|
2014-05-30 09:35:06 +08:00 |
|
yanxd
|
9194b32060
|
file/index上传文件功能里。 remote: true 文件是不能提交的！
|
2014-05-30 09:31:04 +08:00 |
xianbo
|
325bb85cc5
|
fix linchun
|
2014-05-30 09:28:13 +08:00 |
|
sw
|
22688dd5da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-30 08:38:01 +08:00 |
|
xianbo
|
75fb537939
|
delete mark file
|
2014-05-30 08:35:23 +08:00 |
|
ganyiang
|
44d24d038f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 08:30:10 +08:00 |
|
ganyiang
|
3c9279d285
|
修改标签错误
|
2014-05-30 08:29:50 +08:00 |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 08:28:07 +08:00 |
|
ganyiang
|
e8b33bfd8f
|
修复osp主页index界面态势列表显示标题过长的问题
|
2014-05-29 22:30:58 +08:00 |
|
ganyiang
|
e901e8046d
|
修改osp中allbug的显示界面
|
2014-05-29 22:25:53 +08:00 |