 yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
 z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
11 years ago |
 sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
11 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
 nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
11 years ago |
 fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
4f9625b265
|
修改BUG
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
11 years ago |
 wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
11 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
290d07ffdd
|
修改新建帖子bug（open_source_project）
|
11 years ago |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
11 years ago |
|
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
11 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
11 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
11 years ago |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
11 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
11 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
11 years ago |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
11 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
11 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
11 years ago |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
11 years ago |
|
yanxd
|
13a5aa988a
|
issues#623
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
11 years ago |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
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 |
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
11 years ago |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
11 years ago |
|
z9hang
|
da37a12158
|
优化代码
|
11 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
|
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
11 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
11 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
11 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
|
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序；
增加参赛作品页面和竞赛中参赛作品得分
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
11 years ago |
yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
11 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
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 |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
11 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
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
|
应用列表分页功能
|
12 years ago |
|
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
12 years ago |
|
kg
|
0f51480bab
|
amend course search
|
12 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
12 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
12 years ago |
|
fanqiang
|
6ba53f534a
|
添加回复帖子功能
|
12 years ago |
|
Wen
|
03d58b962a
|
封装了一下取得logo的方法
|
12 years ago |
|
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
12 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
12 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
12 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
12 years ago |
|
yanxd
|
8f5958abc1
|
mao
|
12 years ago |
|
Wen
|
60101b169a
|
= =
|
12 years ago |
|
Wen
|
02295e5ca9
|
给严总调试用
|
12 years ago |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
12 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
12 years ago |
|
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
0ff3734aae
|
delete nothing
|
12 years ago |
|
kg
|
77ea0092b7
|
add course homepage activity
|
12 years ago |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
12 years ago |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
12 years ago |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
709629bcdf
|
add course activity
|
12 years ago |
|
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
cf762e6aa3
|
bug fix~
|
12 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
12 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
12 years ago |
|
wanglinchun
|
c272d7a8c7
|
调整应用的修改功能，使其可以更新重新上传的文件，但是会删除上次上传的文件
|
12 years ago |
|
Wen
|
59d705b33c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
12 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
12 years ago |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
12 years ago |
|
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
12 years ago |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
12 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
12 years ago |
|
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
12 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
12 years ago |
|
yanxd
|
e5a5a337b2
|
format code
|
12 years ago |
|
yanxd
|
0226052dd0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
2b679b1ef9
|
看图不登录
|
12 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
12 years ago |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
|
kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
bdefa322cc
|
modify foot
|
12 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
|
12 years ago |
|
Wen
|
4e567afd0a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
12 years ago |
xx
|
f30513217e
|
zip factory
|
12 years ago |
|
yanxd
|
5ee1c8e2f2
|
refactory zip
|
12 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
12 years ago |
|
alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
a52e057d94
|
修改添加应用不能刷新的问题
|
12 years ago |
|
yanxd
|
cabceb0064
|
test zip down
|
12 years ago |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
12 years ago |
|
yanxd
|
6f5fcd0dee
|
测试作业下载
|
12 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
12 years ago |
|
yanxd
|
28bebb1ee7
|
add Gem
zip
root path firefox bug
|
12 years ago |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
12 years ago |
|
Wen
|
37bb5341e4
|
省份与学校的级联完成！
|
12 years ago |
|
yanxd
|
4da8b4e5f6
|
debug
|
12 years ago |
|
yanxd
|
3081bff9f4
|
test emtry directory
|
12 years ago |
|
yanxd
|
bde4e0f4f7
|
fix courselist
|
12 years ago |
|
wanglinchun
|
484d334c3c
|
添加竞赛模块中参赛项目的分页功能
|
12 years ago |
|
yanxd
|
31ce41a2d7
|
testcontroller
|
12 years ago |
|
yanxd
|
41f315aac0
|
压缩文件
|
12 years ago |
|
yanxd
|
8b52d63d14
|
关联文件同时，关联tag
|
12 years ago |
|
wanglinchun
|
589a21204c
|
应用下载功能实现
|
12 years ago |
|
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了，加上了所有验证
|
12 years ago |
|
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
12 years ago |
|
yanxd
|
634dd15be3
|
project html
|
12 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
12 years ago |
|
yanxd
|
96fcdbacf2
|
课程里搜东西 没有内容项目里也跳出来的问题
|
12 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
yanxd
|
d554bf1ea9
|
给下载添加登录过滤器
|
12 years ago |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
12 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
12 years ago |
 nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
