 yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
xianbo
|
325bb85cc5
|
fix linchun
|
11 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
 z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
|
yanxd
|
c7d6a07b72
|
gems
|
11 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
 nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f0ee69b8b
|
隐藏竞赛中的参赛项目和参赛应用
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
wanglinchun
|
b182debc16
|
将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题
|
11 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
11 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
11 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
11 years ago |
yanxd
|
d9cadfc43e
|
未登录500报错
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
|
wanglinchun
|
982ff342fd
|
显示竞赛页面参赛项目菜单
|
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
|
e136254c8d
|
回复了项目页面中的头像
|
11 years ago |
|
yanxd
|
d137e78f19
|
remove tmp file rake task/
|
11 years ago |
|
yanxd
|
bde4e0f4f7
|
fix courselist
|
11 years ago |
 kg
|
e92383940f
|
#b2896c16453fc51
|
11 years ago |
|
xianbo
|
b2896c1645
|
fix
|
11 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
11 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
11 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
11 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
11 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
11 years ago |
|
xianbo
|
cd246fc9c2
|
fix redmine
|
11 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
11 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
11 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
11 years ago |
|
yanxd
|
eb7e2539b8
|
留言问题
|
11 years ago |
|
yanxd
|
d202c84b44
|
导航条下拉菜单. [Version] alpha v0.1
|
11 years ago |
|
yanxd
|
ad09978020
|
资源库 -> 资源索引, 判断搜索结果
|
12 years ago |
|
yanxd
|
6edfda3a95
|
add store_url to header
|
12 years ago |
|
xianbo
|
da74c97b7d
|
fix the show of manager web
|
12 years ago |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
12 years ago |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
12 years ago |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
12 years ago |
|
yanxd
|
b0f5f734e1
|
e... little bug.
|
12 years ago |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
12 years ago |
|
yanxd
|
8f707f3987
|
修复帖子统计问题
|
12 years ago |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
12 years ago |
 huangjingquan
|
d955480184
|
tab讨论区显示
|
12 years ago |
