 z9hang
|
3cd3989ead
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0a1713da20
|
课程列表中，自己的课程没星号标志问题
|
11 years ago |
 sw
|
6db235cf3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9707049703
|
修改js判断指定字符串是否含有指定子串不正确的问题
|
11 years ago |
|
z9hang
|
ef15c15605
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
30e355fa35
|
#948 admin配置管理--用户列表--项目列表：如图下拉框显示超出边框且项目问题，解决，说小选项长度，添加title属性，鼠标悬停时显示选项的完整信息
|
11 years ago |
|
sw
|
54e8df06cd
|
1.修改Micros版学校列表不可用的问题
2.修改正式版、测试学校列表访问版跨域的问题
|
11 years ago |
|
sw
|
b141afe98d
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
11 years ago |
|
sw
|
a40cf51d02
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
a451385d13
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e6d1a127a9
|
修复Micros版学校列表无法显示的BUG
|
11 years ago |
|
sw
|
526b34d623
|
修改加入课程弹出框样式
|
11 years ago |
|
z9hang
|
49beaa4f42
|
去掉ajax错误提示
|
11 years ago |
|
sw
|
725c9559a6
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
b732944a2a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9723d62d16
|
有编码转换错误时，不进行转码
|
11 years ago |
|
sw
|
1f9c6b66ca
|
修复wiki页面表格超出页面的BUG
|
11 years ago |
|
sw
|
c8c57b3f76
|
#1404修复帖子描述为表格，切表格设置大于页面宽度的宽度时，显示超出页面的BUG
解决方案：增加js改宽度
|
11 years ago |
 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 |
