 alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
84e8a40174
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
da35ee123b
|
美化界面
|
11 years ago |
|
sw
|
4991f2b549
|
#1180取消项目配置中新建项目赋予角色功能
|
11 years ago |
|
sw
|
6d6b2c6b38
|
调整HTML页面代码
|
11 years ago |
|
sw
|
06256a5302
|
#1202修复项目--讨论区：点击某帖子添加的时间链接，弹出界面相关错误的BUG
|
11 years ago |
|
sw
|
ab42f918ad
|
修复点击时间后弹出的头像不正确的BUG
|
11 years ago |
 z9hang
|
efc247f2e7
|
1、各个页面在，没有数据情况下的显示调整。2、点击竞赛列表，在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面
|
11 years ago |
|
sw
|
6e94e344d4
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
b25b5a9a45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
df937e89d8
|
优化页面代码
|
11 years ago |
|
sw
|
fb9d3921e6
|
#1403修复测试版：项目--新闻：添加评论却返回404页面的BUG
问题：url错误
|
11 years ago |
|
z9hang
|
5f7d7c821c
|
添加网站的默认页脚（使空数据库时显示更合理）
|
11 years ago |
|
z9hang
|
38f6544ee1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
14a6dec46a
|
空数据库时的贴吧列表优化
|
11 years ago |
|
sw
|
3e03c928dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 gonglexin
|
0ed9fab16f
|
#994 修复项目资源下载排序问题
|
11 years ago |
|
z9hang
|
a16cdb5068
|
空数据库时首页布局修改
|
11 years ago |
|
sw
|
c48f66015d
|
调整竞赛踩、顶的位置
|
11 years ago |
|
z9hang
|
6285b2454a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
3d860af48b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/contest.html.erb
app/views/welcome/index.html.erb
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
0d0a16fdcd
|
编辑冲突
|
11 years ago |
|
z9hang
|
269e1cf497
|
1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug
|
11 years ago |
|
sw
|
8f4b994b11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
|
11 years ago |
|
sw
|
ed7dac6126
|
1
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
be0eddd304
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
d2f4b38eb6
|
修改竞赛通知new页面代码：
1.增加js验证，
2.修复点击取消按钮却提交通知的BUG
|
11 years ago |
|
sw
|
943df643aa
|
新增竞赛通知页面取消按钮js修改
|
11 years ago |
|
sw
|
923a33add5
|
#1397、#1396新建竞赛通知增加js验证
|
11 years ago |
|
sw
|
91d08d5b9a
|
#1233修复个人主页--动态：点击项目链接报500错误的BUG
优化页面代码
|
11 years ago |
|
sw
|
e9124c62ce
|
#1250修改帐号后将帐号更新成功放在一个显眼的位置
|
11 years ago |
|
sw
|
2f2b916ef8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
gonglexin
|
1abcd2a43e
|
#1275 修正课程列表中的动态数
|
11 years ago |
|
sw
|
5cf7a5334f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
69dc22e218
|
#1247修复项目--配置--版本：新建版本，输入“wiki页面”为非汉字类型且字数较多时，显示异常的BUG
|
11 years ago |
|
z9hang
|
2e3bdf1179
|
将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug
|
11 years ago |
|
z9hang
|
491020b6df
|
修改403,404页面添加layout，传入一些其他参数
|
11 years ago |
|
sw
|
82aa52e44f
|
修复课程成员不能加入作业中私有资源的BUG
|
11 years ago |
|
sw
|
59c143a9f1
|
修复加入课程逻辑判断有误的问题
|
11 years ago |
|
sw
|
27562c3d11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
877c041516
|
修复当课程不存在时提示有误的BUG
|
11 years ago |
|
sw
|
bf49f46b22
|
修复加入课程报错的BUG
|
11 years ago |
|
sw
|
3a48034fca
|
#1387修复课程--资源库-关联资源查询出来的结果是整个项目中资源的集合的BUG
|
11 years ago |
|
sw
|
56ac9222ef
|
#1384修复wiki注释超出边框的问题
|
11 years ago |
|
z9hang
|
aba9e517b3
|
去掉了一些注释
|
11 years ago |
|
alan
|
42f3fbd4b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
859a1122b7
|
修改contest中contestnotification列表和通知公告的界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