12 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
12 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
12 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
12 years ago |
|
yanxd
|
d83ea7ecd8
|
fake Count count student project, lol.
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
|
xianbo
|
b1fc33a697
|
add by nyan
|
12 years ago |
|
xianbo
|
2a72f7aac8
|
evils fix
|
12 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题
|
12 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
alan
|
272be122e5
|
按时间查询
|
12 years ago |
|
fanqiang
|
e8de48dd24
|
修改osp的show界面，建立框架
|
12 years ago |
|
yanxd
|
075b1d2143
|
去除中文在controller里
|
12 years ago |
|
Wen
|
e5470db875
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
6986616783
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
12 years ago |
|
Wen
|
a4557d4d19
|
已结束课程显示正常
|
12 years ago |
|
Wen
|
24d7234fec
|
作业顺序按照截止日期排序
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
alan
|
b06d462b53
|
附件按时间排序 龙军
|
12 years ago |
|
alan
|
5c2a037a8f
|
user dup
|
12 years ago |
|
yanxd
|
66e655a19e
|
nothing
|
12 years ago |
|
xianbo
|
b43a899a18
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/_base_header.html.erb
|
12 years ago |
|
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
12 years ago |
|
xianbo
|
06b2c25f3d
|
fix
|
12 years ago |
|
yanxd
|
301a21b455
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4f5216e632
|
merge
|
12 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
12 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
|
yanxd
|
35d1c33a29
|
...
|
12 years ago |
|
yanxd
|
d64615e604
|
issue created alert
|
12 years ago |
|
yanxd
|
575fc48ff0
|
首页搜索分类
|
12 years ago |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
12 years ago |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
12 years ago |
|
yanxd
|
9c54c9c1b6
|
重构项目和课程排序部分，修复分页数量错误
|
12 years ago |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
12 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
12 years ago |
|
yanxd
|
f9e9404471
|
过滤器过滤加入课程的行为，不再进行n多判断
|
12 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
12 years ago |
|
yanxd
|
2878c57d43
|
新建作业 除了学生
|
12 years ago |
|
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
12 years ago |
|
yanxd
|
ce1e6c49f1
|
改留言
|
12 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
12 years ago |
|
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
12 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
12 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
12 years ago |
|
yanxd
|
bc7471bcb7
|
course real server host.
|
12 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
12 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
12 years ago |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
12 years ago |
|
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
12 years ago |
|
yanxd
|
91353d2e5a
|
fix
|
12 years ago |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
12 years ago |
|
yanxd
|
0ed2e19268
|
项目列表
|
12 years ago |
|
yanxd
|
d357541bb8
|
yaowan
|
12 years ago |
|
wanglinchun
|
ae7949e8cc
|
保持上传头像比例
|
12 years ago |
|
yanxd
|
6e15e90253
|
文件下载全部统计次数
|
12 years ago |
|
yanxd
|
0d9453080c
|
bug
|
12 years ago |
|
wanglinchun
|
c941c640dd
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
12 years ago |
|
yanxd
|
63782feeac
|
查询去掉作业，防抄袭
|
12 years ago |
|
yanxd
|
8172516aff
|
解决不能搜0的功能
|
12 years ago |
|
yanxd
|
189b60a152
|
avatar 400 ===> 200
|
12 years ago |
|
yanxd
|
6cd160ec9b
|
头像400*400
|
12 years ago |
|
yanxd
|
48172599cc
|
数据库误删除的问题
|
12 years ago |
|
yanxd
|
7eb5317696
|
数据库误删除的问题
|
12 years ago |
|
yanxd
|
b2bdf0c640
|
sql 转义字符跑错的问题
|
12 years ago |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
12 years ago |
|
yanxd
|
0380cdaf21
|
修改隐藏项目里看得到的内容，下载不能
|
12 years ago |
|
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
9d1940427f
|
悲剧 下面竞赛里没文件， 作业不能让人搜
|
12 years ago |
|
wanglinchun
|
5cacdd906d
|
resize img
|
12 years ago |
|
yanxd
|
bacddf00d9
|
logo
|
12 years ago |
 baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
yanxd
|
00022ce9fe
|
icon search controller
|
12 years ago |
|
nieguanghui
|
8d788fac45
|
modified
|
12 years ago |
|
yanxd
|
ee570ea0ac
|
1
|
12 years ago |
|
yanxd
|
a5c9d9c31e
|
um...
|
12 years ago |
|
yanxd
|
45f8b15083
|
paginate
|
12 years ago |
|
yanxd
|
61380a5e1a
|
文件来源
|
12 years ago |
|
yanxd
|
2bb44456d6
|
search
|
12 years ago |
|
yanxd
|
91a6c13ced
|
search
|
12 years ago |
|
yanxd
|
997b90c3b2
|
add label on box
|
12 years ago |
|
yanxd
|
d34253bdfc
|
search framework
|
12 years ago |
|
yanxd
|
41fefd0b37
|
去除隐藏项目课程内的内容， 下载文件名缩略显示鼠标移上去浮动显示所有 完整文件名
|
12 years ago |
