yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
11 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
11 years ago |
 wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
|
wanglinchun
|
19eb071a77
|
dfd
|
11 years ago |
|
wanglinchun
|
38c7216097
|
添加了新建参赛作品后弹出新建成功的提示框
|
11 years ago |
|
wanglinchun
|
2b44b1b893
|
将竞赛中参赛作品列表按照时间顺序逆序排列（针对参赛应用）
|
11 years ago |
|
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
wanglinchun
|
7d33bb9b2d
|
将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
|
11 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
wanglinchun
|
538f8516b0
|
目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
|
11 years ago |
 yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
11 years ago |
|
wanglinchun
|
fb3c513da2
|
给“我要参赛”应用了base——newcontest的整体样式
|
11 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
11 years ago |
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
11 years ago |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
11 years ago |
|
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
11 years ago |
 fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
11 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
11 years ago |
|
yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
11 years ago |
 kg
|
776a9d1e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
Wen
|
e6288627ad
|
中国高校页面，下拉框修改
|
11 years ago |
|
wanglinchun
|
e48edac988
|
增加参赛应用页面的打分细节--初级版
|
11 years ago |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
11 years ago |
|
wanglinchun
|
dbe4c26322
|
应用列表分页功能
|
11 years ago |
|
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
11 years ago |
|
kg
|
0f51480bab
|
amend course search
|
11 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
11 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
11 years ago |
|
fanqiang
|
6ba53f534a
|
添加回复帖子功能
|
11 years ago |
|
Wen
|
03d58b962a
|
封装了一下取得logo的方法
|
11 years ago |
|
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
11 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
11 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
|
yanxd
|
8f5958abc1
|
mao
|
11 years ago |
|
Wen
|
60101b169a
|
= =
|
11 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
11 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
|
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
0ff3734aae
|
delete nothing
|
11 years ago |
|
kg
|
77ea0092b7
|
add course homepage activity
|
11 years ago |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
11 years ago |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
11 years ago |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
709629bcdf
|
add course activity
|
11 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
