 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 |
Wen
|
775774ad63
|
临时措施：即使用户没有填写单位，页面也可以正常打开，而不是报错
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
wanglinchun
|
e136254c8d
|
回复了项目页面中的头像
|
11 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
11 years ago |
 kg
|
4d727d8049
|
revert the mistaken move:base_courses and base_project footer
|
11 years ago |
|
kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
11 years ago |
|
kg
|
3013930f28
|
modify footer
|
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 |
|
kg
|
2cec3b0490
|
modify footer
|
11 years ago |
|
wanglinchun
|
28ffd44e55
|
调整竞赛页面加入竞赛，关注以及配置竞赛的显示样式
|
11 years ago |
|
wanglinchun
|
945ca3787a
|
调整个人主页中top-menu跳转菜单：增加跳转到竞赛模块首页
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
11 years ago |
yanxd
|
28a5eff048
|
topics未登录footer飞出去的问题，擦屁股+10086,dom结构还有错，找不到崩溃
|
11 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
11 years ago |
|
yanxd
|
ac4e74af91
|
作业layout显示提交作业的类型
|
11 years ago |
xianbo
|
20bf1dadc0
|
fix
|
11 years ago |
|
xianbo
|
b2896c1645
|
fix
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
 fanqiang
|
a426cf46de
|
添加浏览次数
|
11 years ago |
|
yanxd
|
3fad5abb5c
|
modal init
|
11 years ago |
|
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
11 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
11 years ago |
|
xianbo
|
2a72f7aac8
|
evils fix
|
11 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
11 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
11 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
11 years ago |
|
fanqiang
|
e8de48dd24
|
修改osp的show界面，建立框架
|
11 years ago |
|
xianbo
|
6888e2bf01
|
fix
|
11 years ago |
|
xianbo
|
90dcf36257
|
left italic in email
|
11 years ago |
|
xianbo
|
02925fbb99
|
fix
|
11 years ago |
|
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
11 years ago |
|
fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
11 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
11 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
11 years ago |
|
yanxd
|
f7eca26770
|
资源库位置调整：排第三
|
11 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
11 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
11 years ago |
|
yanxd
|
3097f23c06
|
shang
|
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
|
3f55e78f49
|
add diff url in navigation
|
11 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
11 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
11 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
11 years ago |
|
yanxd
|
62ea2b3849
|
下拉文件菜单
|
11 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
11 years ago |
|
wanglinchun
|
7f043579e3
|
修改作业页面中“提交作业”的位置
|
11 years ago |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
11 years ago |
|
yanxd
|
4efa3f7752
|
导航条下方的网站域名显示 forge ===> course
|
11 years ago |
|
yanxd
|
8a3d1d033c
|
用户navbar问题，注册对齐问题
|
11 years ago |
|
yanxd
|
f64ea263ca
|
新建帖子主题条过长
|
11 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
11 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
11 years ago |
|
wanglinchun
|
9aa903d79c
|
修改了新建课程页面的显示问题
|
11 years ago |
|
yanxd
|
3d274be77b
|
fixtures fix, header fix dynamic.
|
11 years ago |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
11 years ago |
|
yanxd
|
85c055bdc0
|
学生加入课程列表500
|
11 years ago |
|
wanglinchun
|
7e20f9015e
|
footer
|
11 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
11 years ago |
|
yanxd
|
3676d3e7dd
|
留言又移动回手写区域，去掉了jquery加数量的操作
|
11 years ago |
|
yanxd
|
710adb8fed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
eb7e2539b8
|
留言问题
|
11 years ago |
 baiyu
|
f03cc6c74c
|
所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、
完成：1、项目列表分数都能被点击，弹出项目窗口，点击应该在分数上而不是文字上
2、创客列表中的分数都能被点击，弹出个人的窗口，点击应该在分数上而不是文字上
|
11 years ago |
|
yanxd
|
ecec98aac9
|
菜单栏调整
|
11 years ago |
|
yanxd
|
c541865fa3
|
fix bugs
|
12 years ago |
|
yanxd
|
b269502de2
|
怕看不懂，定义几个常量
|
12 years ago |
|
yanxd
|
d202c84b44
|
导航条下拉菜单. [Version] alpha v0.1
|
12 years ago |
|
yanxd
|
ebc307db07
|
remove 1111
|
12 years ago |
|
yanxd
|
ad09978020
|
资源库 -> 资源索引, 判断搜索结果
|
12 years ago |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
12 years ago |
|
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
yanxd
|
76f69973b4
|
fix search incalid byte sequence in utf-8
|
12 years ago |
|
yanxd
|
a5c9d9c31e
|
um...
|
12 years ago |
|
yanxd
|
2bb44456d6
|
search
|
12 years ago |
|
yanxd
|
289b0581df
|
stores css
|
12 years ago |
|
yanxd
|
9dd6bdc0ae
|
store framework => route, and refactory debug params in html/footer.
|
12 years ago |
|
baiyu
|
db1874fa07
|
评分
|
12 years ago |
|
wanglinchun
|
6b5f1827a6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
7a4fe59978
|
实践课程=>课程实践
|
12 years ago |
|
yanxd
|
b9967074dc
|
新闻界面修改，new页面bug修复
|
12 years ago |
|
wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
fccd83e199
|
it i
|
12 years ago |
|
yanxd
|
4c0acc5f3e
|
welcome css
|
12 years ago |
|
wanglinchun
|
0c8e1e19e6
|
"软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置
|
12 years ago |
|
wanglinchun
|
fdcb68bd69
|
当用户未登陆的时候，隐藏掉了“软件众包”中的“选为作业”
当用户未登陆的时候，隐藏掉了“项目托管”、“创新竞赛”以及“软件众包” 关注 前的星号
|
12 years ago |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
12 years ago |
|
yanxd
|
7b895e5cde
|
Merge branch 'wordh' into develop
Conflicts:
app/views/layouts/base_users.html.erb
|
12 years ago |
|
wanglinchun
|
a3ef595099
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/models/journals_for_message_observer.rb
|
12 years ago |
|
wanglinchun
|
3707af3810
|
mail
|
12 years ago |
|
yanxd
|
deaae6998c
|
Merge remote-tracking branch 'origin/develop' into wordh
|
12 years ago |
|
nieguanghui
|
f3ce918699
|
留言修改
|
12 years ago |
|
yanxd
|
2636d6b1e6
|
项目留言页面对齐
|
12 years ago |
|
yanxd
|
1af4e4f712
|
welcome index css.
|
12 years ago |
|
yanxd
|
36d7068ba3
|
闭合forum标签
|
12 years ago |
