xianbo
|
2c7615b545
|
fix robots rule
|
2014-04-19 10:04:55 +08:00 |
 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
|
2014-04-18 16:03:52 +08:00 |
 kg
|
c9b92b4197
|
modify status color
|
2014-04-16 22:15:34 +08:00 |
|
wanglinchun
|
28ffd44e55
|
调整竞赛页面加入竞赛，关注以及配置竞赛的显示样式
|
2014-04-16 21:16:51 +08:00 |
|
wanglinchun
|
1a6a20e761
|
竞赛模块首页布局和显示效果调整好
|
2014-04-16 20:23:38 +08:00 |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
2014-04-16 17:32:58 +08:00 |
|
wanglinchun
|
945ca3787a
|
调整个人主页中top-menu跳转菜单：增加跳转到竞赛模块首页
|
2014-04-16 09:52:36 +08:00 |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
wanglinchun
|
92078e6ac8
|
调整首页布局
|
2014-04-09 10:24:44 +08:00 |
yanxd
|
743fee80e3
|
网站状态css
|
2014-04-04 21:43:06 +08:00 |
|
yanxd
|
d83ea7ecd8
|
fake Count count student project, lol.
|
2014-04-04 21:30:40 +08:00 |
|
xianbo
|
45c6c0b9f3
|
fix
|
2014-04-04 17:21:07 +08:00 |
|
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
|
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
yanxd
|
5ed40da76f
|
course页面，xx份资料上加链接
|
2014-04-02 08:22:02 +08:00 |
|
yanxd
|
4f5216e632
|
merge
|
2014-03-31 17:11:41 +08:00 |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
2014-03-31 15:36:51 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
yanxd
|
ad23ba646e
|
理理css
|
2014-03-28 18:12:46 +08:00 |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
2014-03-28 18:12:44 +08:00 |
|
xianbo
|
a9d662872c
|
add i want to feedback
|
2014-03-28 11:13:58 +08:00 |
|
yanxd
|
3097f23c06
|
shang
|
2014-03-27 17:12:35 +08:00 |
|
yanxd
|
35d1c33a29
|
...
|
2014-03-27 10:53:45 +08:00 |
|
yanxd
|
dba674dfec
|
首页调整
|
2014-03-26 08:24:12 +08:00 |
|
yanxd
|
d64615e604
|
issue created alert
|
2014-03-25 21:24:17 +08:00 |
|
yanxd
|
937d594c41
|
首页字体
|
2014-03-25 21:12:04 +08:00 |
|
yanxd
|
575fc48ff0
|
首页搜索分类
|
2014-03-25 16:53:11 +08:00 |
|
wanglinchun
|
8d2bbfe320
|
调整首页主题部分字体格式
|
2014-03-24 21:36:10 +08:00 |
|
wanglinchun
|
b167193172
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-24 17:17:04 +08:00 |
|
xianbo
|
321f2df0b9
|
add chance to new preoject
|
2014-03-24 17:12:28 +08:00 |
|
wanglinchun
|
1fabad8c2f
|
修改项目托管主页和课程实践主页主题句
|
2014-03-24 16:27:18 +08:00 |
|
xianbo
|
8bb4d44cbe
|
fix link
|
2014-03-24 13:49:14 +08:00 |
|
xianbo
|
8db09739a1
|
optimize the show of forge
|
2014-03-24 13:49:13 +08:00 |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
2014-03-21 20:26:28 +08:00 |
|
xianbo
|
20cd5941a8
|
modify project main page
|
2014-03-21 15:17:14 +08:00 |
|
xianbo
|
a8fbed4502
|
add welcome page in diff url
|
2014-03-20 10:11:12 +08:00 |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
2014-03-17 22:43:38 +08:00 |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
2014-03-12 17:09:26 +08:00 |
|
yanxd
|
f614ab33e2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-08 11:09:02 +08:00 |
|
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
2014-03-08 11:08:48 +08:00 |
|
wanglinchun
|
abb27025d3
|
修改course门户主页中新开课程后更多的链接问题
|
2014-03-08 09:55:00 +08:00 |
|
yanxd
|
e7841cb512
|
fix
|
2014-03-07 20:34:17 +08:00 |
|
yanxd
|
ce1e6c49f1
|
改留言
|
2014-03-07 16:49:45 +08:00 |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
2014-03-07 11:28:52 +08:00 |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
2014-02-22 09:47:59 +08:00 |
 nieguanghui
|
a850cc8a04
|
修复侧边栏bug
|
2014-01-24 15:45:13 +08:00 |