xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
 yanxd
|
14e4bf5bcc
|
typo
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
 nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
11 years ago |
 z9hang
|
6e14e0b262
|
提交作业窗口删除全部图标位置修正
|
11 years ago |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
11 years ago |
|
yanxd
|
c2284deaf7
|
application.css 分页css问题
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
11 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
11 years ago |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
11 years ago |
|
yanxd
|
8770599352
|
css typo
|
11 years ago |
|
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
11 years ago |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
 wanglinchun
|
0634f36c10
|
"打分后不要显示英文，而且还要提示：您可以重新打分"问题解决
|
11 years ago |
Wen
|
c893227609
|
个人资料页面学校选择框更改
|
11 years ago |
|
yanxd
|
0cfd5929d8
|
Revert "tag todo"
eee
This reverts commit 08b27f38a7.
|
11 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
11 years ago |
|
Wen
|
815e7cf3af
|
个人资料修改页面 限制了学校列表的高度并添加了滚动条
|
11 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
11 years ago |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
11 years ago |
|
yanxd
|
939e4cc100
|
footer 下方距离
welcome调整下主页
|
11 years ago |
|
Wen
|
ba80593ab0
|
别忘了改数据库！= =
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
yanxd
|
08b27f38a7
|
tag todo
|
11 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
yanxd
|
e2a5e2f730
|
footer
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
|
yanxd
|
8775eab3dd
|
iscas modify
|
11 years ago |
|
yanxd
|
83f039a014
|
modify pku.png
|
11 years ago |
|
yanxd
|
a4ab29f49d
|
footer logo modify
|
11 years ago |
 kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
bdefa322cc
|
modify foot
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
11 years ago |
|
kg
|
3f096f9167
|
add pdl logo
|
11 years ago |
|
kg
|
69dbd5a85e
|
add logos and modify footer;footer position problem of some projects and courses
|
11 years ago |
|
wanglinchun
|
1a6a20e761
|
竞赛模块首页布局和显示效果调整好
|
11 years ago |
|
yanxd
|
6f5fcd0dee
|
测试作业下载
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
